dm: remove fmode_t argument from .prepare_ioctl hook

Use the fmode_t that is passed to dm_blk_ioctl() rather than
inconsistently (varies across targets) drop it on the floor by
overriding it with the fmode_t stored in 'struct dm_dev'.

All the persistent reservation functions weren't using the fmode_t they
got back from .prepare_ioctl so remove them.

Signed-off-by: Mike Snitzer <snitzer@redhat.com>

diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c
index 1b907b15f5c3be312569452ea1476ada54e01db5..21d126a5078c637db31c234d6e8173dbd7275bfb 100644 (file)
--- a/drivers/md/dm-flakey.c
+++ b/drivers/md/dm-flakey.c
@@ -442,8 +442,7 @@ static void flakey_status(struct dm_target *ti, status_type_t type,
        }
 }
 
-static int flakey_prepare_ioctl(struct dm_target *ti,
-               struct block_device **bdev, fmode_t *mode)
+static int flakey_prepare_ioctl(struct dm_target *ti, struct block_device **bdev)
 {
        struct flakey_c *fc = ti->private;
 

diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c
index ff751b00aacd3eb6b874dea8ea47b7ca3f0c675a..99297212eeec887140dcaf8c4582648d8ea98f3b 100644 (file)
--- a/drivers/md/dm-linear.c
+++ b/drivers/md/dm-linear.c
@@ -130,8 +130,7 @@ static void linear_status(struct dm_target *ti, status_type_t type,
        }
 }
 
