[v4,rebase,07/10] bdev: separate parts of __blkdev_get as helper functions

Commit Message

Michal Suchanek Nov. 26, 2019, 7:54 p.m. UTC

This code will be reused in later patch. Hopefully putting it aside
rather than cut&pasting another copy will make the function more
readable.

Signed-off-by: Michal Suchanek <[e-mail]>
---
 fs/block_dev.c | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

Patch

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 545bb6c8848a..a386ebd997fb 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1547,6 +1547,24 @@  int bdev_disk_changed(struct block_device *bdev, bool invalidate)
  */
 EXPORT_SYMBOL_GPL(bdev_disk_changed);
 
+static void blkdev_init_size(struct block_device *bdev)
+{
+	bd_set_size(bdev, (loff_t)get_capacity(bdev->bd_disk) << 9);
+	set_init_blocksize(bdev);
+}
+
+static void blkdev_do_partitions(struct block_device *bdev, int ret)
+{
+	/*
+	 * If the device is invalidated, rescan partition if open succeeded or
+	 * failed with -ENOMEDIUM.  The latter is necessary to prevent ghost
+	 * partitions on a removed medium.
+	 */
+	if (bdev->bd_invalidated &&
+			(!ret || ret == -ENOMEDIUM))
+		bdev_disk_changed(bdev, ret == -ENOMEDIUM);
+}
+
 /*
  * bd_mutex locking:
  *
@@ -1619,20 +1637,9 @@  static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
 				}
 			}
 
-			if (!ret) {
-				bd_set_size(bdev,(loff_t)get_capacity(disk)<<9);
-				set_init_blocksize(bdev);
-			}
-
-			/*
-			 * If the device is invalidated, rescan partition
-			 * if open succeeded or failed with -ENOMEDIUM.
-			 * The latter is necessary to prevent ghost
-			 * partitions on a removed medium.
-			 */
-			if (bdev->bd_invalidated &&
-			    (!ret || ret == -ENOMEDIUM))
-				bdev_disk_changed(bdev, ret == -ENOMEDIUM);
+			if (!ret)
+				blkdev_init_size(bdev);
+			blkdev_do_partitions(bdev, ret);
 
 			if (ret)
 				goto out_clear;
@@ -1664,10 +1671,9 @@  static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
 			ret = 0;
 			if (bdev->bd_disk->fops->open)
 				ret = bdev->bd_disk->fops->open(bdev, mode);
-			/* the same as first opener case, read comment there */
-			if (bdev->bd_invalidated &&
-			    (!ret || ret == -ENOMEDIUM))
-				bdev_disk_changed(bdev, ret == -ENOMEDIUM);
+
+			blkdev_do_partitions(bdev, ret);
+
 			if (ret)
 				goto out_unlock_bdev;
 		}