summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-10-01 16:48:00 -0700
committerSage Weil <sage@inktank.com>2013-10-01 16:48:00 -0700
commitdcd475dd57158d7e5f59455ad9cc927df22caa4d (patch)
treeb225a6c6d018f9e000980e522cbcb242dd48f953
parent7e3084eb178601aea4402bd2434d06a91f978d47 (diff)
downloadceph-dcd475dd57158d7e5f59455ad9cc927df22caa4d.tar.gz
osdc/Objecter: fix return value for copy_get
We should return the return code even when we don't have an encoding error! Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/osdc/Objecter.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index eef226ad9b2..7e8cd60c1e9 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -617,9 +617,10 @@ struct ObjectOperation {
}
::decode(*cursor, p);
} catch (buffer::error& e) {
- if (prval)
- *prval = -EIO;
+ r = -EIO;
}
+ if (prval)
+ *prval = r;
}
};