diff options
author | Shaohua Li <shli@fb.com> | 2017-01-05 01:10:19 +0100 |
---|---|---|
committer | Shaohua Li <shli@fb.com> | 2017-01-05 20:45:18 +0100 |
commit | 394ed8e4743b0cfc5496fe49059fbfc2bc8eae35 (patch) | |
tree | 65412c7b017be0fc1a2316f4a0778328421a0f4c /drivers/md/md.h | |
parent | md/r5cache: fix spelling mistake on "recoverying" (diff) | |
download | linux-394ed8e4743b0cfc5496fe49059fbfc2bc8eae35.tar.xz linux-394ed8e4743b0cfc5496fe49059fbfc2bc8eae35.zip |
md: cleanup mddev flag clear for takeover
Commit 6995f0b (md: takeover should clear unrelated bits) clear
unrelated bits, but it's quite fragile. To avoid error in the future,
define a macro for unsupported mddev flags for each raid type and use it
to clear unsupported mddev flags. This should be less error-prone.
Suggested-by: NeilBrown <neilb@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
Diffstat (limited to 'drivers/md/md.h')
-rw-r--r-- | drivers/md/md.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/md/md.h b/drivers/md/md.h index e38936d05df1..2a514036a83d 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h @@ -212,6 +212,7 @@ extern int rdev_clear_badblocks(struct md_rdev *rdev, sector_t s, int sectors, int is_new); struct md_cluster_info; +/* change UNSUPPORTED_MDDEV_FLAGS for each array type if new flag is added */ enum mddev_flags { MD_ARRAY_FIRST_USE, /* First use of array, needs initialization */ MD_CLOSING, /* If set, we are closing the array, do not open @@ -702,4 +703,11 @@ static inline int mddev_is_clustered(struct mddev *mddev) { return mddev->cluster_info && mddev->bitmap_info.nodes > 1; } + +/* clear unsupported mddev_flags */ +static inline void mddev_clear_unsupported_flags(struct mddev *mddev, + unsigned long unsupported_flags) +{ + mddev->flags &= ~unsupported_flags; +} #endif /* _MD_MD_H */ |