diff options
| author | Josh Durgin <josh.durgin@dreamhost.com> | 2011-11-22 03:16:52 +0100 |
|---|---|---|
| committer | Alex Elder <elder@dreamhost.com> | 2012-05-14 19:12:58 +0200 |
| commit | b06e6a6be796bc365a19b0ac5176b553c13abf2f (patch) | |
| tree | 5a53dceb7eed8932d097ceeb2fcbe9665e7e3b48 /drivers | |
| parent | rbd: store snapshot id instead of index (diff) | |
| download | linux-b06e6a6be796bc365a19b0ac5176b553c13abf2f.tar.xz linux-b06e6a6be796bc365a19b0ac5176b553c13abf2f.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/rbd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index c1650bdf2f6e..4a0a829f79d1 100644 --- a/drivers/block/rbd.c +++ b/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, |