From 1e0a54672597b947c67bf3bfbb73f99dd94924dc Mon Sep 17 00:00:00 2001
From: Josh Durgin <josh.durgin@dreamhost.com>
Date: Mon, 21 Nov 2011 18:16:52 -0800
Subject: [PATCH] --- yaml --- r: 309451 b: refs/heads/master c:
 b06e6a6be796bc365a19b0ac5176b553c13abf2f h: refs/heads/master i:   309449:
 019e95c813fc9f607389ad6db30fd8db41ee4571   309447:
 398bcbe4dfdf9509c159c198d79cd30a43976ad9 v: v3

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

diff --git a/[refs] b/[refs]
index eab04cc6b318..a7f09f661b5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77dfe99fe3cb0b2b0545e19e2d57b7a9134ee3c0
+refs/heads/master: b06e6a6be796bc365a19b0ac5176b553c13abf2f
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index c1650bdf2f6e..4a0a829f79d1 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/drivers/block/rbd.c
@@ -1152,7 +1152,7 @@ static int rbd_req_read(struct request *rq,
 			 int coll_index)
 {
 	return rbd_do_op(rq, rbd_dev, NULL,
-			 (snapid ? snapid : CEPH_NOSNAP),
+			 snapid,
 			 CEPH_OSD_OP_READ,
 			 CEPH_OSD_FLAG_READ,
 			 2,
@@ -1171,7 +1171,7 @@ static int rbd_req_sync_read(struct rbd_device *dev,
 			  u64 *ver)
 {
 	return rbd_req_sync_op(dev, NULL,
-			       (snapid ? snapid : CEPH_NOSNAP),
+			       snapid,
 			       CEPH_OSD_OP_READ,
 			       CEPH_OSD_FLAG_READ,
 			       NULL,