[PATCH 03/14] block: cleanup blkdev_bszset
From: Christoph Hellwig <hch@lst.de>
Date: 2020-09-21 07:20:45
Also in:
linux-block, linux-fsdevel, linux-ide, linux-mm, linux-s390, lkml, ocfs2-devel
Subsystem:
block layer, the rest · Maintainers:
Jens Axboe, Linus Torvalds
Use blkdev_get_by_dev instead of bdgrab + blkdev_get. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/ioctl.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/block/ioctl.c b/block/ioctl.c
index ae74d0409afab9..06262c28f0c6c1 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; }
--
2.28.0