rbd: more version parameter removal

[~andy/linux] / drivers / block / rbd.c

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 4be3b2a1be8e97216d22359b9a0f41f99082b699..61375093358816f23d7d56d135425911da904427 100644 (file)
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -110,8 +110,6 @@ struct rbd_image_header {
 
        u64 stripe_unit;
        u64 stripe_count;
-
-       u64 obj_version;
 };
 
 /*
@@ -431,8 +429,8 @@ static int rbd_img_obj_request_submit(struct rbd_obj_request *obj_request);
 static void rbd_img_parent_read(struct rbd_obj_request *obj_request);
 static void rbd_dev_remove_parent(struct rbd_device *rbd_dev);
 
-static int rbd_dev_refresh(struct rbd_device *rbd_dev, u64 *hver);
-static int rbd_dev_v2_refresh(struct rbd_device *rbd_dev, u64 *hver);
+static int rbd_dev_refresh(struct rbd_device *rbd_dev);
+static int rbd_dev_v2_refresh(struct rbd_device *rbd_dev);
 
 static int rbd_open(struct block_device *bdev, fmode_t mode)
 {
@@ -2470,8 +2468,7 @@ out_err:
        obj_request_done_set(obj_request);
 }
 
-static int rbd_obj_notify_ack(struct rbd_device *rbd_dev,
-                                  u64 ver, u64 notify_id)
+static int rbd_obj_notify_ack(struct rbd_device *rbd_dev, u64 notify_id)
 {
        struct rbd_obj_request *obj_request;
        struct ceph_osd_client *osdc = &rbd_dev->rbd_client->client->osdc;
@@ -2489,7 +2486,7 @@ static int rbd_obj_notify_ack(struct rbd_device *rbd_dev,
        obj_request->callback = rbd_obj_request_put;
 
        osd_req_op_watch_init(obj_request->osd_req, 0, CEPH_OSD_OP_NOTIFY_ACK,
-                                       notify_id, ver, 0);
+                                       notify_id, 0, 0);
        rbd_osd_req_format_read(obj_request);
 
        ret = rbd_obj_request_submit(osdc, obj_request);
@@ -2503,17 +2500,16 @@ out:
 static void rbd_watch_cb(u64 ver, u64 notify_id, u8 opcode, void *data)
 {
        struct rbd_device *rbd_dev = (struct rbd_device *)data;
-       u64 hver;
 
        if (!rbd_dev)
                return;
 
        dout("%s: \"%s\" notify_id %llu opcode %u\n", __func__,
-               rbd_dev->header_name, (unsigned long long) notify_id,
-               (unsigned int) opcode);
-       (void)rbd_dev_refresh(rbd_dev, &hver);
+               rbd_dev->header_name, (unsigned long long)notify_id,
+               (unsigned int)opcode);
+       (void)rbd_dev_refresh(rbd_dev);
 
-       rbd_obj_notify_ack(rbd_dev, hver, notify_id);
+       rbd_obj_notify_ack(rbd_dev, notify_id);
 }
 
 /*
@@ -2554,8 +2550,7 @@ static int rbd_dev_header_watch_sync(struct rbd_device *rbd_dev, int start)
                                        rbd_dev->watch_request->osd_req);
 
        osd_req_op_watch_init(obj_request->osd_req, 0, CEPH_OSD_OP_WATCH,
-                               rbd_dev->watch_event->cookie,
-                               rbd_dev->header.obj_version, start);
+                               rbd_dev->watch_event->cookie, 0, start);
        rbd_osd_req_format_write(obj_request);
 
        ret = rbd_obj_request_submit(osdc, obj_request);
@@ -2841,8 +2836,7 @@ static void rbd_free_disk(struct rbd_device *rbd_dev)
 
 static int rbd_obj_read_sync(struct rbd_device *rbd_dev,
                                const char *object_name,
-                               u64 offset, u64 length,
-                               void *buf, u64 *version)
+                               u64 offset, u64 length, void *buf)
 
 {
        struct ceph_osd_client *osdc = &rbd_dev->rbd_client->client->osdc;
@@ -2893,10 +2887,8 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev,
        rbd_assert(obj_request->xferred <= (u64) SIZE_MAX);
        size = (size_t) obj_request->xferred;
        ceph_copy_from_page_vector(pages, buf, 0, size);
-       rbd_assert(size <= (size_t) INT_MAX);
-       ret = (int) size;
-       if (version)
-               *version = obj_request->version;
+       rbd_assert(size <= (size_t)INT_MAX);
+       ret = (int)size;
 out:
        if (obj_request)
                rbd_obj_request_put(obj_request);
@@ -2917,7 +2909,7 @@ out:
  * Returns a pointer-coded errno if a failure occurs.
  */
 static struct rbd_image_header_ondisk *
