rbd: don't bother setting snapid in rbd_do_request()

For some reason, the snapid field of the osd request header is
explicitly set to CEPH_NOSNAP in rbd_do_request().  Just a few lines
later--with no code that would access this field in between--a call
is made to ceph_calc_raw_layout() passing the snapid provided to
rbd_do_request(), which encodes the snapid value it is provided into
that field instead.

In other words, there is no need to fill in CEPH_NOSNAP, and doing
so suggests it might be necessary.  Don't do that any more.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 85c5852378d29ad99ca956bba2347195711365ab..54bd9fc3ef7cc83867194f0bcd53ca4277b45adc 100644 (file)
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1132,7 +1132,6 @@ static int rbd_do_request(struct request *rq,
        u64 bno;
        struct timespec mtime = CURRENT_TIME;
        struct rbd_request *rbd_req;
-       struct ceph_osd_request_head *reqhead;
        struct ceph_osd_client *osdc;
 
        rbd_req = kzalloc(sizeof(*rbd_req), GFP_NOIO);
@@ -1165,9 +1164,6 @@ static int rbd_do_request(struct request *rq,
 
        osd_req->r_priv = rbd_req;
 
-       reqhead = osd_req->r_request->front.iov_base;
-       reqhead->snapid = cpu_to_le64(CEPH_NOSNAP);
-
        strncpy(osd_req->r_oid, object_name, sizeof(osd_req->r_oid));
        osd_req->r_oid_len = strlen(osd_req->r_oid);