summaryrefslogtreecommitdiff
path: root/drivers/md/faulty.c
diff options
context:
space:
mode:
authorAndre Noll <maan@systemlinux.org>2009-06-18 02:49:23 +0400
committerNeilBrown <neilb@suse.de>2009-06-18 02:49:23 +0400
commit0894cc3066aaa3e75a99383c0d25feebf9b688ac (patch)
tree651664e6b288e36dc9553443e334e650139851c8 /drivers/md/faulty.c
parent8190e754e0723de7cecb80bdd9eb93911dfa04a1 (diff)
downloadlinux-0894cc3066aaa3e75a99383c0d25feebf9b688ac.tar.xz
md: Move check for bitmap presence to personality code.
If the superblock of a component device indicates the presence of a bitmap but the corresponding raid personality does not support bitmaps (raid0, linear, multipath, faulty), then something is seriously wrong and we'd better refuse to run such an array. Currently, this check is performed while the superblocks are examined, i.e. before entering personality code. Therefore the generic md layer must know which raid levels support bitmaps and which do not. This patch avoids this layer violation without adding identical code to various personalities. This is accomplished by introducing a new public function to md.c, md_check_no_bitmap(), which replaces the hard-coded checks in the superblock loading functions. A call to md_check_no_bitmap() is added to the ->run method of each personality which does not support bitmaps and assembly is aborted if at least one component device contains a bitmap. Signed-off-by: Andre Noll <maan@systemlinux.org> Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/faulty.c')
-rw-r--r--drivers/md/faulty.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/md/faulty.c b/drivers/md/faulty.c
index 6e83b38d931d..87d88dbb667f 100644
--- a/drivers/md/faulty.c
+++ b/drivers/md/faulty.c
@@ -299,8 +299,12 @@ static int run(mddev_t *mddev)
{
mdk_rdev_t *rdev;
int i;
+ conf_t *conf;
- conf_t *conf = kmalloc(sizeof(*conf), GFP_KERNEL);
+ if (md_check_no_bitmap(mddev))
+ return -EINVAL;
+
+ conf = kmalloc(sizeof(*conf), GFP_KERNEL);
if (!conf)
return -ENOMEM;