diff options
author | Dave Wysochanski <dwysocha@redhat.com> | 2019-06-26 16:30:24 -0400 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-07-06 14:54:53 -0400 |
commit | 80d3c45fd765fbf4f10981b60ff6b1384bdbc706 (patch) | |
tree | 492ae6a591e1f276e6b5acb599f921ae8bac4a20 | |
parent | 4368d77a4d985758303a4257c07991c079db7a75 (diff) |
SUNRPC: Fix possible autodisconnect during connect due to old last_used
Ensure last_used is updated before calling mod_timer inside
xprt_schedule_autodisconnect. This avoids a possible xprt_autoclose
firing immediately after a successful connect when xprt_unlock_connect
calls xprt_schedule_autodisconnect with an old value of last_used.
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
-rw-r--r-- | net/sunrpc/xprt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index c4d138202abb..70d6a1f10db9 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c | |||
@@ -750,6 +750,7 @@ static void | |||
750 | xprt_schedule_autodisconnect(struct rpc_xprt *xprt) | 750 | xprt_schedule_autodisconnect(struct rpc_xprt *xprt) |
751 | __must_hold(&xprt->transport_lock) | 751 | __must_hold(&xprt->transport_lock) |
752 | { | 752 | { |
753 | xprt->last_used = jiffies; | ||
753 | if (RB_EMPTY_ROOT(&xprt->recv_queue) && xprt_has_timer(xprt)) | 754 | if (RB_EMPTY_ROOT(&xprt->recv_queue) && xprt_has_timer(xprt)) |
754 | mod_timer(&xprt->timer, xprt->last_used + xprt->idle_timeout); | 755 | mod_timer(&xprt->timer, xprt->last_used + xprt->idle_timeout); |
755 | } | 756 | } |
@@ -1765,7 +1766,6 @@ void xprt_release(struct rpc_task *task) | |||
1765 | xprt->ops->release_xprt(xprt, task); | 1766 | xprt->ops->release_xprt(xprt, task); |
1766 | if (xprt->ops->release_request) | 1767 | if (xprt->ops->release_request) |
1767 | xprt->ops->release_request(task); | 1768 | xprt->ops->release_request(task); |
1768 | xprt->last_used = jiffies; | ||
1769 | xprt_schedule_autodisconnect(xprt); | 1769 | xprt_schedule_autodisconnect(xprt); |
1770 | spin_unlock(&xprt->transport_lock); | 1770 | spin_unlock(&xprt->transport_lock); |
1771 | if (req->rq_buffer) | 1771 | if (req->rq_buffer) |