nbd: clear_sock on netlink disconnect

Josef Bacik · axboe · commit 96d97e17828f · 2018-05-16T12:54:10.000-06:00
This is what the ioctl based nbd disconnect does as well.  Without this
the device will just sit there and wait for the connection to go away
(or IO to occur) before the device gets torn down.  Instead clear
everything up on our end so the configuration goes away as quickly as
possible.

Signed-off-by: Josef Bacik &lt;jbacik@fb.com&gt;
Signed-off-by: Jens Axboe &lt;axboe@kernel.dk&gt;
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
@@ -1768,6 +1768,7 @@ static int nbd_genl_disconnect(struct sk_buff *skb, struct genl_info *info)
 	}
 	mutex_lock(&nbd->config_lock);
 	nbd_disconnect(nbd);
+	nbd_clear_sock(nbd);
 	mutex_unlock(&nbd->config_lock);
 	if (test_and_clear_bit(NBD_HAS_CONFIG_REF,
 			       &nbd->config->runtime_flags))

Original file line number	Diff line number	Diff line change
`@@ -1768,6 +1768,7 @@ static int nbd_genl_disconnect(struct sk_buff skb, struct genl_info info)`
`1768`	`1768`	`}`
`1769`	`1769`	`mutex_lock(&nbd->config_lock);`
`1770`	`1770`	`nbd_disconnect(nbd);`
	`1771`	`+ nbd_clear_sock(nbd);`
`1771`	`1772`	`mutex_unlock(&nbd->config_lock);`
`1772`	`1773`	`if (test_and_clear_bit(NBD_HAS_CONFIG_REF,`
`1773`	`1774`	`&nbd->config->runtime_flags))`