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

Commit eb6c84e4 authored by Xiao Ni's avatar Xiao Ni Committed by Greg Kroah-Hartman
Browse files

raid5-cache: Need to do start() part job after adding journal device 



commit d9771f5ec46c282d518b453c793635dbdc3a2a94 upstream.

commit d5d885fd ("md: introduce new personality funciton start()")
splits the init job to two parts. The first part run() does the jobs that
do not require the md threads. The second part start() does the jobs that
require the md threads.

Now it just does run() in adding new journal device. It needs to do the
second part start() too.

Fixes: d5d885fd ("md: introduce new personality funciton start()")
Cc: stable@vger.kernel.org #v4.9+
Reported-by: default avatarMichal Soltys <soltys@ziu.info>
Signed-off-by: default avatarXiao Ni <xni@redhat.com>
Signed-off-by: default avatarSong Liu <songliubraving@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3f42c000

drivers/md/raid5.c

+9 −2
Original line number Diff line number Diff line
@@ -7670,7 +7670,7 @@ static int raid5_remove_disk(struct mddev *mddev, struct md_rdev *rdev) 
static int raid5_add_disk(struct mddev *mddev, struct md_rdev *rdev)

{

	struct r5conf *conf = mddev->private;

	int err = -EEXIST;

	int ret, err = -EEXIST;

	int disk;

	struct disk_info *p;

	int first = 0;
@@ -7685,7 +7685,14 @@ static int raid5_add_disk(struct mddev *mddev, struct md_rdev *rdev) 
		 * The array is in readonly mode if journal is missing, so no

		 * write requests running. We should be safe

		 */

		log_init(conf, rdev, false);

		ret = log_init(conf, rdev, false);

		if (ret)

			return ret;



		ret = r5l_start(conf->log);

		if (ret)

			return ret;



		return 0;

	}

	if (mddev->recovery_disabled == conf->recovery_disabled)