summaryrefslogtreecommitdiff
path: root/net/sunrpc/clnt.c
diff options
context:
space:
mode:
authorJeff Layton <jlayton@poochiereds.net>2015-06-03 16:14:26 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-06-10 18:26:18 -0400
commit8e2281330f9930bccf77cf04027ec60b6cc0fb34 (patch)
tree6047f570e0ec5de10303d29326d6f62f5d0e2065 /net/sunrpc/clnt.c
parent3c87ef6efb40f0e339d705c194b2224f854ec38e (diff)
sunrpc: make xprt->swapper an atomic_t
Split xs_swapper into enable/disable functions and eliminate the "enable" flag. Currently, it's racy if you have multiple swapon/swapoff operations running in parallel over the same xprt. Also fix it so that we only set it to a memalloc socket on a 0->1 transition and only clear it on a 1->0 transition. Cc: Mel Gorman <mgorman@suse.de> Signed-off-by: Jeff Layton <jeff.layton@primarydata.com> Reviewed-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'net/sunrpc/clnt.c')
-rw-r--r--net/sunrpc/clnt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 0ba65156a62b..801044aeeedd 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -2495,7 +2495,7 @@ retry:
goto retry;
}
- ret = xs_swapper(xprt, 1);
+ ret = xs_swapper_enable(xprt);
xprt_put(xprt);
}
return ret;
@@ -2522,7 +2522,7 @@ retry:
goto retry;
}
- xs_swapper(xprt, 0);
+ xs_swapper_disable(xprt);
xprt_put(xprt);
}
}