Commit d460ec52 authored by Neil Brown's avatar Neil Brown Committed by Linus Torvalds

[PATCH] Tidy up some handling of sb_dirty in md.c

when do_md_run fails mddev->pers is not set, so
do_md_stop will not try to write out the superblock
so there is no need to set sb_dirty to 0.
parent bc992e05
...@@ -1621,10 +1621,6 @@ static void autorun_array(mddev_t *mddev) ...@@ -1621,10 +1621,6 @@ static void autorun_array(mddev_t *mddev)
err = do_md_run (mddev); err = do_md_run (mddev);
if (err) { if (err) {
printk(KERN_WARNING "md :do_md_run() returned %d\n", err); printk(KERN_WARNING "md :do_md_run() returned %d\n", err);
/*
* prevent the writeback of an unrunnable array
*/
mddev->sb_dirty = 0;
do_md_stop (mddev, 0); do_md_stop (mddev, 0);
} }
} }
...@@ -2354,11 +2350,11 @@ static int md_ioctl(struct inode *inode, struct file *file, ...@@ -2354,11 +2350,11 @@ static int md_ioctl(struct inode *inode, struct file *file,
* we have to clean up the mess if * we have to clean up the mess if
* the array cannot be run for some * the array cannot be run for some
* reason ... * reason ...
* ->pers will not be set, to superblock will
* not be updated.
*/ */
if (err) { if (err)
mddev->sb_dirty = 0;
do_md_stop (mddev, 0); do_md_stop (mddev, 0);
}
goto done_unlock; goto done_unlock;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment