summaryrefslogtreecommitdiffstats
path: root/drivers/md/raid10.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2006-02-03 03:03:41 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-03 08:32:00 -0800
commit29fc7e3e70a05e9eea28afb6707a39c1a53e2f66 (patch)
tree4e8bc28c717116ade3cd723a921f3260656327aa /drivers/md/raid10.c
parent284ae7cab0f7335c9e0aa8992b28415ef1a54c7c (diff)
downloadlinux-29fc7e3e70a05e9eea28afb6707a39c1a53e2f66.tar.gz
linux-29fc7e3e70a05e9eea28afb6707a39c1a53e2f66.tar.bz2
linux-29fc7e3e70a05e9eea28afb6707a39c1a53e2f66.zip
[PATCH] md: Assorted little md fixes
- version-1 superblock + The default_bitmap_offset is in sectors, not bytes. + the 'size' field in the superblock is in sectors, not KB - raid0_run should return a negative number on error, not '1' - raid10_read_balance should not return a valid 'disk' number if ->rdev turned out to be NULL - kmem_cache_destroy doesn't like being passed a NULL. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/md/raid10.c')
-rw-r--r--drivers/md/raid10.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 9130d051b474..ab90a6d12020 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -565,6 +565,8 @@ rb_out:
if (disk >= 0 && (rdev=rcu_dereference(conf->mirrors[disk].rdev))!= NULL)
atomic_inc(&conf->mirrors[disk].rdev->nr_pending);
+ else
+ disk = -1;
rcu_read_unlock();
return disk;