---

yaml
---
r: 310959
b: refs/heads/master
c: 92123e0
h: refs/heads/master
i:
  310957: 13c641e
  310955: 7c0ac81
  310951: 6fc0b62
  310943: 9c4af76
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2669940db8d02147181e338bb6db98394569f31a
+refs/heads/master: 92123e068efa310b09e9943ac1cfd10ff6b6d2e4

trunk/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,