dm mpath: rename current_pgpath to pgpath in multipath_prepare_ioctl
authorMike Snitzer <snitzer@redhat.com>
Thu, 11 Jun 2020 01:25:39 +0000 (21:25 -0400)
committerMike Snitzer <snitzer@redhat.com>
Mon, 13 Jul 2020 15:47:32 +0000 (11:47 -0400)
Makes consistent with __map_bio() and multipath_clone_and_map().

Signed-off-by: Mike Snitzer <snitzer@redhat.com>
drivers/md/dm-mpath.c

index ab6ccd6..f71bb4e 100644 (file)
@@ -1962,17 +1962,17 @@ static int multipath_prepare_ioctl(struct dm_target *ti,
                                   struct block_device **bdev)
 {
        struct multipath *m = ti->private;
-       struct pgpath *current_pgpath;
+       struct pgpath *pgpath;
        unsigned long flags;
        int r;
 
-       current_pgpath = READ_ONCE(m->current_pgpath);
-       if (!current_pgpath || !test_bit(MPATHF_QUEUE_IO, &m->flags))
-               current_pgpath = choose_pgpath(m, 0);
+       pgpath = READ_ONCE(m->current_pgpath);
+       if (!pgpath || !test_bit(MPATHF_QUEUE_IO, &m->flags))
+               pgpath = choose_pgpath(m, 0);
 
-       if (current_pgpath) {
+       if (pgpath) {
                if (!test_bit(MPATHF_QUEUE_IO, &m->flags)) {
-                       *bdev = current_pgpath->path.dev->bdev;
+                       *bdev = pgpath->path.dev->bdev;
                        r = 0;
                } else {
                        /* pg_init has not started or completed */