From: medadyoung@gmail.com
To: jbacik@fb.com, axboe@kernel.dk
Cc: linux-block@vger.kernel.org, nbd@other.debian.org,
linux-kernel@vger.kernel.org, openbmc@lists.ozlabs.org,
Medad <medadyoung@gmail.com>
Subject: [PATCH] nbd:clear NBD_BOUND flag when NBD connection is closed
Date: Tue, 11 Dec 2018 14:17:03 +0800 [thread overview]
Message-ID: <1544509023-18923-1-git-send-email-medadyoung@gmail.com> (raw)
From: Medad <medadyoung@gmail.com>
If we do NOT clear NBD_BOUND flag when NBD connection is closed,
then the original NBD device could not be used again.
Signed-off-by: Medad <medadyoung@gmail.com>
---
drivers/block/nbd.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 64278f4..5c88490 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -277,10 +277,14 @@ static void sock_shutdown(struct nbd_device *nbd)
struct nbd_config *config = nbd->config;
int i;
- if (config->num_connections == 0)
+ if (config->num_connections == 0) {
+ clear_bit(NBD_BOUND, &config->runtime_flags);
return;
- if (test_and_set_bit(NBD_DISCONNECTED, &config->runtime_flags))
+ }
+ if (test_and_set_bit(NBD_DISCONNECTED, &config->runtime_flags)) {
+ clear_bit(NBD_BOUND, &config->runtime_flags);
return;
+ }
for (i = 0; i < config->num_connections; i++) {
struct nbd_sock *nsock = config->socks[i];
@@ -944,7 +948,7 @@ static int nbd_reconnect_socket(struct nbd_device *nbd, unsigned long arg)
sockfd_put(old);
clear_bit(NBD_DISCONNECTED, &config->runtime_flags);
-
+ clear_bit(NBD_BOUND, &config->runtime_flags);
/* We take the tx_mutex in an error path in the recv_work, so we
* need to queue_work outside of the tx_mutex.
*/
@@ -1020,6 +1024,7 @@ static int nbd_disconnect(struct nbd_device *nbd)
dev_info(disk_to_dev(nbd->disk), "NBD_DISCONNECT\n");
set_bit(NBD_DISCONNECT_REQUESTED, &config->runtime_flags);
send_disconnects(nbd);
+ clear_bit(NBD_BOUND, &config->runtime_flags);
return 0;
}
--
2.7.4
next reply other threads:[~2018-12-11 6:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-11 6:17 medadyoung [this message]
2018-12-13 14:21 ` [PATCH] nbd:clear NBD_BOUND flag when NBD connection is closed Adriana Kobylak
2019-04-03 17:13 ` Adriana Kobylak
2019-04-03 17:49 ` Josef Bacik
2019-04-04 15:31 ` Adriana Kobylak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1544509023-18923-1-git-send-email-medadyoung@gmail.com \
--to=medadyoung@gmail.com \
--cc=axboe@kernel.dk \
--cc=jbacik@fb.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nbd@other.debian.org \
--cc=openbmc@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).