Commit 80d3c45f authored by Dave Wysochanski's avatar Dave Wysochanski Committed by Trond Myklebust
Browse files

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: default avatarDave Wysochanski <dwysocha@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 4368d77a

net/sunrpc/xprt.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -750,6 +750,7 @@ static void 
xprt_schedule_autodisconnect(struct rpc_xprt *xprt)

xprt_schedule_autodisconnect(struct rpc_xprt *xprt)

	__must_hold(&xprt->transport_lock)

	__must_hold(&xprt->transport_lock)

{

{

	xprt->last_used = jiffies;

	if (RB_EMPTY_ROOT(&xprt->recv_queue) && xprt_has_timer(xprt))

	if (RB_EMPTY_ROOT(&xprt->recv_queue) && xprt_has_timer(xprt))

		mod_timer(&xprt->timer, xprt->last_used + xprt->idle_timeout);

		mod_timer(&xprt->timer, xprt->last_used + xprt->idle_timeout);

}

}
@@ -1765,7 +1766,6 @@ void xprt_release(struct rpc_task *task) 
	xprt->ops->release_xprt(xprt, task);

	xprt->ops->release_xprt(xprt, task);

	if (xprt->ops->release_request)

	if (xprt->ops->release_request)

		xprt->ops->release_request(task);

		xprt->ops->release_request(task);

	xprt->last_used = jiffies;

	xprt_schedule_autodisconnect(xprt);

	xprt_schedule_autodisconnect(xprt);

	spin_unlock(&xprt->transport_lock);

	spin_unlock(&xprt->transport_lock);

	if (req->rq_buffer)

	if (req->rq_buffer)

CRA Git | Maintained and supported by SUSTech CRA and CCSE