diff options
| author |   Heinz Mauelshagen <heinzm@redhat.com> | 2016-06-24 23:21:37 +0200 |
|---|---|---|
| committer |   Mike Snitzer <snitzer@redhat.com> | 2016-07-18 15:37:28 -0400 |
| commit | 37f10be15076737067a4d4d8f1cf7e9103765a0f (patch) | |
| tree | f9abfcb4da5c9060e63ec11c43fa45ede567b09b /drivers/md | |
| parent | dm raid: fix ctr memory leaks on error paths (diff) | |
| download | linux-dev-37f10be15076737067a4d4d8f1cf7e9103765a0f.tar.xz linux-dev-37f10be15076737067a4d4d8f1cf7e9103765a0f.zip | |
dm raid: fix rebuild and catch bogus sync/resync flags
Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/dm-raid.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 2fb5a9bff1bb..14b3d93e84cb 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c @@ -1312,6 +1312,13 @@ static int parse_raid_params(struct raid_set *rs, struct dm_arg_set *as, return -EINVAL; } + if (test_bit(__CTR_FLAG_REBUILD, &rs->ctr_flags) && + (test_bit(__CTR_FLAG_SYNC, &rs->ctr_flags) || + test_bit(__CTR_FLAG_NOSYNC, &rs->ctr_flags))) { + rs->ti->error = "sync/nosync and rebuild are mutually exclusive"; + return -EINVAL; + } + if (write_mostly >= rs->md.raid_disks) { rs->ti->error = "Can't set all raid1 devices to write_mostly"; return -EINVAL; @@ -2776,7 +2783,9 @@ static int raid_ctr(struct dm_target *ti, unsigned argc, char **argv) } else if (rs_is_recovering(rs) || rs_is_reshaping(rs)) { /* Have to reject size change request during recovery/reshape */ if (calculated_dev_sectors != rs->dev[0].rdev.sectors) { - ti->error = "Can't resize a recovering/reshaping raid set"; + ti->error = rs_is_recovering(rs) ? + "Can't resize a recovering raid set" : + "Can't resize a reshaping raid set"; r = -EPERM; goto bad; } @@ -2863,8 +2872,12 @@ static int raid_ctr(struct dm_target *ti, unsigned argc, char **argv) rs_setup_recovery(rs, MaxSector); } else { rs_set_cur(rs); - rs_setup_recovery(rs, test_bit(__CTR_FLAG_SYNC, &rs->ctr_flags) ? - 0 : calculated_dev_sectors); + if (test_bit(__CTR_FLAG_REBUILD, &rs->ctr_flags)) { + rs_setup_recovery(rs, MaxSector); + set_bit(RT_FLAG_UPDATE_SBS, &rs->runtime_flags); + } else + rs_setup_recovery(rs, test_bit(__CTR_FLAG_SYNC, &rs->ctr_flags) ? + 0 : calculated_dev_sectors); } /* If constructor requested it, change data and new_data offsets */ |