Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 502980e8 authored by Anna Schumaker's avatar Anna Schumaker
Browse files

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 commit 43123581 ("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 commit 43123581.

Reported-by: default avatarJon Hunter <jonathanh@nvidia.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent b9622614

net/sunrpc/sched.c

+1 −3
Original line number Diff line number Diff line
@@ -250,9 +250,7 @@ static void __rpc_init_priority_wait_queue(struct rpc_wait_queue *queue, const c 
	queue->maxpriority = nr_queues - 1;

	rpc_reset_waitqueue_priority(queue);

	queue->qlen = 0;

	timer_setup(&queue->timer_list.timer,

			__rpc_queue_timer_fn,

			TIMER_DEFERRABLE);

	timer_setup(&queue->timer_list.timer, __rpc_queue_timer_fn, 0);

	INIT_LIST_HEAD(&queue->timer_list.list);

	rpc_assign_waitqueue_name(queue, qname);

}

net/sunrpc/xprt.c

+1 −3
Original line number Diff line number Diff line
@@ -1876,9 +1876,7 @@ struct rpc_xprt *xprt_create_transport(struct xprt_create *args) 
		xprt->idle_timeout = 0;

	INIT_WORK(&xprt->task_cleanup, xprt_autoclose);

	if (xprt_has_timer(xprt))

		timer_setup(&xprt->timer,

				xprt_init_autodisconnect,

				TIMER_DEFERRABLE);

		timer_setup(&xprt->timer, xprt_init_autodisconnect, 0);

	else

		timer_setup(&xprt->timer, NULL, 0);