-static int linear_prepare_ioctl(struct dm_target *ti,
-               struct block_device **bdev, fmode_t *mode)
+static int linear_prepare_ioctl(struct dm_target *ti, struct block_device **bdev)
 {
        struct linear_c *lc = (struct linear_c *) ti->private;
        struct dm_dev *dev = lc->dev;

diff --git a/drivers/md/dm-log-writes.c b/drivers/md/dm-log-writes.c
index fefe6719a64d3f69450b560d80574b1dd1010fdc..9de072b7782a53d5192087cb36f775d3630440a4 100644 (file)
--- a/drivers/md/dm-log-writes.c
+++ b/drivers/md/dm-log-writes.c
@@ -864,7 +864,7 @@ static void log_writes_status(struct dm_target *ti, status_type_t type,
 }
 
 static int log_writes_prepare_ioctl(struct dm_target *ti,
-               struct block_device **bdev, fmode_t *mode)
+                                   struct block_device **bdev)
 {
        struct log_writes_c *lc = ti->private;
        struct dm_dev *dev = lc->dev;

diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 746dd8a75b4ac28723e39ea076ead6da3a5d2404..203a0419d2b04db1ffedb9ee022ea2533f3a9e28 100644 (file)
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -1876,7 +1876,7 @@ static int multipath_message(struct dm_target *ti, unsigned argc, char **argv,
 }
 
 static int multipath_prepare_ioctl(struct dm_target *ti,
-               struct block_device **bdev, fmode_t *mode)
+                                  struct block_device **bdev)
 {
        struct multipath *m = ti->private;
        struct pgpath *current_pgpath;
@@ -1889,7 +1889,6 @@ static int multipath_prepare_ioctl(struct dm_target *ti,
        if (current_pgpath) {
                if (!test_bit(MPATHF_QUEUE_IO, &m->flags)) {
                        *bdev = current_pgpath->path.dev->bdev;
-                       *mode = current_pgpath->path.dev->mode;
                        r = 0;
                } else {
                        /* pg_init has not started or completed */

diff --git a/drivers/md/dm-switch.c b/drivers/md/dm-switch.c
index 8f9208c2d2e3b6edc07fd10b209c4cf99c157c4f..7924a6a33ddcf1c8f3902a634a11b62421495213 100644 (file)
--- a/drivers/md/dm-switch.c
+++ b/drivers/md/dm-switch.c
@@ -512,8 +512,7 @@ static void switch_status(struct dm_target *ti, status_type_t type,
  *
  * Passthrough all ioctls to the path for sector 0
  */
-static int switch_prepare_ioctl(struct dm_target *ti,
-               struct block_device **bdev, fmode_t *mode)
+static int switch_prepare_ioctl(struct dm_target *ti, struct block_device **bdev)
 {
        struct switch_ctx *sctx = ti->private;
        unsigned path_nr;
@@ -521,7 +520,6 @@ static int switch_prepare_ioctl(struct dm_target *ti,
        path_nr = switch_get_path_nr(sctx, 0);
 
        *bdev = sctx->path_list[path_nr].dmdev->bdev;
-       *mode = sctx->path_list[path_nr].dmdev->mode;
 
        /*
         * Only pass ioctls through if the device sizes match exactly.

diff --git a/drivers/md/dm-verity-target.c b/drivers/md/dm-verity-target.c
index 037ba17e3a3e4965acf1e828280f249deb4bbe64..fc893f636a989e996fd8461c95a039f3fadf00bd 100644 (file)
--- a/drivers/md/dm-verity-target.c
+++ b/drivers/md/dm-verity-target.c
@@ -723,8 +723,7 @@ static void verity_status(struct dm_target *ti, status_type_t type,
        }
 }
 
-static int verity_prepare_ioctl(struct dm_target *ti,
-               struct block_device **bdev, fmode_t *mode)
+static int verity_prepare_ioctl(struct dm_target *ti, struct block_device **bdev)
 {
        struct dm_verity *v = ti->private;
 

diff --git a/drivers/md/dm-zoned-target.c b/drivers/md/dm-zoned-target.c
index caff02caf0837ae4fae4df55b55ebabb9fb557bd..e73b0776683c3453715b3919b2a3387aacb6a116 100644 (file)
--- a/drivers/md/dm-zoned-target.c
+++ b/drivers/md/dm-zoned-target.c
@@ -898,8 +898,7 @@ static void dmz_io_hints(struct dm_target *ti, struct queue_limits *limits)
 /*
  * Pass on ioctl to the backend device.
  */
-static int dmz_prepare_ioctl(struct dm_target *ti,
-                            struct block_device **bdev, fmode_t *mode)
+static int dmz_prepare_ioctl(struct dm_target *ti, struct block_device **bdev)
 {
        struct dmz_target *dmz = ti->private;
 

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index d4438188d08804eda02a15ef947f797df89ada07..3af590e0d78c2a74d6b97c0f921aa6065794c00a 100644 (file)
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -459,7 +459,7 @@ static int dm_blk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 }
 
 static int dm_prepare_ioctl(struct mapped_device *md, int *srcu_idx,
-                           struct block_device **bdev, fmode_t *mode)
+                           struct block_device **bdev)
        __acquires(md->io_barrier)
 {
        struct dm_target *tgt;
@@ -483,7 +483,7 @@ static int dm_prepare_ioctl(struct mapped_device *md, int *srcu_idx,
        if (dm_suspended_md(md))
                return -EAGAIN;
 
-       r = tgt->type->prepare_ioctl(tgt, bdev, mode);
+       r = tgt->type->prepare_ioctl(tgt, bdev);
        if (r == -ENOTCONN && !fatal_signal_pending(current)) {
                dm_put_live_table(md, *srcu_idx);
                msleep(10);
@@ -505,7 +505,7 @@ static int dm_blk_ioctl(struct block_device *bdev, fmode_t mode,
        struct mapped_device *md = bdev->bd_disk->private_data;
        int r, srcu_idx;
 
-       r = dm_prepare_ioctl(md, &srcu_idx, &bdev, &mode);
+       r = dm_prepare_ioctl(md, &srcu_idx, &bdev);
        if (r < 0)
                goto out;
 
@@ -3034,10 +3034,9 @@ static int dm_pr_reserve(struct block_device *bdev, u64 key, enum pr_type type,
 {
        struct mapped_device *md = bdev->bd_disk->private_data;
        const struct pr_ops *ops;
-       fmode_t mode;
        int r, srcu_idx;
 
-       r = dm_prepare_ioctl(md, &srcu_idx, &bdev, &mode);
+       r = dm_prepare_ioctl(md, &srcu_idx, &bdev);
        if (r < 0)
                goto out;
 
@@ -3055,10 +3054,9 @@ static int dm_pr_release(struct block_device *bdev, u64 key, enum pr_type type)
 {
        struct mapped_device *md = bdev->bd_disk->private_data;
        const struct pr_ops *ops;
-       fmode_t mode;
        int r, srcu_idx;
 
-       r = dm_prepare_ioctl(md, &srcu_idx, &bdev, &mode);
+       r = dm_prepare_ioctl(md, &srcu_idx, &bdev);
        if (r < 0)
                goto out;
 
@@ -3077,10 +3075,9 @@ static int dm_pr_preempt(struct block_device *bdev, u64 old_key, u64 new_key,
 {
        struct mapped_device *md = bdev->bd_disk->private_data;
        const struct pr_ops *ops;
-       fmode_t mode;
        int r, srcu_idx;
 
-       r = dm_prepare_ioctl(md, &srcu_idx, &bdev, &mode);
+       r = dm_prepare_ioctl(md, &srcu_idx, &bdev);
        if (r < 0)
                goto out;
 
@@ -3098,10 +3095,9 @@ static int dm_pr_clear(struct block_device *bdev, u64 key)
 {
        struct mapped_device *md = bdev->bd_disk->private_data;
        const struct pr_ops *ops;
-       fmode_t mode;
        int r, srcu_idx;
 
-       r = dm_prepare_ioctl(md, &srcu_idx, &bdev, &mode);
+       r = dm_prepare_ioctl(md, &srcu_idx, &bdev);
        if (r < 0)
                goto out;
 

diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 019e2efc6c25d6b6bfd6bf97a9db86b9ff32723c..ed038fbecd55d5c49a9554a109228893b2e87dc8 100644 (file)
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -90,8 +90,7 @@ typedef void (*dm_status_fn) (struct dm_target *ti, status_type_t status_type,
 typedef int (*dm_message_fn) (struct dm_target *ti, unsigned argc, char **argv,
                              char *result, unsigned maxlen);
 
-typedef int (*dm_prepare_ioctl_fn) (struct dm_target *ti,
-                           struct block_device **bdev, fmode_t *mode);
+typedef int (*dm_prepare_ioctl_fn) (struct dm_target *ti, struct block_device **bdev);
 
 /*
  * These iteration functions are typically used to check (and combine)