4 files changed, 19 insertions, 3 deletions

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index dd2f13077be..6c6e2c46122 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -493,8 +493,11 @@ static int nfs_release_page(struct page *page, gfp_t gfp)
 
         dfprintk(PAGECACHE, "NFS: release_page(%p)\n", page);
 
-        /* Only do I/O if gfp is a superset of GFP_KERNEL */
-        if (mapping && (gfp & GFP_KERNEL) == GFP_KERNEL) {
+        /* Only do I/O if gfp is a superset of GFP_KERNEL, and we're not
+         * doing this memory reclaim for a fs-related allocation.
+         */
+        if (mapping && (gfp & GFP_KERNEL) == GFP_KERNEL &&
+            !(current->flags & PF_FSTRANS)) {
                 int how = FLUSH_SYNC;
 
                 /* Don't let kswapd deadlock waiting for OOM RPC calls */
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index b6bb22571c5..c57f97f44e6 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -713,7 +713,9 @@ void rpc_execute(struct rpc_task *task)
 
 static void rpc_async_schedule(struct work_struct *work)
 {
+        current->flags |= PF_FSTRANS;
         __rpc_execute(container_of(work, struct rpc_task, u.tk_work));
+        current->flags &= ~PF_FSTRANS;
 }
 
 /**
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index 0867070bb5c..d0b5210d981 100644
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -200,6 +200,7 @@ xprt_rdma_connect_worker(struct work_struct *work)
         int rc = 0;
 
         if (!xprt->shutdown) {
+                current->flags |= PF_FSTRANS;
                 xprt_clear_connected(xprt);
 
                 dprintk("RPC:       %s: %sconnect\n", __func__,
@@ -212,10 +213,10 @@ xprt_rdma_connect_worker(struct work_struct *work)
 
 out:
         xprt_wake_pending_tasks(xprt, rc);
-
 out_clear:
         dprintk("RPC:       %s: exit\n", __func__);
         xprt_clear_connecting(xprt);
+        current->flags &= ~PF_FSTRANS;
 }
 
 /*
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index ea7507979b0..554111f42b0 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1882,6 +1882,8 @@ static void xs_local_setup_socket(struct work_struct *work)
         if (xprt->shutdown)
                 goto out;
 
+        current->flags |= PF_FSTRANS;
+
         clear_bit(XPRT_CONNECTION_ABORT, &xprt->state);
         status = __sock_create(xprt->xprt_net, AF_LOCAL,
                                         SOCK_STREAM, 0, &sock, 1);
@@ -1915,6 +1917,7 @@ static void xs_local_setup_socket(struct work_struct *work)
 out:
         xprt_clear_connecting(xprt);
         xprt_wake_pending_tasks(xprt, status);
+        current->flags &= ~PF_FSTRANS;
 }
 
 static void xs_udp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
@@ -1957,6 +1960,8 @@ static void xs_udp_setup_socket(struct work_struct *work)
         if (xprt->shutdown)
                 goto out;
 
+        current->flags |= PF_FSTRANS;
+
         /* Start by resetting any existing state */
         xs_reset_transport(transport);
         sock = xs_create_sock(xprt, transport,
@@ -1975,6 +1980,7 @@ static void xs_udp_setup_socket(struct work_struct *work)
 out:
         xprt_clear_connecting(xprt);
         xprt_wake_pending_tasks(xprt, status);
+        current->flags &= ~PF_FSTRANS;
 }
 
 /*
@@ -2100,6 +2106,8 @@ static void xs_tcp_setup_socket(struct work_struct *work)
         if (xprt->shutdown)
                 goto out;
 
+        current->flags |= PF_FSTRANS;
+
         if (!sock) {
                 clear_bit(XPRT_CONNECTION_ABORT, &xprt->state);
                 sock = xs_create_sock(xprt, transport,
@@ -2149,6 +2157,7 @@ static void xs_tcp_setup_socket(struct work_struct *work)
         case -EINPROGRESS:
         case -EALREADY:
                 xprt_clear_connecting(xprt);
+                current->flags &= ~PF_FSTRANS;
                 return;
         case -EINVAL:
                 /* Happens, for instance, if the user specified a link
@@ -2161,6 +2170,7 @@ out_eagain:
 out:
         xprt_clear_connecting(xprt);
         xprt_wake_pending_tasks(xprt, status);
+        current->flags &= ~PF_FSTRANS;
 }
 
 /**