projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mac80211-for-john-2014-11-18' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
fs
/
nfs
/
blocklayout
/
rpc_pipefs.c
diff --git
a/fs/nfs/blocklayout/rpc_pipefs.c
b/fs/nfs/blocklayout/rpc_pipefs.c
index
8d04bda
..
e966c02
100644
(file)
--- a/
fs/nfs/blocklayout/rpc_pipefs.c
+++ b/
fs/nfs/blocklayout/rpc_pipefs.c
@@
-92,7
+92,6
@@
bl_resolve_deviceid(struct nfs_server *server, struct pnfs_block_volume *b,
set_current_state(TASK_UNINTERRUPTIBLE);
schedule();
- __set_current_state(TASK_RUNNING);
remove_wait_queue(&nn->bl_wq, &wq);
if (reply->status != BL_DEVICE_REQUEST_PROC) {