diff options
Diffstat (limited to 'drivers/md/raid1.c')
-rw-r--r-- | drivers/md/raid1.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 14422407e520..7b0f647bcccb 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c | |||
@@ -42,6 +42,10 @@ | |||
42 | #include "raid1.h" | 42 | #include "raid1.h" |
43 | #include "bitmap.h" | 43 | #include "bitmap.h" |
44 | 44 | ||
45 | #define UNSUPPORTED_MDDEV_FLAGS \ | ||
46 | ((1L << MD_HAS_JOURNAL) | \ | ||
47 | (1L << MD_JOURNAL_CLEAN)) | ||
48 | |||
45 | /* | 49 | /* |
46 | * Number of guaranteed r1bios in case of extreme VM load: | 50 | * Number of guaranteed r1bios in case of extreme VM load: |
47 | */ | 51 | */ |
@@ -3257,8 +3261,8 @@ static void *raid1_takeover(struct mddev *mddev) | |||
3257 | if (!IS_ERR(conf)) { | 3261 | if (!IS_ERR(conf)) { |
3258 | /* Array must appear to be quiesced */ | 3262 | /* Array must appear to be quiesced */ |
3259 | conf->array_frozen = 1; | 3263 | conf->array_frozen = 1; |
3260 | clear_bit(MD_HAS_JOURNAL, &mddev->flags); | 3264 | mddev_clear_unsupported_flags(mddev, |
3261 | clear_bit(MD_JOURNAL_CLEAN, &mddev->flags); | 3265 | UNSUPPORTED_MDDEV_FLAGS); |
3262 | } | 3266 | } |
3263 | return conf; | 3267 | return conf; |
3264 | } | 3268 | } |