diff options
author | NeilBrown <neilb@suse.de> | 2006-10-03 04:15:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 11:04:17 -0400 |
commit | 850b2b420cd5b363ed4cf48a8816d656c8b5251b (patch) | |
tree | b63aa37b3fb7dfb7a0b674d5a2ebe9da13cc7405 /drivers/md/multipath.c | |
parent | 6814d5368d68341ec6b5e4ecd10ea5947130775a (diff) |
[PATCH] md: replace magic numbers in sb_dirty with well defined bit flags
Instead of magic numbers (0,1,2,3) in sb_dirty, we have
some flags instead:
MD_CHANGE_DEVS
Some device state has changed requiring superblock update
on all devices.
MD_CHANGE_CLEAN
The array has transitions from 'clean' to 'dirty' or back,
requiring a superblock update on active devices, but possibly
not on spares
MD_CHANGE_PENDING
A superblock update is underway.
We wait for an update to complete by waiting for all flags to be clear. A
flag can be set at any time, even during an update, without risk that the
change will be lost.
Stop exporting md_update_sb - isn't needed.
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/multipath.c')
-rw-r--r-- | drivers/md/multipath.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c index 1cc9de44ce86..e4f168d063db 100644 --- a/drivers/md/multipath.c +++ b/drivers/md/multipath.c | |||
@@ -253,7 +253,7 @@ static void multipath_error (mddev_t *mddev, mdk_rdev_t *rdev) | |||
253 | char b[BDEVNAME_SIZE]; | 253 | char b[BDEVNAME_SIZE]; |
254 | clear_bit(In_sync, &rdev->flags); | 254 | clear_bit(In_sync, &rdev->flags); |
255 | set_bit(Faulty, &rdev->flags); | 255 | set_bit(Faulty, &rdev->flags); |
256 | mddev->sb_dirty = 1; | 256 | set_bit(MD_CHANGE_DEVS, &mddev->flags); |
257 | conf->working_disks--; | 257 | conf->working_disks--; |
258 | printk(KERN_ALERT "multipath: IO failure on %s," | 258 | printk(KERN_ALERT "multipath: IO failure on %s," |
259 | " disabling IO path. \n Operation continuing" | 259 | " disabling IO path. \n Operation continuing" |
@@ -470,7 +470,6 @@ static int multipath_run (mddev_t *mddev) | |||
470 | } | 470 | } |
471 | 471 | ||
472 | conf->raid_disks = mddev->raid_disks; | 472 | conf->raid_disks = mddev->raid_disks; |
473 | mddev->sb_dirty = 1; | ||
474 | conf->mddev = mddev; | 473 | conf->mddev = mddev; |
475 | spin_lock_init(&conf->device_lock); | 474 | spin_lock_init(&conf->device_lock); |
476 | INIT_LIST_HEAD(&conf->retry_list); | 475 | INIT_LIST_HEAD(&conf->retry_list); |