1 files changed, 15 insertions, 11 deletions

diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 81e00a6c19de..c76ea221798c 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -39,23 +39,26 @@ static kmem_cache_t *rpc_inode_cachep __read_mostly;
 #define RPC_UPCALL_TIMEOUT (30*HZ)
 
 static void
-__rpc_purge_upcall(struct inode *inode, int err)
+__rpc_purge_list(struct rpc_inode *rpci, struct list_head *head, int err)
 {
-        struct rpc_inode *rpci = RPC_I(inode);
         struct rpc_pipe_msg *msg;
+        void (*destroy_msg)(struct rpc_pipe_msg *);
 
-        while (!list_empty(&rpci->pipe)) {
-                msg = list_entry(rpci->pipe.next, struct rpc_pipe_msg, list);
+        destroy_msg = rpci->ops->destroy_msg;
+        while (!list_empty(head)) {
+                msg = list_entry(head->next, struct rpc_pipe_msg, list);
                 list_del_init(&msg->list);
                 msg->errno = err;
-                rpci->ops->destroy_msg(msg);
-        }
-        while (!list_empty(&rpci->in_upcall)) {
-                msg = list_entry(rpci->pipe.next, struct rpc_pipe_msg, list);
-                list_del_init(&msg->list);
-                msg->errno = err;
-                rpci->ops->destroy_msg(msg);
+                destroy_msg(msg);
         }
+}
+
+static void
+__rpc_purge_upcall(struct inode *inode, int err)
+{
+        struct rpc_inode *rpci = RPC_I(inode);
+
+        __rpc_purge_list(rpci, &rpci->pipe, err);
         rpci->pipelen = 0;
         wake_up(&rpci->waitq);
 }
@@ -115,6 +118,7 @@ rpc_close_pipes(struct inode *inode)
         down(&inode->i_sem);
         if (rpci->ops != NULL) {
                 rpci->nreaders = 0;
+                __rpc_purge_list(rpci, &rpci->in_upcall, -EPIPE);
                 __rpc_purge_upcall(inode, -EPIPE);
                 rpci->nwriters = 0;
                 if (rpci->ops->release_pipe)