summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-04-30 07:44:33 +0200
committerSage Weil <sage@inktank.com>2013-05-02 06:20:17 +0200
commitdedc81ea8468fd29bdd13eb5a362cab96b53d802 (patch)
tree39a6845ebcecd646a24c41de1b92021a547ceb29
parentrbd: drop rbd_obj_method_sync() version parameter (diff)
downloadlinux-dedc81ea8468fd29bdd13eb5a362cab96b53d802.tar.xz
linux-dedc81ea8468fd29bdd13eb5a362cab96b53d802.zip
rbd: drop obj_request->version
Nothing ever uses the version field maintained in the object request structure any more, so get rid of it. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
-rw-r--r--drivers/block/rbd.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 1e13dffc13d5..3cc080c5c49e 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -225,7 +225,6 @@ struct rbd_obj_request {
struct ceph_osd_request *osd_req;
u64 xferred; /* bytes transferred */
- u64 version;
int result;
rbd_obj_callback_t callback;
@@ -1486,7 +1485,6 @@ static void rbd_osd_req_callback(struct ceph_osd_request *osd_req,
if (osd_req->r_result < 0)
obj_request->result = osd_req->r_result;
- obj_request->version = le64_to_cpu(osd_req->r_reassert_version.version);
BUG_ON(osd_req->r_num_ops > 2);