From fc2f4758d0e3eb40052a4769ec8a8af01aa395ab Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Fri, 9 Nov 2012 12:50:10 -0600 Subject: [PATCH] --- yaml --- r: 359586 b: refs/heads/master c: 7c3d22cf16f1bbcb37a73e88338c042bb49ff112 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/rbd.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 59edaceac052..4bbe50f64548 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25704ac9de30ac3e73c123e7b2734f7ca744c8d8 +refs/heads/master: 7c3d22cf16f1bbcb37a73e88338c042bb49ff112 diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c index 85c5852378d2..54bd9fc3ef7c 100644 --- a/trunk/drivers/block/rbd.c +++ b/trunk/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);