evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nbd: sock_shutdown, remove conditional lock

Browse source 
Move the conditional lock from sock_shutdown into the surrounding code.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Markus Pargmann 2015-08-17 08:20:01 +02:00 • committed by Jens Axboe
parent 7e2893a16d
commit 36e47bee7c
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/block/nbd.c
View file

@ -117,18 +117,14 @@ static void nbd_end_request(struct nbd_device *nbd, struct request *req)
/* /*
* Forcibly shutdown the socket causing all listeners to error * Forcibly shutdown the socket causing all listeners to error
*/ */
static void sock_shutdown(struct nbd_device *nbd, int lock) static void sock_shutdown(struct nbd_device *nbd)
{ {
if (lock)
mutex_lock(&nbd->tx_lock);
if (nbd->sock) { if (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); kernel_sock_shutdown(nbd->sock, SHUT_RDWR);
nbd->sock = NULL; nbd->sock = NULL;
del_timer_sync(&nbd->timeout_timer); del_timer_sync(&nbd->timeout_timer);
} }
if (lock)
mutex_unlock(&nbd->tx_lock);
} }
static void nbd_xmit_timeout(unsigned long arg) static void nbd_xmit_timeout(unsigned long arg)
@ -427,7 +423,9 @@ static int nbd_do_it(struct nbd_device *nbd)
ret = dequeue_signal_lock(current, &current->blocked, &info); ret = dequeue_signal_lock(current, &current->blocked, &info);
dev_warn(nbd_to_dev(nbd), "pid %d, %s, got signal %d\n", dev_warn(nbd_to_dev(nbd), "pid %d, %s, got signal %d\n",
task_pid_nr(current), current->comm, ret); task_pid_nr(current), current->comm, ret);
sock_shutdown(nbd, 1); mutex_lock(&nbd->tx_lock);
sock_shutdown(nbd);
mutex_unlock(&nbd->tx_lock);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
} }
@ -541,7 +539,9 @@ static int nbd_thread(void *data)
&info); &info);
dev_warn(nbd_to_dev(nbd), "pid %d, %s, got signal %d\n", dev_warn(nbd_to_dev(nbd), "pid %d, %s, got signal %d\n",
task_pid_nr(current), current->comm, ret); task_pid_nr(current), current->comm, ret);
sock_shutdown(nbd, 1); mutex_lock(&nbd->tx_lock);
sock_shutdown(nbd);
mutex_unlock(&nbd->tx_lock);
break; break;
} }
@ -735,7 +735,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
mutex_lock(&nbd->tx_lock); mutex_lock(&nbd->tx_lock);
if (error) if (error)
return error; return error;
sock_shutdown(nbd, 0); sock_shutdown(nbd);
sock = nbd->sock; sock = nbd->sock;
nbd->sock = NULL; nbd->sock = NULL;
nbd_clear_que(nbd); nbd_clear_que(nbd);