summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-10-10 07:05:46 -0700
committerSage Weil <sage@inktank.com>2013-10-11 09:23:10 -0700
commit82e93303fb83e886206b3157b2fdc3d6617e9934 (patch)
tree81c6d0618340ea7adeaf406261f8da5f0e04f7f9
parent6bbb772e710d10a201e86a2090e34b444048a715 (diff)
downloadceph-82e93303fb83e886206b3157b2fdc3d6617e9934.tar.gz
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>
-rw-r--r--src/osdc/Objecter.h10
1 files changed, 4 insertions, 6 deletions
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;
}
};