OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 1... Line 1...
1 --- a/Incremental.c 1 --- a/Incremental.c
2 +++ b/Incremental.c 2 +++ b/Incremental.c
3 @@ -1619,6 +1619,10 @@ static int Incremental_container(struct supertype *st, char *devname, 3 @@ -1642,6 +1642,10 @@ static int Incremental_container(struct
4 if (ra_all == ra_blocked) 4 if (ra_all == ra_blocked)
5 return 0; 5 return 0;
Line 6... Line 6...
6 6
7 +#ifndef MDADM_FULL 7 +#ifndef MDADM_FULL
Line 11... Line 11...
11 /* Now move all suitable spares from spare container */ 11 /* Now move all suitable spares from spare container */
12 domains = domain_from_array(list, st->ss->name); 12 domains = domain_from_array(list, st->ss->name);
13 memcpy(suuid, uuid_zero, sizeof(int[4])); 13 memcpy(suuid, uuid_zero, sizeof(int[4]));
14 --- a/util.c 14 --- a/util.c
15 +++ b/util.c 15 +++ b/util.c
16 @@ -1220,7 +1220,9 @@ void wait_for(char *dev, int fd) 16 @@ -1151,7 +1151,9 @@ void wait_for(char *dev, int fd)
17 struct superswitch *superlist[] = 17 struct superswitch *superlist[] =
18 { 18 {
19 &super0, &super1, 19 &super0, &super1,
20 +#ifdef MDADM_FULL 20 +#ifdef MDADM_FULL
21 &super_ddf, &super_imsm, 21 &super_ddf, &super_imsm,
22 +#endif 22 +#endif
23 &mbr, &gpt, 23 &mbr, &gpt,
24 NULL 24 NULL };
25 }; 25