diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-07-07 13:09:53 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-07-07 13:09:53 -0400 |
| commit | 44fb7936931db66f6ba7c46f73ebb29d2725fe58 (patch) | |
| tree | 0be1bc01e36b6aea80bbae6a00f7cee123a162c3 /libre/linux-libre/3.4.2-rpc_pipefs.patch | |
| parent | de83d1a9287e1d73029b1202069e3cefae26bb31 (diff) | |
| parent | 108181f9a57602fd8d527dafb3b46fc0b59711df (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/linux-libre/3.4.2-rpc_pipefs.patch')
| -rw-r--r-- | libre/linux-libre/3.4.2-rpc_pipefs.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/libre/linux-libre/3.4.2-rpc_pipefs.patch b/libre/linux-libre/3.4.2-rpc_pipefs.patch deleted file mode 100644 index db53b3813..000000000 --- a/libre/linux-libre/3.4.2-rpc_pipefs.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c -index 0404047..21fde99 100644 ---- a/net/sunrpc/rpc_pipe.c -+++ b/net/sunrpc/rpc_pipe.c -@@ -71,7 +71,9 @@ static void rpc_purge_list(wait_queue_head_t *waitq, struct list_head *head, - msg->errno = err; - destroy_msg(msg); - } while (!list_empty(head)); -- wake_up(waitq); -+ -+ if (waitq) -+ wake_up(waitq); - } - - static void -@@ -91,11 +93,9 @@ rpc_timeout_upcall_queue(struct work_struct *work) - } - dentry = dget(pipe->dentry); - spin_unlock(&pipe->lock); -- if (dentry) { -- rpc_purge_list(&RPC_I(dentry->d_inode)->waitq, -- &free_list, destroy_msg, -ETIMEDOUT); -- dput(dentry); -- } -+ rpc_purge_list(dentry ? &RPC_I(dentry->d_inode)->waitq : NULL, -+ &free_list, destroy_msg, -ETIMEDOUT); -+ dput(dentry); - } - - ssize_t rpc_pipe_generic_upcall(struct file *filp, struct rpc_pipe_msg *msg, --- -1.7.7.6 - |