-rbd_dev_v1_header_read(struct rbd_device *rbd_dev, u64 *version)
+rbd_dev_v1_header_read(struct rbd_device *rbd_dev)
 {
        struct rbd_image_header_ondisk *ondisk = NULL;
        u32 snap_count = 0;
@@ -2945,7 +2937,7 @@ rbd_dev_v1_header_read(struct rbd_device *rbd_dev, u64 *version)
                        return ERR_PTR(-ENOMEM);
 
                ret = rbd_obj_read_sync(rbd_dev, rbd_dev->header_name,
-                                      0, size, ondisk, version);
+                                      0, size, ondisk);
                if (ret < 0)
                        goto out_err;
                if ((size_t)ret < size) {
@@ -2980,15 +2972,12 @@ static int rbd_read_header(struct rbd_device *rbd_dev,
                           struct rbd_image_header *header)
 {
        struct rbd_image_header_ondisk *ondisk;
-       u64 ver = 0;
        int ret;
 
-       ondisk = rbd_dev_v1_header_read(rbd_dev, &ver);
+       ondisk = rbd_dev_v1_header_read(rbd_dev);
        if (IS_ERR(ondisk))
                return PTR_ERR(ondisk);
        ret = rbd_header_from_disk(header, ondisk);
-       if (ret >= 0)
-               header->obj_version = ver;
        kfree(ondisk);
 
        return ret;
@@ -3023,7 +3012,7 @@ static void rbd_update_mapping_size(struct rbd_device *rbd_dev)
 /*
  * only read the first part of the ondisk header, without the snaps info
  */
-static int rbd_dev_v1_refresh(struct rbd_device *rbd_dev, u64 *hver)
+static int rbd_dev_v1_refresh(struct rbd_device *rbd_dev)
 {
        int ret;
        struct rbd_image_header h;
@@ -3044,9 +3033,6 @@ static int rbd_dev_v1_refresh(struct rbd_device *rbd_dev, u64 *hver)
        /* osd requests may still refer to snapc */
        ceph_put_snap_context(rbd_dev->header.snapc);
 
-       if (hver)
-               *hver = h.obj_version;
-       rbd_dev->header.obj_version = h.obj_version;
        rbd_dev->header.image_size = h.image_size;
        rbd_dev->header.snapc = h.snapc;
        rbd_dev->header.snap_names = h.snap_names;
@@ -3063,7 +3049,7 @@ static int rbd_dev_v1_refresh(struct rbd_device *rbd_dev, u64 *hver)
        return ret;
 }
 
-static int rbd_dev_refresh(struct rbd_device *rbd_dev, u64 *hver)
+static int rbd_dev_refresh(struct rbd_device *rbd_dev)
 {
        u64 image_size;
        int ret;
@@ -3072,9 +3058,9 @@ static int rbd_dev_refresh(struct rbd_device *rbd_dev, u64 *hver)
        image_size = rbd_dev->header.image_size;
        mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
        if (rbd_dev->image_format == 1)
-               ret = rbd_dev_v1_refresh(rbd_dev, hver);
+               ret = rbd_dev_v1_refresh(rbd_dev);
        else
-               ret = rbd_dev_v2_refresh(rbd_dev, hver);
+               ret = rbd_dev_v2_refresh(rbd_dev);
        mutex_unlock(&ctl_mutex);
        if (ret)
                rbd_warn(rbd_dev, "got notification but failed to "
@@ -3283,7 +3269,7 @@ static ssize_t rbd_image_refresh(struct device *dev,
        struct rbd_device *rbd_dev = dev_to_rbd_dev(dev);
        int ret;
 
-       ret = rbd_dev_refresh(rbd_dev, NULL);
+       ret = rbd_dev_refresh(rbd_dev);
 
        return ret < 0 ? ret : size;
 }
@@ -3836,7 +3822,7 @@ out_err:
        return ret;
 }
 
-static int rbd_dev_v2_snap_context(struct rbd_device *rbd_dev, u64 *ver)
+static int rbd_dev_v2_snap_context(struct rbd_device *rbd_dev)
 {
        size_t size;
        int ret;
@@ -3862,7 +3848,7 @@ static int rbd_dev_v2_snap_context(struct rbd_device *rbd_dev, u64 *ver)
 
        ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
                                "rbd", "get_snapcontext", NULL, 0,
-                               reply_buf, size, ver);
+                               reply_buf, size, NULL);
        dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
        if (ret < 0)
                goto out;
@@ -3990,7 +3976,7 @@ static const char *rbd_dev_snap_info(struct rbd_device *rbd_dev, u32 which,
        return ERR_PTR(-EINVAL);
 }
 
-static int rbd_dev_v2_refresh(struct rbd_device *rbd_dev, u64 *hver)
+static int rbd_dev_v2_refresh(struct rbd_device *rbd_dev)
 {
        int ret;
 
@@ -4001,7 +3987,7 @@ static int rbd_dev_v2_refresh(struct rbd_device *rbd_dev, u64 *hver)
                goto out;
        rbd_update_mapping_size(rbd_dev);
 
-       ret = rbd_dev_v2_snap_context(rbd_dev, hver);
+       ret = rbd_dev_v2_snap_context(rbd_dev);
        dout("rbd_dev_v2_snap_context returned %d\n", ret);
        if (ret)
                goto out;
@@ -4603,7 +4589,6 @@ out_err:
 static int rbd_dev_v2_probe(struct rbd_device *rbd_dev)
 {
        int ret;
-       u64 ver = 0;
 
        ret = rbd_dev_v2_image_size(rbd_dev);
        if (ret)
@@ -4653,10 +4638,9 @@ static int rbd_dev_v2_probe(struct rbd_device *rbd_dev)
 
        /* Get the snapshot context, plus the header version */
 
-       ret = rbd_dev_v2_snap_context(rbd_dev, &ver);
+       ret = rbd_dev_v2_snap_context(rbd_dev);
        if (ret)
                goto out_err;
-       rbd_dev->header.obj_version = ver;
 
        dout("discovered version 2 image, header name is %s\n",
                rbd_dev->header_name);