diff options
| author |   Shaohua Li <shli@fb.com> | 2016-12-13 12:40:15 -0800 |
|---|---|---|
| committer | Shaohua Li <shli@fb.com> | 2016-12-13 12:40:15 -0800 |
| commit | 20737738d397dfadbca1ea50dcc00d7259f500cf (patch) | |
| tree | 5765b1815331bac9ca32208963c850e60806d6de /drivers/md/dm-raid.c | |
| parent | Merge tag 'char-misc-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc (diff) | |
| parent | md: separate flags for superblock changes (diff) | |
| download | linux-dev-20737738d397dfadbca1ea50dcc00d7259f500cf.tar.xz linux-dev-20737738d397dfadbca1ea50dcc00d7259f500cf.zip | |
Merge branch 'md-next' into md-linus
Diffstat (limited to 'drivers/md/dm-raid.c')
| -rw-r--r-- | drivers/md/dm-raid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 6d53810963f7..953159d9a825 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c @@ -2011,7 +2011,7 @@ static int super_load(struct md_rdev *rdev, struct md_rdev *refdev) sb->compat_features = cpu_to_le32(FEATURE_FLAG_SUPPORTS_V190); /* Force writing of superblocks to disk */ - set_bit(MD_CHANGE_DEVS, &rdev->mddev->flags); + set_bit(MD_SB_CHANGE_DEVS, &rdev->mddev->sb_flags); /* Any superblock is better than none, choose that if given */ return refdev ? 0 : 1; @@ -3497,7 +3497,7 @@ static void rs_update_sbs(struct raid_set *rs) struct mddev *mddev = &rs->md; int ro = mddev->ro; - set_bit(MD_CHANGE_DEVS, &mddev->flags); + set_bit(MD_SB_CHANGE_DEVS, &mddev->sb_flags); mddev->ro = 0; md_update_sb(mddev, 1); mddev->ro = ro; |