projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b4a1278
)
nbd: fix incorrect unlock of nbd->sock_lock in sock_shutdown
author
John W. Linville
<
[email protected]
>
Mon, 24 Oct 2016 19:13:25 +0000
(15:13 -0400)
committer
Jens Axboe
<
[email protected]
>
Mon, 24 Oct 2016 19:18:14 +0000
(13:18 -0600)
Commit
0eadf37afc250
("nbd: allow block mq to deal with timeouts")
changed normal usage of nbd->sock_lock to use spin_lock/spin_unlock
rather than the *_irq variants, but it missed this unlock in an
error path.
Found by Coverity, CID
1373871
.
Signed-off-by: John W. Linville <
[email protected]
>
Cc: Josef Bacik <
[email protected]
>
Cc: Jens Axboe <
[email protected]
>
Cc: Markus Pargmann <
[email protected]
>
Fixes: 0eadf37afc250 ("nbd: allow block mq to deal with timeouts")
Signed-off-by: Jens Axboe <
[email protected]
>
drivers/block/nbd.c
patch
|
blob
|
history
diff --git
a/drivers/block/nbd.c
b/drivers/block/nbd.c
index ba405b55329fb7d784213ea582eae429f05c2bc2..19a16b2dbb917afea67225290ee2d8da654db41d 100644
(file)
--- a/
drivers/block/nbd.c
+++ b/
drivers/block/nbd.c
@@
-164,7
+164,7
@@
static void sock_shutdown(struct nbd_device *nbd)
spin_lock(&nbd->sock_lock);
if (!nbd->sock) {
- spin_unlock
_irq
(&nbd->sock_lock);
+ spin_unlock(&nbd->sock_lock);
return;
}