From: Sage Weil <sage@inktank.com>
Date: Tue, 1 Oct 2013 23:48:00 +0000 (-0700)
Subject: osdc/Objecter: fix return value for copy_get
X-Git-Tag: v0.71~44^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dcd475dd57158d7e5f59455ad9cc927df22caa4d;p=ceph.git

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>
---

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index eef226ad9b20..7e8cd60c1e94 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;
     }
   };