Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit f1804e7cae02dab74baa07aff4faf10b6db123fd

Authored by Steve Dickson
Committed by Greg Kroah-Hartman
1 parent d1c6070174
Exists in ti-linux-3.14.y and in 2 other branches processor-sdk-linux-01.00.00, smarc-ti-linux-3.14.y

SUNRPC: Ensure call_connect_status() deals correctly with SOFTCONN tasks 

commit 1fa3e2eb9db07f30a605c66d1a2fdde4b24e74d5 upstream.

Don't schedule an rpc_delay before checking to see if the task
is a SOFTCONN because the tk_callback from the delay (__rpc_atrun)
clears the task status before the rpc_exit_task can be run.

Signed-off-by: Steve Dickson <steved@redhat.com>
Fixes: 561ec1603171c (SUNRPC: call_connect_status should recheck...)
Link: http://lkml.kernel.org/r/5329CF7C.7090308@RedHat.com
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -1803,10 +1803,10 @@
1803 1803 case -ECONNABORTED:
1804 1804 case -ENETUNREACH:
1805 1805 case -EHOSTUNREACH:
1806   - /* retry with existing socket, after a delay */
1807   - rpc_delay(task, 3*HZ);
1808 1806 if (RPC_IS_SOFTCONN(task))
1809 1807 break;
  1808 + /* retry with existing socket, after a delay */
  1809 + rpc_delay(task, 3*HZ);
1810 1810 case -EAGAIN:
1811 1811 /* Check for timeouts before looping back to call_bind */
1812 1812 case -ETIMEDOUT: