From: Sage Weil <sage@inktank.com>
Date: Thu, 10 Oct 2013 14:05:46 +0000 (-0700)
Subject: osdc/Objecter: only make handlers set *prval if EIO
X-Git-Tag: v0.72-rc1~66^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=82e93303fb83e886206b3157b2fdc3d6617e9934;p=ceph.git

osdc/Objecter: only make handlers set *prval if EIO

The normal Objecter handlers set *prval for each operation; we only need to
(re)set it if we have a special reason (like a decoding error).

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 1196633276d..8a6c243d339 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -617,10 +617,9 @@ struct ObjectOperation {
 	}
 	::decode(*cursor, p);
       } catch (buffer::error& e) {
-	r = -EIO;
+	if (prval)
+	  *prval = -EIO;
       }
-      if (prval)
-	*prval = r;
     }
   };
 
@@ -664,10 +663,9 @@ struct ObjectOperation {
 	if (pisdirty)
 	  *pisdirty = isdirty;
       } catch (buffer::error& e) {
-	r = -EIO;
+	if (prval)
+	  *prval = -EIO;
       }
-      if (prval)
-	*prval = r;
     }
   };