rbd: drop snapid parameter from rbd_req_sync_read()

There is only one caller of rbd_req_sync_read(), and it passes
CEPH_NOSNAP as the snapshot id argument.  Delete that parameter
and just use CEPH_NOSNAP within the function.

Signed-off-by: Alex Elder <elder@inktank.com>

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 499e53a5acb9093cc271647a404a622c722357ca..6a31f389b13c5fb9de333519d6450f0cc04321e2 100644 (file)
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1370,7 +1370,6 @@ done:
  * 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,
@@ -1384,7 +1383,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);
@@ -1794,8 +1793,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);