commit 478162821dfb4396c53f07ad82dc32cd0f525cea
author Christoph Hellwig <hch@lst.de> Mon Sep 21 09:19:47 2020 +0200
committer Jens Axboe <axboe@kernel.dk> Wed Sep 23 10:43:19 2020 -0600
tree d38bf0eac97e98602d997aea28c3bbda5374d5d0
parent 9301fe734384990ef9a2463cb7aeb3b00bf5dad5

block: cleanup blkdev_bszset

Use blkdev_get_by_dev instead of bdgrab + blkdev_get.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

block/ioctl.c

diff --git a/block/ioctl.c b/block/ioctl.c
index ae74d04..06262c2 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -478,15 +478,14 @@ static int blkdev_bszset(struct block_device *bdev, fmode_t mode,
 	if (get_user(n, argp))
 		return -EFAULT;
 
-	if (!(mode & FMODE_EXCL)) {
-		bdgrab(bdev);
-		if (blkdev_get(bdev, mode | FMODE_EXCL, &bdev) < 0)
-			return -EBUSY;
-	}
+	if (mode & FMODE_EXCL)
+		return set_blocksize(bdev, n);
 
+	if (IS_ERR(blkdev_get_by_dev(bdev->bd_dev, mode | FMODE_EXCL, &bdev)))
+		return -EBUSY;
 	ret = set_blocksize(bdev, n);
-	if (!(mode & FMODE_EXCL))
-		blkdev_put(bdev, mode | FMODE_EXCL);
+	blkdev_put(bdev, mode | FMODE_EXCL);
+
 	return ret;
 }