提交 c2611898 编写于 作者: J Josef Bacik 提交者: Jens Axboe

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

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: NJosef Bacik <jbacik@fb.com>
Signed-off-by: NJens Axboe <axboe@fb.com>
上级 fd8383fd
......@@ -161,6 +161,8 @@ static void nbd_end_request(struct nbd_cmd *cmd)
*/
static void sock_shutdown(struct nbd_device *nbd)
{
struct socket *sock;
spin_lock_irq(&nbd->sock_lock);
if (!nbd->sock) {
......@@ -168,18 +170,21 @@ static void sock_shutdown(struct nbd_device *nbd)
return;
}
sock = nbd->sock;
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;
spin_unlock_irq(&nbd->sock_lock);
kernel_sock_shutdown(sock, SHUT_RDWR);
sockfd_put(sock);
del_timer(&nbd->timeout_timer);
}
static void nbd_xmit_timeout(unsigned long arg)
{
struct nbd_device *nbd = (struct nbd_device *)arg;
struct socket *sock = NULL;
unsigned long flags;
if (!atomic_read(&nbd->outstanding_cmds))
......@@ -189,10 +194,16 @@ static void nbd_xmit_timeout(unsigned long arg)
nbd->timedout = true;
if (nbd->sock)
kernel_sock_shutdown(nbd->sock, SHUT_RDWR);
if (nbd->sock) {
sock = nbd->sock;
get_file(sock->file);
}
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");
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册