mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 22:02:28 +00:00
rnbd-clt: check capacity inside rnbd_clt_change_capacity
Currently, process_msg_open_rsp checks if capacity changed or not before call rnbd_clt_change_capacity while the checking also make sense for rnbd_clt_resize_dev_store, let's move the checking into the function. Acked-by: Jack Wang <jinpu.wang@ionos.com> Signed-off-by: Guoqing Jiang <guoqing.jiang@linux.dev> Link: https://lore.kernel.org/r/20220706133152.12058-7-guoqing.jiang@linux.dev Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
59f070de12
commit
fb516fa367
@ -71,6 +71,12 @@ static inline bool rnbd_clt_get_dev(struct rnbd_clt_dev *dev)
|
||||
static int rnbd_clt_change_capacity(struct rnbd_clt_dev *dev,
|
||||
size_t new_nsectors)
|
||||
{
|
||||
if (get_capacity(dev->gd) == new_nsectors)
|
||||
return 0;
|
||||
|
||||
/*
|
||||
* If the size changed, we need to revalidate it
|
||||
*/
|
||||
rnbd_clt_info(dev, "Device size changed from %llu to %zu sectors\n",
|
||||
get_capacity(dev->gd), new_nsectors);
|
||||
set_capacity_and_notify(dev->gd, new_nsectors);
|
||||
@ -93,12 +99,7 @@ static int process_msg_open_rsp(struct rnbd_clt_dev *dev,
|
||||
if (dev->dev_state == DEV_STATE_MAPPED_DISCONNECTED) {
|
||||
u64 nsectors = le64_to_cpu(rsp->nsectors);
|
||||
|
||||
/*
|
||||
* If the device was remapped and the size changed in the
|
||||
* meantime we need to revalidate it
|
||||
*/
|
||||
if (get_capacity(dev->gd) != nsectors)
|
||||
rnbd_clt_change_capacity(dev, nsectors);
|
||||
rnbd_clt_change_capacity(dev, nsectors);
|
||||
gd_kobj = &disk_to_dev(dev->gd)->kobj;
|
||||
kobject_uevent(gd_kobj, KOBJ_ONLINE);
|
||||
rnbd_clt_info(dev, "Device online, device remapped successfully\n");
|
||||
|
Loading…
Reference in New Issue
Block a user