diff options
| author | Márcio Alexandre Silva Delgado <coadde@adinet.com.uy> | 2012-06-15 02:53:19 -0300 |
|---|---|---|
| committer | Márcio Alexandre Silva Delgado <coadde@adinet.com.uy> | 2012-06-15 02:53:19 -0300 |
| commit | 8a89f7ebd6c48f867dc8d2100e4bb15be2142e38 (patch) | |
| tree | e5e5a766776c364973bd63a48c0768cf7ec0bedb /libre/linux-libre/3.4.2-rpc_pipefs.patch | |
| parent | cc7a13a496eec533871b51c90869bc420c90a481 (diff) | |
| parent | f3dc42cd5e42eb58648259677261c77b5ec2d46a (diff) | |
Merge 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 | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/libre/linux-libre/3.4.2-rpc_pipefs.patch b/libre/linux-libre/3.4.2-rpc_pipefs.patch new file mode 100644 index 000000000..5c3245669 --- /dev/null +++ b/libre/linux-libre/3.4.2-rpc_pipefs.patch @@ -0,0 +1,34 @@ +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 + + |