hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rpc_pipefs: allow rpc_purge_list to take a NULL waitq pointer 

In the event that we don't have a dentry for a rpc_pipefs pipe, we still
need to allow the queue_timeout job to clean out the queue. There's just
no waitq to wake up in that event.

Cc: stable@kernel.org
Reported-by: Hans de Bruin <jmdebruin@xmsnet.nl>
Reported-by: Joerg Platte <jplatte@naasa.net>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Jeff Layton 2012-06-11 10:03:42 -04:00 committed by Trond Myklebust
parent 2669940db8
commit 92123e068e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/sunrpc/rpc_pipe.c
View File

@ -71,6 +71,8 @@ static void rpc_purge_list(wait_queue_head_t *waitq, struct list_head *head,
msg->errno = err; msg->errno = err;
destroy_msg(msg); destroy_msg(msg);
} while (!list_empty(head)); } while (!list_empty(head));
if (waitq)
wake_up(waitq); wake_up(waitq);
} }
@ -91,12 +93,10 @@ rpc_timeout_upcall_queue(struct work_struct *work)
} }
dentry = dget(pipe->dentry); dentry = dget(pipe->dentry);
spin_unlock(&pipe->lock); spin_unlock(&pipe->lock);
if (dentry) { rpc_purge_list(dentry ? &RPC_I(dentry->d_inode)->waitq : NULL,
rpc_purge_list(&RPC_I(dentry->d_inode)->waitq,
&free_list, destroy_msg, -ETIMEDOUT); &free_list, destroy_msg, -ETIMEDOUT);
dput(dentry); dput(dentry);
} }
}
ssize_t rpc_pipe_generic_upcall(struct file *filp, struct rpc_pipe_msg *msg, ssize_t rpc_pipe_generic_upcall(struct file *filp, struct rpc_pipe_msg *msg,
char __user *dst, size_t buflen) char __user *dst, size_t buflen)