lkml.org 
[lkml]   [2020]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/14] block: cleanup blkdev_bszset
    Date
    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
    \
     
     \ /
      Last update: 2020-09-17 19:09    [W:4.166 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site