diff options
| author | Andy Whitcroft <apw@canonical.com> | 2016-10-11 16:16:57 +0200 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2016-10-11 21:19:17 +0200 |
| commit | 5c33677c87cbe44ae04df69c4a29c1750a9ec4e5 (patch) | |
| tree | 1f702006c71af767cae937939a5bcc5ae4d3ca59 | |
| parent | Merge branch 'for-4.9/block-smp' of git://git.kernel.dk/linux-block (diff) | |
| download | linux-5c33677c87cbe44ae04df69c4a29c1750a9ec4e5.tar.xz linux-5c33677c87cbe44ae04df69c4a29c1750a9ec4e5.zip | |
dm raid: fix compat_features validation
In ecbfb9f118bce4 ("dm raid: add raid level takeover support") a new
compatible feature flag was added. Validation for these compat_features
was added but this only passes for new raid mappings with this feature
flag. This causes previously created raid mappings to be failed at
import.
Check compat_features for the only valid combination.
Fixes: ecbfb9f118bce4 ("dm raid: add raid level takeover support")
Cc: stable@vger.kernel.org # v4.8
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
| -rw-r--r-- | drivers/md/dm-raid.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 8abde6b8cedc..2a3970097991 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c @@ -2258,7 +2258,8 @@ static int super_validate(struct raid_set *rs, struct md_rdev *rdev) if (!mddev->events && super_init_validation(rs, rdev)) return -EINVAL; - if (le32_to_cpu(sb->compat_features) != FEATURE_FLAG_SUPPORTS_V190) { + if (le32_to_cpu(sb->compat_features) && + le32_to_cpu(sb->compat_features) != FEATURE_FLAG_SUPPORTS_V190) { rs->ti->error = "Unable to assemble array: Unknown flag(s) in compatible feature flags"; return -EINVAL; } |