From c20c9ec871b04788d6f396b0cdb94d7f5a761fc4 Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Fri, 9 Nov 2012 08:43:15 -0600
Subject: [PATCH] --- yaml --- r: 359583 b: refs/heads/master c:
 4775618d9255c0c135580bbee8bee6815f8194cf h: refs/heads/master i:   359581:
 7fb90e555783bf9da1aa3a49431676799e69f3a5   359579:
 3901d8cf65635e6724de3e660a6bb8043786d526   359575:
 f51d92cbbe4511fe7de670597537f72aefe1021f   359567:
 bcd50d56b0a68f65e2216cfafe25d96a0cb82daf   359551:
 3d992423f8f129c4d1548224d3f8a8eeb03f4e3b v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/block/rbd.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 474464c6c038..2f90c5d86bce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af77f26caa35a95af09d1dac5c513b3901de7e37
+refs/heads/master: 4775618d9255c0c135580bbee8bee6815f8194cf
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index 9a701effa0ef..07e064482cd8 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/drivers/block/rbd.c
@@ -1368,7 +1368,6 @@ static int rbd_do_op(struct request *rq,
  * Request sync osd read
  */
 static int rbd_req_sync_read(struct rbd_device *rbd_dev,
-			  u64 snapid,
 			  const char *object_name,
 			  u64 ofs, u64 len,
 			  char *buf,
@@ -1382,7 +1381,7 @@ static int rbd_req_sync_read(struct rbd_device *rbd_dev,
 		return -ENOMEM;
 
 	ret = rbd_req_sync_op(rbd_dev, NULL,
-			       snapid,
+			       CEPH_NOSNAP,
 			       CEPH_OSD_FLAG_READ,
 			       ops, object_name, ofs, len, buf, NULL, ver);
 	rbd_destroy_ops(ops);
@@ -1799,8 +1798,7 @@ rbd_dev_v1_header_read(struct rbd_device *rbd_dev, u64 *version)
 		if (!ondisk)
 			return ERR_PTR(-ENOMEM);
 
-		ret = rbd_req_sync_read(rbd_dev, CEPH_NOSNAP,
-				       rbd_dev->header_name,
+		ret = rbd_req_sync_read(rbd_dev, rbd_dev->header_name,
 				       0, size,
 				       (char *) ondisk, version);