On Tue, Nov 26, 2013 at 4:53 AM, <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
>
> This is a note to let you know that I've just added the patch titled
>
> staging/lustre/ptlrpc: fix ptlrpc_stop_pinger logic
>
> to my staging git tree which can be found at
> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
> in the staging-linus branch.
>
Hi Greg,
Just to confirm, I see this is applied only in staging-linus not in
staging-next. So in future, staging stable patches need to be sent
based on staging-linus. Is that correct?
Thanks,
Tao
> The patch will show up in the next release of the linux-next tree
> (usually sometime within the next 24 hours during the week.)
>
> The patch will hopefully also be merged in Linus's tree for the
> next -rc kernel release.
>
> If you have any questions about this process, please let me know.
>
>
> From b39f15c972c462903208531b82f9b34ba8ef3ec0 Mon Sep 17 00:00:00 2001
> From: Peng Tao <bergwolf@xxxxxxxxx>
> Date: Thu, 21 Nov 2013 22:42:45 +0800
> Subject: 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@xxxxxxxxx>
> Signed-off-by: Peng Tao <bergwolf@xxxxxxxxx>
> Cc: stable <stable@xxxxxxxxxxxxxxx> # 3.12
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> ---
> drivers/staging/lustre/lustre/ptlrpc/pinger.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/lustre/lustre/ptlrpc/pinger.c b/drivers/staging/lustre/lustre/ptlrpc/pinger.c
> index 5dec771d..4d340f4a 100644
> --- 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();
> --
> 1.8.4.3.gca3854a
>
>
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html