diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-12-03 15:20:10 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-12-03 15:20:10 -0500 |
commit | bb184f3356adbbb1605df2f7c570b4c92231fa3a (patch) | |
tree | b3f69a116b2f7f1cd78bbcb14203ea89dda6aeba | |
parent | 24aa1fe6779eaddb3e0b1b802585dcf6faf9cc44 (diff) |
SUNRPC: Fix Oopsable condition in rpc_pipefs
The elements on rpci->in_upcall are tracked by the filp->private_data,
which will ensure that they get released when the file is closed.
The exception is if rpc_close_pipes() gets called first, since that
sets rpci->ops to NULL.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r-- | net/sunrpc/rpc_pipe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index e3b242daf53c..c76ea221798c 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c | |||
@@ -59,7 +59,6 @@ __rpc_purge_upcall(struct inode *inode, int err) | |||
59 | struct rpc_inode *rpci = RPC_I(inode); | 59 | struct rpc_inode *rpci = RPC_I(inode); |
60 | 60 | ||
61 | __rpc_purge_list(rpci, &rpci->pipe, err); | 61 | __rpc_purge_list(rpci, &rpci->pipe, err); |
62 | __rpc_purge_list(rpci, &rpci->in_upcall, err); | ||
63 | rpci->pipelen = 0; | 62 | rpci->pipelen = 0; |
64 | wake_up(&rpci->waitq); | 63 | wake_up(&rpci->waitq); |
65 | } | 64 | } |
@@ -119,6 +118,7 @@ rpc_close_pipes(struct inode *inode) | |||
119 | down(&inode->i_sem); | 118 | down(&inode->i_sem); |
120 | if (rpci->ops != NULL) { | 119 | if (rpci->ops != NULL) { |
121 | rpci->nreaders = 0; | 120 | rpci->nreaders = 0; |
121 | __rpc_purge_list(rpci, &rpci->in_upcall, -EPIPE); | ||
122 | __rpc_purge_upcall(inode, -EPIPE); | 122 | __rpc_purge_upcall(inode, -EPIPE); |
123 | rpci->nwriters = 0; | 123 | rpci->nwriters = 0; |
124 | if (rpci->ops->release_pipe) | 124 | if (rpci->ops->release_pipe) |