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

PATCH New Alex Elder 1 participant 1 message Nov 10, 2012

Subsystems (2)

Block layer RADOS block device (RBD)

lore

Share & tools

lore

Alex Elder

author

2012-11-10 03:54 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 drivers/block/rbd.c |    4 ----
 1 file changed, 4 deletions(-)

drivers/block/rbd.c +0 -4

index b3d25c3..cd51216 100644
@@ -1134,7 +1134,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);

@@ -1167,9 +1166,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);

Signature · 1 line

1.7.9.5