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 0b67fe11eb89 ("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 0b67fe11eb891e0d108d4fde0f7f96e5200bfbf5.

Reported-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index bb04ae52803ab7ee26819e7f00b66a46a1e7ed57..a2c1148127172520ba85b7f7e48685076d6128a0 100644 (file)
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -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);
 }

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index ad21880d5601c470730a3c677e12cc337054f771..f6c82b1651e7372b2425db33de2d1fe0b1a060e6 100644 (file)
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -1876,9 +1876,7 @@ found:
                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);