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

Commit 69e2b602 authored by Satyam Sharma's avatar Satyam Sharma Committed by Stefan Richter
Browse files

ieee1394: Fix kthread stopping in nodemgr_host_thread 



The nodemgr host thread can exit on its own even when kthread_should_stop
is not true, on receiving a signal (might never happen in practice, as
it ignores signals). But considering kthread_stop() must not be mixed with
kthreads that can exit on their own, I think changing the code like this
is clearer. This change means the thread can cut its sleep short when
receive a signal but looking at the code around, that sounds okay (and
again, it might never actually recieve a signal in practice).

Signed-off-by: default avatarSatyam Sharma <satyam@infradead.org>
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 261b5f66

drivers/ieee1394/nodemgr.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1712,7 +1712,8 @@ static int nodemgr_host_thread(void *__hi) 
		 * to make sure things settle down. */

		 * to make sure things settle down. */

		g = get_hpsb_generation(host);

		g = get_hpsb_generation(host);

		for (i = 0; i < 4 ; i++) {

		for (i = 0; i < 4 ; i++) {

			if (msleep_interruptible(63) || kthread_should_stop())

			msleep_interruptible(63);

			if (kthread_should_stop())

				goto exit;

				goto exit;





			/* Now get the generation in which the node ID's we collect

			/* Now get the generation in which the node ID's we collect