]> git.ipfire.org Git - thirdparty/mdadm.git/blob - kernel-patch-2.6.19
Merge branch 'master' into devel-3.0
[thirdparty/mdadm.git] / kernel-patch-2.6.19
1
2 ### Diffstat output
3 ./drivers/md/md.c | 5 ++++-
4 1 file changed, 4 insertions(+), 1 deletion(-)
5
6 diff .prev/drivers/md/md.c ./drivers/md/md.c
7 --- .prev/drivers/md/md.c 2006-12-21 15:55:01.000000000 +1100
8 +++ ./drivers/md/md.c 2006-12-21 16:28:09.000000000 +1100
9 @@ -1792,7 +1792,8 @@ state_store(mdk_rdev_t *rdev, const char
10 else {
11 mddev_t *mddev = rdev->mddev;
12 kick_rdev_from_array(rdev);
13 - md_update_sb(mddev, 1);
14 + if (mddev->pers)
15 + md_update_sb(mddev, 1);
16 md_new_event(mddev);
17 err = 0;
18 }
19 @@ -2004,6 +2005,7 @@ static mdk_rdev_t *md_import_device(dev_
20
21 rdev->desc_nr = -1;
22 rdev->saved_raid_disk = -1;
23 + rdev->raid_disk = -1;
24 rdev->flags = 0;
25 rdev->data_offset = 0;
26 rdev->sb_events = 0;
27 @@ -3977,6 +3979,7 @@ static int set_array_info(mddev_t * mdde
28 mddev->major_version = info->major_version;
29 mddev->minor_version = info->minor_version;
30 mddev->patch_version = info->patch_version;
31 + mddev->persistent = ! info->not_persistent;
32 return 0;
33 }
34 mddev->major_version = MD_MAJOR_VERSION;