Revert "SUNRPC: Declare RPC timers as TIMER_DEFERRABLE"
Jon Hunter reports: "I have been noticing intermittent failures with a system suspend test on some of our machines that have a NFS mounted root file-system. Bisecting this issue points to your commit431235818b
("SUNRPC: Declare RPC timers as TIMER_DEFERRABLE") and reverting this on top of v5.2-rc3 does appear to resolve the problem. The cause of the suspend failure appears to be a long delay observed sometimes when resuming from suspend, and this is causing our test to timeout." This reverts commit431235818b
. Reported-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
parent
b962261484
commit
502980e84e
|
@ -250,9 +250,7 @@ static void __rpc_init_priority_wait_queue(struct rpc_wait_queue *queue, const c
|
||||||
queue->maxpriority = nr_queues - 1;
|
queue->maxpriority = nr_queues - 1;
|
||||||
rpc_reset_waitqueue_priority(queue);
|
rpc_reset_waitqueue_priority(queue);
|
||||||
queue->qlen = 0;
|
queue->qlen = 0;
|
||||||
timer_setup(&queue->timer_list.timer,
|
timer_setup(&queue->timer_list.timer, __rpc_queue_timer_fn, 0);
|
||||||
__rpc_queue_timer_fn,
|
|
||||||
TIMER_DEFERRABLE);
|
|
||||||
INIT_LIST_HEAD(&queue->timer_list.list);
|
INIT_LIST_HEAD(&queue->timer_list.list);
|
||||||
rpc_assign_waitqueue_name(queue, qname);
|
rpc_assign_waitqueue_name(queue, qname);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1876,9 +1876,7 @@ found:
|
||||||
xprt->idle_timeout = 0;
|
xprt->idle_timeout = 0;
|
||||||
INIT_WORK(&xprt->task_cleanup, xprt_autoclose);
|
INIT_WORK(&xprt->task_cleanup, xprt_autoclose);
|
||||||
if (xprt_has_timer(xprt))
|
if (xprt_has_timer(xprt))
|
||||||
timer_setup(&xprt->timer,
|
timer_setup(&xprt->timer, xprt_init_autodisconnect, 0);
|
||||||
xprt_init_autodisconnect,
|
|
||||||
TIMER_DEFERRABLE);
|
|
||||||
else
|
else
|
||||||
timer_setup(&xprt->timer, NULL, 0);
|
timer_setup(&xprt->timer, NULL, 0);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue