From: Mike Snitzer <snitzer@redhat.com>
Date: Thu, 11 Jun 2020 01:25:39 +0000 (-0400)
Subject: dm mpath: rename current_pgpath to pgpath in multipath_prepare_ioctl
X-Git-Tag: v5.9-rc1~93^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=564dbb130b3f8ab39719a42c130505bf75610fbf;p=thirdparty%2Fkernel%2Flinux.git

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 <snitzer@redhat.com>
---

diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index ab6ccd619573a..f71bb4e5eaf7e 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -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 */