]> git.ipfire.org Git - thirdparty/mdadm.git/blob - kernel-patch-2.6.18.6
Assemble(): don't dup_super() before we need it.
[thirdparty/mdadm.git] / kernel-patch-2.6.18.6
1 Signed-off-by: Neil Brown <neilb@suse.de>
2
3 ### Diffstat output
4 ./drivers/md/md.c | 5 ++++-
5 1 file changed, 4 insertions(+), 1 deletion(-)
6
7 diff .prev/drivers/md/md.c ./drivers/md/md.c
8 --- .prev/drivers/md/md.c 2006-12-21 17:08:23.000000000 +1100
9 +++ ./drivers/md/md.c 2006-12-21 17:08:26.000000000 +1100
10 @@ -1783,7 +1783,8 @@ state_store(mdk_rdev_t *rdev, const char
11 else {
12 mddev_t *mddev = rdev->mddev;
13 kick_rdev_from_array(rdev);
14 - md_update_sb(mddev);
15 + if (mddev->pers)
16 + md_update_sb(mddev);
17 md_new_event(mddev);
18 err = 0;
19 }
20 @@ -1995,6 +1996,7 @@ static mdk_rdev_t *md_import_device(dev_
21
22 rdev->desc_nr = -1;
23 rdev->saved_raid_disk = -1;
24 + rdev->raid_disk = -1;
25 rdev->flags = 0;
26 rdev->data_offset = 0;
27 rdev->sb_events = 0;
28 @@ -3993,6 +3995,7 @@ static int set_array_info(mddev_t * mdde
29 mddev->major_version = info->major_version;
30 mddev->minor_version = info->minor_version;
31 mddev->patch_version = info->patch_version;
32 + mddev->persistent = ! info->not_persistent;
33 return 0;
34 }
35 mddev->major_version = MD_MAJOR_VERSION;