rbd: drop obj_request->version

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

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 8875bebbacfca13e46536c31c8c961da74ec19c7..3cc080c5c49e5840c0291652b6a50684d1cfd5e6 100644 (file)
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1,3 +1,4 @@
+
 /*
    rbd.c -- Export ceph rados objects as a Linux block device
 
@@ -224,7 +225,6 @@ struct rbd_obj_request {
        struct ceph_osd_request *osd_req;
 
        u64                     xferred;        /* bytes transferred */
-       u64                     version;
        int                     result;
 
        rbd_obj_callback_t      callback;
@@ -429,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)
 {
@@ -1485,7 +1485,6 @@ static void rbd_osd_req_callback(struct ceph_osd_request *osd_req,
 
        if (osd_req->r_result < 0)
                obj_request->result = osd_req->r_result;
-       obj_request->version = le64_to_cpu(osd_req->r_reassert_version.version);
 
        BUG_ON(osd_req->r_num_ops > 2);
 
@@ -2468,8 +2467,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;
@@ -2487,7 +2485,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);
@@ -2501,17 +2499,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);
 }
 
 /*
@@ -2604,8 +2601,7 @@ static int rbd_obj_method_sync(struct rbd_device *rbd_dev,
                             const void *outbound,
                             size_t outbound_size,
                             void *inbound,
-                            size_t inbound_size,
-                            u64 *version)
+                            size_t inbound_size)
 {
        struct ceph_osd_client *osdc = &rbd_dev->rbd_client->client->osdc;
        struct rbd_obj_request *obj_request;
@@ -2671,8 +2667,6 @@ static int rbd_obj_method_sync(struct rbd_device *rbd_dev,
        rbd_assert(obj_request->xferred < (u64)INT_MAX);
        ret = (int)obj_request->xferred;
        ceph_copy_from_page_vector(pages, inbound, 0, obj_request->xferred);
-       if (version)
-               *version = obj_request->version;
 out:
        if (obj_request)
                rbd_obj_request_put(obj_request);
@@ -2838,8 +2832,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;
@@ -2890,10 +2883,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);
@@ -2914,7 +2905,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;
@@ -2942,7 +2933,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) {
@@ -2977,10 +2968,9 @@ 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);
@@ -3018,7 +3008,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;
@@ -3055,7 +3045,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;
@@ -3064,9 +3054,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 "
@@ -3275,7 +3265,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;
 }
@@ -3469,7 +3459,7 @@ static int _rbd_dev_v2_snap_size(struct rbd_device *rbd_dev, u64 snap_id,
        ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
                                "rbd", "get_size",
                                &snapid, sizeof (snapid),
-                               &size_buf, sizeof (size_buf), NULL);
+                               &size_buf, sizeof (size_buf));
        dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
        if (ret < 0)
                return ret;
@@ -3506,7 +3496,7 @@ static int rbd_dev_v2_object_prefix(struct rbd_device *rbd_dev)
 
        ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
                                "rbd", "get_object_prefix", NULL, 0,
-                               reply_buf, RBD_OBJ_PREFIX_LEN_MAX, NULL);
+                               reply_buf, RBD_OBJ_PREFIX_LEN_MAX);
        dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
        if (ret < 0)
                goto out;
@@ -3542,7 +3532,7 @@ static int _rbd_dev_v2_snap_features(struct rbd_device *rbd_dev, u64 snap_id,
        ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
                                "rbd", "get_features",
                                &snapid, sizeof (snapid),
-                               &features_buf, sizeof (features_buf), NULL);
+                               &features_buf, sizeof (features_buf));
        dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
        if (ret < 0)
                return ret;
@@ -3599,7 +3589,7 @@ static int rbd_dev_v2_parent_info(struct rbd_device *rbd_dev)
        ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
                                "rbd", "get_parent",
                                &snapid, sizeof (snapid),
-                               reply_buf, size, NULL);
+                               reply_buf, size);
        dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
        if (ret < 0)
                goto out_err;
@@ -3656,7 +3646,7 @@ static int rbd_dev_v2_striping_info(struct rbd_device *rbd_dev)
 
        ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
                                "rbd", "get_stripe_unit_count", NULL, 0,
-                               (char *)&striping_info_buf, size, NULL);
+                               (char *)&striping_info_buf, size);
        dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
        if (ret < 0)
                return ret;
@@ -3723,7 +3713,7 @@ static char *rbd_dev_image_name(struct rbd_device *rbd_dev)
        ret = rbd_obj_method_sync(rbd_dev, RBD_DIRECTORY,
                                "rbd", "dir_get_name",
                                image_id, image_id_size,
-                               reply_buf, size, NULL);
+                               reply_buf, size);
        if (ret < 0)
                goto out;
        p = reply_buf;
@@ -3828,7 +3818,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;
@@ -3854,7 +3844,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);
        dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
        if (ret < 0)
                goto out;
@@ -3919,7 +3909,7 @@ static const char *rbd_dev_v2_snap_name(struct rbd_device *rbd_dev, u32 which)
        ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
                                "rbd", "get_snapshot_name",
                                &snap_id, sizeof (snap_id),
-                               reply_buf, size, NULL);
+                               reply_buf, size);
        dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
        if (ret < 0) {
                snap_name = ERR_PTR(ret);
@@ -3982,7 +3972,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;
 
@@ -3993,7 +3983,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;
@@ -4512,7 +4502,7 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev)
 
        ret = rbd_obj_method_sync(rbd_dev, object_name,
                                "rbd", "get_id", NULL, 0,
-                               response, RBD_IMAGE_ID_LEN_MAX, NULL);
+                               response, RBD_IMAGE_ID_LEN_MAX);
        dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
        if (ret == -ENOENT) {
                image_id = kstrdup("", GFP_KERNEL);
@@ -4595,7 +4585,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)
@@ -4645,7 +4634,7 @@ 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;