[PATCH 1/2] staging/lustre/ptlrpc: fix ptlrpc_stop_pinger logic

[PATCH 1/2] staging/lustre/ptlrpc: fix ptlrpc_stop_pinger logic

[Peng Tao]

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>
---
 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 1707e61..4684b03 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/pinger.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/pinger.c
@@ -410,8 +410,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.7.9.5

[PATCH 2/2] staging/lustre/obdclass: add empty tailing member to ctl_table

[Peng Tao]

This was mistakenly removed by commit 7fb3d1c5.
Now register_sysctl_table() complains about "No proc_handler".

Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
---
 .../lustre/lustre/obdclass/linux/linux-sysctl.c    |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
index d66be02..c1ef0c9 100644
--- a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
@@ -392,7 +392,8 @@ static ctl_table_t obd_table[] = {
 		.maxlen   = sizeof(int),
 		.mode     = 0644,
 		.proc_handler = &proc_at_history
-	}
+	},
+	{}
 };
 
 static ctl_table_t parent_table[] = {
@@ -402,7 +403,8 @@ static ctl_table_t parent_table[] = {
 		.maxlen   = 0,
 		.mode     = 0555,
 		.child    = obd_table
-	}
+	},
+	{}
 };
 #endif
 
-- 
1.7.9.5

Re: [PATCH 1/2] staging/lustre/ptlrpc: fix ptlrpc_stop_pinger logic

[Greg Kroah-Hartman]

On Thu, Nov 21, 2013 at 10:42:45PM +0800, Peng Tao wrote:
> It was introduced due to a patch hunk when porting
> commit 20802057 (staging/lustre/ptlrpc: race in pinger).

This patch was in 3.12, so this needs to go to the stable tree for 3.12,
right?  It also needs to get into 3.13-final, so please tell me that
next time so I know where to apply it to.

thanks,

greg k-h

Re: [PATCH 1/2] staging/lustre/ptlrpc: fix ptlrpc_stop_pinger logic

[Peng Tao]

On Tue, Nov 26, 2013 at 4:37 AM, Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
> On Thu, Nov 21, 2013 at 10:42:45PM +0800, Peng Tao wrote:
>> It was introduced due to a patch hunk when porting
>> commit 20802057 (staging/lustre/ptlrpc: race in pinger).
>
> This patch was in 3.12, so this needs to go to the stable tree for 3.12,
> right?  It also needs to get into 3.13-final, so please tell me that
> next time so I know where to apply it to.
>
Thank you for helping add the stable tag. I will remember to add it next time.

Thanks,
Tao