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

Commit 36fadeb8 authored by Shaohua Li's avatar Shaohua Li Committed by Greg Kroah-Hartman
Browse files

md/raid5-cache: disable reshape completely 



[ Upstream commit e254de6bcf3f5b6e78a92ac95fb91acef8adfe1a ]

We don't support reshape yet if an array supports log device. Previously we
determine the fact by checking ->log. However, ->log could be NULL after a log
device is removed, but the array is still marked to support log device. Don't
allow reshape in this case too. User can disable log device support by setting
'consistency_policy' to 'resync' then do reshape.

Reported-by: default avatarXiao Ni <xni@redhat.com>
Tested-by: default avatarXiao Ni <xni@redhat.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dc492842

drivers/md/raid5-log.h

+5 −0
Original line number Diff line number Diff line
@@ -43,6 +43,11 @@ extern void ppl_write_stripe_run(struct r5conf *conf); 
extern void ppl_stripe_write_finished(struct stripe_head *sh);

extern int ppl_modify_log(struct r5conf *conf, struct md_rdev *rdev, bool add);



static inline bool raid5_has_log(struct r5conf *conf)

{

	return test_bit(MD_HAS_JOURNAL, &conf->mddev->flags);

}



static inline bool raid5_has_ppl(struct r5conf *conf)

{

	return test_bit(MD_HAS_PPL, &conf->mddev->flags);

drivers/md/raid5.c

+3 −3
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ static bool stripe_can_batch(struct stripe_head *sh) 
{

	struct r5conf *conf = sh->raid_conf;



	if (conf->log || raid5_has_ppl(conf))

	if (raid5_has_log(conf) || raid5_has_ppl(conf))

		return false;

	return test_bit(STRIPE_BATCH_READY, &sh->state) &&

		!test_bit(STRIPE_BITMAP_PENDING, &sh->state) &&
@@ -7717,7 +7717,7 @@ static int raid5_resize(struct mddev *mddev, sector_t sectors) 
	sector_t newsize;

	struct r5conf *conf = mddev->private;



	if (conf->log || raid5_has_ppl(conf))

	if (raid5_has_log(conf) || raid5_has_ppl(conf))

		return -EINVAL;

	sectors &= ~((sector_t)conf->chunk_sectors - 1);

	newsize = raid5_size(mddev, sectors, mddev->raid_disks);
@@ -7768,7 +7768,7 @@ static int check_reshape(struct mddev *mddev) 
{

	struct r5conf *conf = mddev->private;



	if (conf->log || raid5_has_ppl(conf))

	if (raid5_has_log(conf) || raid5_has_ppl(conf))

		return -EINVAL;

	if (mddev->delta_disks == 0 &&

	    mddev->new_layout == mddev->layout &&