Skip to content

Commit 564dbb1

Browse files
committed
dm mpath: rename current_pgpath to pgpath in multipath_prepare_ioctl
Makes consistent with __map_bio() and multipath_clone_and_map(). Signed-off-by: Mike Snitzer <[email protected]>
1 parent 17213ec commit 564dbb1

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/md/dm-mpath.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1962,17 +1962,17 @@ static int multipath_prepare_ioctl(struct dm_target *ti,
19621962
struct block_device **bdev)
19631963
{
19641964
struct multipath *m = ti->private;
1965-
struct pgpath *current_pgpath;
1965+
struct pgpath *pgpath;
19661966
unsigned long flags;
19671967
int r;
19681968

1969-
current_pgpath = READ_ONCE(m->current_pgpath);
1970-
if (!current_pgpath || !test_bit(MPATHF_QUEUE_IO, &m->flags))
1971-
current_pgpath = choose_pgpath(m, 0);
1969+
pgpath = READ_ONCE(m->current_pgpath);
1970+
if (!pgpath || !test_bit(MPATHF_QUEUE_IO, &m->flags))
1971+
pgpath = choose_pgpath(m, 0);
19721972

1973-
if (current_pgpath) {
1973+
if (pgpath) {
19741974
if (!test_bit(MPATHF_QUEUE_IO, &m->flags)) {
1975-
*bdev = current_pgpath->path.dev->bdev;
1975+
*bdev = pgpath->path.dev->bdev;
19761976
r = 0;
19771977
} else {
19781978
/* pg_init has not started or completed */

0 commit comments

Comments
 (0)