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

Commit 9cd30fdc authored by NeilBrown's avatar NeilBrown
Browse files

md: remove needless setting of thread->timeout in raid10_quiesce 



As bitmap_create and bitmap_destroy already set thread->timeout
as appropriate, there is no need to do it in raid10_quiesce.
There is a possible need to wake the thread after the timeout
has been set low, but it is better to do that where the timeout
is actually set low, in bitmap_create.

Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 1b04be96

drivers/md/bitmap.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1695,6 +1695,7 @@ int bitmap_create(mddev_t *mddev) 
	mddev->bitmap = bitmap;

	mddev->bitmap = bitmap;





	mddev->thread->timeout = mddev->bitmap_info.daemon_sleep;

	mddev->thread->timeout = mddev->bitmap_info.daemon_sleep;

	md_wakeup_thread(mddev->thread);





	bitmap_update_sb(bitmap);

	bitmap_update_sb(bitmap);

drivers/md/raid10.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -2275,13 +2275,6 @@ static void raid10_quiesce(mddev_t *mddev, int state) 
		lower_barrier(conf);

		lower_barrier(conf);

		break;

		break;

	}

	}

	if (mddev->thread) {

		if (mddev->bitmap)

			mddev->thread->timeout = mddev->bitmap_info.daemon_sleep;

		else

			mddev->thread->timeout = MAX_SCHEDULE_TIMEOUT;

		md_wakeup_thread(mddev->thread);

	}

}

}





static struct mdk_personality raid10_personality =

static struct mdk_personality raid10_personality =