On Wed, Apr 18, 2012 at 7:41 AM, Alex Elder <elder@xxxxxxxxxxxxx> wrote: > 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@xxxxxxxxxxxxx: Rephrased the description] > > Signed-off-by: Josh Durgin <josh.durgin@xxxxxxxxxxxxx> > Reviewed-by: Alex Elder <elder@xxxxxxxxxxxxx> > --- > drivers/block/rbd.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > Index: b/drivers/block/rbd.c > =================================================================== > --- a/drivers/block/rbd.c > +++ b/drivers/block/rbd.c > @@ -1153,7 +1153,7 @@ > 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, > @@ -1172,7 +1172,7 @@ > u64 *ver) > { > return rbd_req_sync_op(dev, NULL, > - (snapid ? snapid : CEPH_NOSNAP), > + snapid, > CEPH_OSD_OP_READ, > CEPH_OSD_FLAG_READ, > NULL, Reviewed-by: Yehuda Sadeh <yehuda@xxxxxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html