[ 17/61] rpc_pipefs: allow rpc_purge_list to take a NULL waitq pointer
From: Greg KH <gregkh@linuxfoundation.org>
Date: 2012-06-20 18:21:55
Also in:
lkml
3.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jeff Layton <redacted> commit 92123e068efa310b09e9943ac1cfd10ff6b6d2e4 upstream. 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. Reported-by: Hans de Bruin <redacted> Reported-by: Joerg Platte <redacted> Signed-off-by: Jeff Layton <redacted> Signed-off-by: Trond Myklebust <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- net/sunrpc/rpc_pipe.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c@@ -71,7 +71,9 @@ static void rpc_purge_list(wait_queue_he 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_str } 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,