diff options
author | Heinz Mauelshagen <heinzm@redhat.com> | 2016-06-23 18:32:58 -0400 |
---|---|---|
committer | Mike Snitzer <snitzer@redhat.com> | 2016-07-18 15:37:24 -0400 |
commit | 2d92a3c2a45c7c40c84a4a59e3ce2bf6b34a4195 (patch) | |
tree | c8e3792b5d2929eeb48acdd66d4e1b00a29976bf /drivers/md/dm-raid.c | |
parent | 4dff2f1e26f2621dc5b02436cb889df15400036b (diff) |
dm raid: prohibit 'nosync' on new raid6 and reject resize during reshape
Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md/dm-raid.c')
-rw-r--r-- | drivers/md/dm-raid.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 7e334b65b1c3..6dc494055267 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c | |||
@@ -2752,9 +2752,21 @@ static int raid_ctr(struct dm_target *ti, unsigned argc, char **argv) | |||
2752 | if (test_bit(MD_ARRAY_FIRST_USE, &rs->md.flags)) { | 2752 | if (test_bit(MD_ARRAY_FIRST_USE, &rs->md.flags)) { |
2753 | set_bit(RT_FLAG_UPDATE_SBS, &rs->runtime_flags); | 2753 | set_bit(RT_FLAG_UPDATE_SBS, &rs->runtime_flags); |
2754 | rs_set_new(rs); | 2754 | rs_set_new(rs); |
2755 | } else if (rs_is_reshaping(rs)) | 2755 | /* A new raid6 set has to be recovered to ensure proper parity and Q-Syndrome */ |
2756 | ; /* skip rs setup */ | 2756 | if (rs_is_raid6(rs) && |
2757 | else if (rs_takeover_requested(rs)) { | 2757 | test_bit(__CTR_FLAG_NOSYNC, &rs->ctr_flags)) { |
2758 | ti->error = "'nosync' not allowed for new raid6 set"; | ||
2759 | return -EINVAL; | ||
2760 | } | ||
2761 | rs_setup_recovery(rs, 0); | ||
2762 | } else if (rs_is_reshaping(rs)) { | ||
2763 | /* Have to reject size change request during reshape */ | ||
2764 | if (calculated_dev_sectors != rs->dev[0].rdev.sectors) { | ||
2765 | ti->error = "Can't resize a reshaping raid set"; | ||
2766 | return -EPERM; | ||
2767 | } | ||
2768 | /* skip setup rs */ | ||
2769 | } else if (rs_takeover_requested(rs)) { | ||
2758 | if (rs_is_reshaping(rs)) { | 2770 | if (rs_is_reshaping(rs)) { |
2759 | ti->error = "Can't takeover a reshaping raid set"; | 2771 | ti->error = "Can't takeover a reshaping raid set"; |
2760 | return -EPERM; | 2772 | return -EPERM; |