Commit b39f15c9 authored by Peng Tao's avatar Peng Tao Committed by Greg Kroah-Hartman

staging/lustre/ptlrpc: fix ptlrpc_stop_pinger logic

It was introduced due to a patch hunk when porting
commit 20802057 (staging/lustre/ptlrpc: race in pinger).

Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarPeng Tao <bergwolf@gmail.com>
Cc: stable <stable@vger.kernel.org> # 3.12
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9ecfc0f4
...@@ -409,8 +409,8 @@ int ptlrpc_stop_pinger(void) ...@@ -409,8 +409,8 @@ int ptlrpc_stop_pinger(void)
struct l_wait_info lwi = { 0 }; struct l_wait_info lwi = { 0 };
int rc = 0; int rc = 0;
if (!thread_is_init(&pinger_thread) && if (thread_is_init(&pinger_thread) ||
!thread_is_stopped(&pinger_thread)) thread_is_stopped(&pinger_thread))
return -EALREADY; return -EALREADY;
ptlrpc_pinger_remove_timeouts(); ptlrpc_pinger_remove_timeouts();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment