diff options
| author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2021-06-26 12:20:23 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2021-07-08 14:03:26 -0400 |
| commit | 878b3dfc42c4ddbf9e38cd9061e3ddd99a69747a (patch) | |
| tree | 4257a40c5e9f4f3554da52ae27d6ab48a2cd448a /net/sunrpc/xprtmultipath.c | |
| parent | dd5c153ed7839e1e7c131dae7fa4d8eaaafb3eac (diff) | |
| parent | 6f081693e7b2ba63422b735684b05a850a6351ba (diff) | |
| download | linux-878b3dfc42c4ddbf9e38cd9061e3ddd99a69747a.tar.gz linux-878b3dfc42c4ddbf9e38cd9061e3ddd99a69747a.tar.bz2 linux-878b3dfc42c4ddbf9e38cd9061e3ddd99a69747a.zip | |
Merge part 2 of branch 'sysfs-devel'
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'net/sunrpc/xprtmultipath.c')
| -rw-r--r-- | net/sunrpc/xprtmultipath.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/sunrpc/xprtmultipath.c b/net/sunrpc/xprtmultipath.c index 07e76ae1028a..5f4845d1e922 100644 --- a/net/sunrpc/xprtmultipath.c +++ b/net/sunrpc/xprtmultipath.c @@ -65,7 +65,8 @@ static void xprt_switch_remove_xprt_locked(struct rpc_xprt_switch *xps, { if (unlikely(xprt == NULL)) return; - xps->xps_nactive--; + if (!test_bit(XPRT_OFFLINE, &xprt->state)) + xps->xps_nactive--; xps->xps_nxprts--; if (xps->xps_nxprts == 0) xps->xps_net = NULL; @@ -230,7 +231,8 @@ void xprt_iter_default_rewind(struct rpc_xprt_iter *xpi) static bool xprt_is_active(const struct rpc_xprt *xprt) { - return kref_read(&xprt->kref) != 0; + return (kref_read(&xprt->kref) != 0 && + !test_bit(XPRT_OFFLINE, &xprt->state)); } static |