Commit b06e6a6b authored Nov 21, 2011 by Josh Durgin Committed by Alex Elder May 14, 2012

rbd: remove conditional snapid parameters



The snapid parameters passed to rbd_do_op() and rbd_req_sync_op()
are now always either a valid snapid or an explicit CEPH_NOSNAP.

[elder@dreamhost.com: Rephrased the description]

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
Reviewed-by: Alex Elder <elder@dreamhost.com>
Reviewed-by: Yehuda Sadeh <yehuda@hq.newdream.net>

parent 77dfe99f

drivers/block/rbd.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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,