aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-04-30 01:44:33 -0400
committerSage Weil <sage@inktank.com>2013-05-02 00:20:17 -0400
commitdedc81ea8468fd29bdd13eb5a362cab96b53d802 (patch)
tree39a6845ebcecd646a24c41de1b92021a547ceb29
parente2a58ee55b0f132c2a6cbf2504a1c651b261fb67 (diff)
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 {
225 struct ceph_osd_request *osd_req; 225 struct ceph_osd_request *osd_req;
226 226
227 u64 xferred; /* bytes transferred */ 227 u64 xferred; /* bytes transferred */
228 u64 version;
229 int result; 228 int result;
230 229
231 rbd_obj_callback_t callback; 230 rbd_obj_callback_t callback;
@@ -1486,7 +1485,6 @@ static void rbd_osd_req_callback(struct ceph_osd_request *osd_req,
1486 1485
1487 if (osd_req->r_result < 0) 1486 if (osd_req->r_result < 0)
1488 obj_request->result = osd_req->r_result; 1487 obj_request->result = osd_req->r_result;
1489 obj_request->version = le64_to_cpu(osd_req->r_reassert_version.version);
1490 1488
1491 BUG_ON(osd_req->r_num_ops > 2); 1489 BUG_ON(osd_req->r_num_ops > 2);
1492 1490