lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SUNRPC: Fix a potential race in rpc_pipefs.

Browse Source 
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust
2006-01-03 09:55:36 +01:00
parent 566dd6064e
commit 969b7f2522
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
net/sunrpc/rpc_pipe.c
View File

@@ -70,8 +70,11 @@ rpc_timeout_upcall_queue(void *data)
struct inode *inode = &rpci->vfs_inode; struct inode *inode = &rpci->vfs_inode;
down(&inode->i_sem); down(&inode->i_sem);
if (rpci->ops == NULL)
goto out;
if (rpci->nreaders == 0 && !list_empty(&rpci->pipe)) if (rpci->nreaders == 0 && !list_empty(&rpci->pipe))
__rpc_purge_upcall(inode, -ETIMEDOUT); __rpc_purge_upcall(inode, -ETIMEDOUT);
out:
up(&inode->i_sem); up(&inode->i_sem);
} }
@@ -113,8 +116,6 @@ rpc_close_pipes(struct inode *inode)
{ {
struct rpc_inode *rpci = RPC_I(inode); struct rpc_inode *rpci = RPC_I(inode);
cancel_delayed_work(&rpci->queue_timeout);
flush_scheduled_work();
down(&inode->i_sem); down(&inode->i_sem);
if (rpci->ops != NULL) { if (rpci->ops != NULL) {
rpci->nreaders = 0; rpci->nreaders = 0;
@@ -127,6 +128,8 @@ rpc_close_pipes(struct inode *inode)
} }
rpc_inode_setowner(inode, NULL); rpc_inode_setowner(inode, NULL);
up(&inode->i_sem); up(&inode->i_sem);
cancel_delayed_work(&rpci->queue_timeout);
flush_scheduled_work();
} }
static struct inode * static struct inode *
@@ -166,7 +169,7 @@ rpc_pipe_open(struct inode *inode, struct file *filp)
static int static int
rpc_pipe_release(struct inode *inode, struct file *filp) rpc_pipe_release(struct inode *inode, struct file *filp)
{ {
struct rpc_inode *rpci = RPC_I(filp->f_dentry->d_inode); struct rpc_inode *rpci = RPC_I(inode);
struct rpc_pipe_msg *msg; struct rpc_pipe_msg *msg;
down(&inode->i_sem); down(&inode->i_sem);