| From | Greg Kroah-Hartman <> | Subject | [PATCH 3.12 011/212] staging/lustre/ptlrpc: fix ptlrpc_stop_pinger logic | Date | Mon, 2 Dec 2013 11:13:22 -0800 |
| |
3.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peng Tao <bergwolf@gmail.com>
commit b39f15c972c462903208531b82f9b34ba8ef3ec0 upstream.
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: Peng Tao <bergwolf@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- drivers/staging/lustre/lustre/ptlrpc/pinger.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/staging/lustre/lustre/ptlrpc/pinger.c +++ b/drivers/staging/lustre/lustre/ptlrpc/pinger.c @@ -409,8 +409,8 @@ int ptlrpc_stop_pinger(void) struct l_wait_info lwi = { 0 }; int rc = 0; - if (!thread_is_init(&pinger_thread) && - !thread_is_stopped(&pinger_thread)) + if (thread_is_init(&pinger_thread) || + thread_is_stopped(&pinger_thread)) return -EALREADY; ptlrpc_pinger_remove_timeouts();
|