leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nbd: don't shutdown sock with irq's disabled

Browse Source 
We hit a warning when shutting down the nbd connection because we have irq's
disabled.  We don't really need to do the shutdown under the lock, just clear
the nbd->sock.  So do the shutdown outside of the irq.  This gets rid of the
warning.

Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Josef Bacik 2016-09-08 12:33:38 -07:00 committed by Jens Axboe
parent fd8383fd88
commit c261189862
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/block/nbd.c
View File

@ -161,6 +161,8 @@ static void nbd_end_request(struct nbd_cmd *cmd)
*/ */
static void sock_shutdown(struct nbd_device *nbd) static void sock_shutdown(struct nbd_device *nbd)
{ {
struct socket *sock;
spin_lock_irq(&nbd->sock_lock); spin_lock_irq(&nbd->sock_lock);
if (!nbd->sock) { if (!nbd->sock) {
@ -168,18 +170,21 @@ static void sock_shutdown(struct nbd_device *nbd)
return; return;
} }
sock = nbd->sock;
dev_warn(disk_to_dev(nbd->disk), "shutting down socket\n"); dev_warn(disk_to_dev(nbd->disk), "shutting down socket\n");
kernel_sock_shutdown(nbd->sock, SHUT_RDWR);
sockfd_put(nbd->sock);
nbd->sock = NULL; nbd->sock = NULL;
spin_unlock_irq(&nbd->sock_lock); spin_unlock_irq(&nbd->sock_lock);
kernel_sock_shutdown(sock, SHUT_RDWR);
sockfd_put(sock);
del_timer(&nbd->timeout_timer); del_timer(&nbd->timeout_timer);
} }
static void nbd_xmit_timeout(unsigned long arg) static void nbd_xmit_timeout(unsigned long arg)
{ {
struct nbd_device *nbd = (struct nbd_device *)arg; struct nbd_device *nbd = (struct nbd_device *)arg;
struct socket *sock = NULL;
unsigned long flags; unsigned long flags;
if (!atomic_read(&nbd->outstanding_cmds)) if (!atomic_read(&nbd->outstanding_cmds))
@ -189,10 +194,16 @@ static void nbd_xmit_timeout(unsigned long arg)
nbd->timedout = true; nbd->timedout = true;
if (nbd->sock) if (nbd->sock) {
kernel_sock_shutdown(nbd->sock, SHUT_RDWR); sock = nbd->sock;
get_file(sock->file);
}
spin_unlock_irqrestore(&nbd->sock_lock, flags); spin_unlock_irqrestore(&nbd->sock_lock, flags);
if (sock) {
kernel_sock_shutdown(sock, SHUT_RDWR);
sockfd_put(sock);
}
dev_err(nbd_to_dev(nbd), "Connection timed out, shutting down connection\n"); dev_err(nbd_to_dev(nbd), "Connection timed out, shutting down connection\n");
} }