diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-11-16 17:57:01 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-11-16 18:34:14 +0300 |
| commit | 2ebcabf3dba50f61850efec9a331bd061c6333e0 (patch) | |
| tree | 580d924fb6bc06d1dd94d7fd6cc3d900bc7cd886 /drivers/block/nbd.c | |
| parent | dcbddf541f18e367ac9cdad8e223d382cd303161 (diff) | |
| download | linux-2ebcabf3dba50f61850efec9a331bd061c6333e0.tar.xz | |
nbd: use set_capacity_and_notify
Use set_capacity_and_notify to update the disk and block device sizes and
send a RESIZE uevent to userspace. Note that blktests relies on uevents
being sent also for updates that did not change the device size, so the
explicit kobject_uevent remains for that case.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/nbd.c')
| -rw-r--r-- | drivers/block/nbd.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 7478a5e02bc1..45b0423ef2c5 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -299,8 +299,6 @@ static void nbd_size_clear(struct nbd_device *nbd) static int nbd_set_size(struct nbd_device *nbd, loff_t bytesize, loff_t blksize) { - struct block_device *bdev; - if (!blksize) blksize = NBD_DEF_BLKSIZE; if (blksize < 512 || blksize > PAGE_SIZE || !is_power_of_2(blksize)) @@ -320,16 +318,9 @@ static int nbd_set_size(struct nbd_device *nbd, loff_t bytesize, blk_queue_logical_block_size(nbd->disk->queue, blksize); blk_queue_physical_block_size(nbd->disk->queue, blksize); - set_capacity(nbd->disk, bytesize >> 9); - bdev = bdget_disk(nbd->disk, 0); - if (bdev) { - if (bdev->bd_disk) - bd_set_nr_sectors(bdev, bytesize >> 9); - else - set_bit(GD_NEED_PART_SCAN, &nbd->disk->state); - bdput(bdev); - } - kobject_uevent(&nbd_to_dev(nbd)->kobj, KOBJ_CHANGE); + set_bit(GD_NEED_PART_SCAN, &nbd->disk->state); + if (!set_capacity_and_notify(nbd->disk, bytesize >> 9)) + kobject_uevent(&nbd_to_dev(nbd)->kobj, KOBJ_CHANGE); return 0; } |