[RHEL7,COMMIT] nbd: move nbd_size_update() of of the loop.

Submitted by Konstantin Khorenko on Nov. 6, 2019, 5:29 a.m.

Details

Message ID 201911060529.xA65TZS2030650@finist-ce7.sw.ru
State New
Series "Series without cover letter"
Headers show

Commit Message

Konstantin Khorenko Nov. 6, 2019, 5:29 a.m.
The commit is pushed to "branch-rh7-3.10.0-1062.4.1.vz7.115.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1062.4.1.vz7.115.10
------>
commit 5a54ea29f434e723b0eeabf4b7cd5f61ae2e01d1
Author: Andrey Ryabinin <aryabinin@virtuozzo.com>
Date:   Wed Nov 6 08:29:34 2019 +0300

    nbd: move nbd_size_update() of of the loop.
    
    nbd_size_update() should be called only once, not once per-connection.
    Move it out of the loop.
    
    Fixes: 584f48d40cbc ("nbd: don't set the device size until we're connected")
    Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
---
 drivers/block/nbd.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 79de456643cf..362fe546cb2c 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -974,11 +974,10 @@  static int nbd_start_device(struct nbd_device *nbd, struct block_device *bdev)
 		args->nbd = nbd;
 		args->index = i;
 		queue_work(recv_workqueue, &args->work);
-		nbd_size_update(nbd);
 		if (max_part)
 			bdev->bd_invalidated = 1;
-
 	}
+	nbd_size_update(nbd);
 	error = wait_event_interruptible(config->recv_wq,
 					 atomic_read(&config->recv_threads) == 0);
 	if (error)