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

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

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

drivers/staging/lustre/lustre/ptlrpc/pinger.c

+2 −2
Original line number Diff line number Diff line
@@ -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();