122 lines
3.8 KiB
Diff
122 lines
3.8 KiB
Diff
--- mdadm-3.2.1/mdadm.c.param 2011-03-28 10:38:12.035258787 -0400
|
|
+++ mdadm-3.2.1/mdadm.c 2011-03-28 10:39:33.346082070 -0400
|
|
@@ -103,7 +103,9 @@ int main(int argc, char *argv[])
|
|
char *shortopt = short_options;
|
|
int dosyslog = 0;
|
|
int rebuild_map = 0;
|
|
+#if 0
|
|
int auto_update_home = 0;
|
|
+#endif
|
|
char *subarray = NULL;
|
|
char *remove_path = NULL;
|
|
char *udev_filename = NULL;
|
|
@@ -1325,11 +1327,13 @@ int main(int argc, char *argv[])
|
|
cnt++;
|
|
acnt++;
|
|
}
|
|
+#if 0
|
|
if (rv2 == 1)
|
|
/* found something so even though assembly failed we
|
|
* want to avoid auto-updates
|
|
*/
|
|
auto_update_home = 0;
|
|
+#endif
|
|
} while (rv2!=2);
|
|
/* Incase there are stacked devices, we need to go around again */
|
|
} while (acnt);
|
|
--- mdadm-3.2.1/Grow.c.param 2011-03-28 10:38:12.038259001 -0400
|
|
+++ mdadm-3.2.1/Grow.c 2011-03-28 10:45:28.174500010 -0400
|
|
@@ -1312,7 +1312,6 @@ int Grow_reshape(char *devname, int fd,
|
|
char *subarray = NULL;
|
|
|
|
int frozen;
|
|
- int changed = 0;
|
|
char *container = NULL;
|
|
char container_buf[20];
|
|
int cfd = -1;
|
|
@@ -1479,7 +1478,6 @@ int Grow_reshape(char *devname, int fd,
|
|
if (!quiet)
|
|
fprintf(stderr, Name ": component size of %s has been set to %lluK\n",
|
|
devname, size);
|
|
- changed = 1;
|
|
} else if (array.level != LEVEL_CONTAINER) {
|
|
size = get_component_size(fd)/2;
|
|
if (size == 0)
|
|
--- mdadm-3.2.1/Query.c.param 2011-03-28 10:38:12.040259145 -0400
|
|
+++ mdadm-3.2.1/Query.c 2011-03-28 10:41:19.272668999 -0400
|
|
@@ -35,7 +35,7 @@ int Query(char *dev)
|
|
int fd = open(dev, O_RDONLY);
|
|
int vers;
|
|
int ioctlerr;
|
|
- int superror, superrno;
|
|
+ int superror;
|
|
struct mdinfo info;
|
|
mdu_array_info_t array;
|
|
struct supertype *st = NULL;
|
|
@@ -84,7 +84,6 @@ int Query(char *dev)
|
|
st = guess_super(fd);
|
|
if (st) {
|
|
superror = st->ss->load_super(st, fd, dev);
|
|
- superrno = errno;
|
|
} else
|
|
superror = -1;
|
|
close(fd);
|
|
--- mdadm-3.2.1/super1.c.param 2011-03-28 10:38:12.043259360 -0400
|
|
+++ mdadm-3.2.1/super1.c 2011-03-28 10:53:14.423905054 -0400
|
|
@@ -111,7 +111,6 @@ static unsigned int calc_sb_1_csum(struc
|
|
unsigned long long newcsum;
|
|
int size = sizeof(*sb) + __le32_to_cpu(sb->max_dev)*2;
|
|
unsigned int *isuper = (unsigned int*)sb;
|
|
- int i;
|
|
|
|
/* make sure I can count... */
|
|
if (offsetof(struct mdp_superblock_1,data_offset) != 128 ||
|
|
@@ -123,7 +122,7 @@ static unsigned int calc_sb_1_csum(struc
|
|
disk_csum = sb->sb_csum;
|
|
sb->sb_csum = 0;
|
|
newcsum = 0;
|
|
- for (i=0; size>=4; size -= 4 ) {
|
|
+ for (; size>=4; size -= 4 ) {
|
|
newcsum += __le32_to_cpu(*isuper);
|
|
isuper++;
|
|
}
|
|
@@ -387,15 +386,11 @@ static void examine_super1(struct supert
|
|
printf(" Array State : ");
|
|
for (d=0; d<__le32_to_cpu(sb->raid_disks) + delta_extra; d++) {
|
|
int cnt = 0;
|
|
- int me = 0;
|
|
unsigned int i;
|
|
for (i=0; i< __le32_to_cpu(sb->max_dev); i++) {
|
|
unsigned int role = __le16_to_cpu(sb->dev_roles[i]);
|
|
- if (role == d) {
|
|
- if (i == __le32_to_cpu(sb->dev_number))
|
|
- me = 1;
|
|
+ if (role == d)
|
|
cnt++;
|
|
- }
|
|
}
|
|
if (cnt > 1) printf("?");
|
|
else if (cnt == 1) printf("A");
|
|
--- mdadm-3.2.1/Incremental.c.param 2011-03-28 10:38:12.045259502 -0400
|
|
+++ mdadm-3.2.1/Incremental.c 2011-03-28 11:02:05.731982753 -0400
|
|
@@ -735,7 +735,7 @@ static int count_active(struct supertype
|
|
continue;
|
|
info.array.raid_disks = raid_disks;
|
|
st->ss->getinfo_super(st, &info, devmap + raid_disks * devnum);
|
|
- if (!avail) {
|
|
+ if (!avail || !best) {
|
|
raid_disks = info.array.raid_disks;
|
|
avail = calloc(raid_disks, 1);
|
|
if (!avail) {
|
|
--- mdadm-3.2.1/super-intel.c.param 2011-03-28 10:38:12.048259718 -0400
|
|
+++ mdadm-3.2.1/super-intel.c 2011-03-28 11:20:01.651114866 -0400
|
|
@@ -6164,7 +6164,7 @@ static int apply_takeover_update(struct
|
|
{
|
|
struct imsm_dev *dev = NULL;
|
|
struct intel_dev *dv;
|
|
- struct imsm_dev *dev_new;
|
|
+ struct imsm_dev *dev_new = NULL;
|
|
struct imsm_map *map;
|
|
struct dl *dm, *du;
|
|
int i;
|