rpms/mdadm
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix up the param patch and renumber n-v-r

Browse Source 
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Doug Ledford 2011-03-28 11:22:21 -04:00
parent 0278b6d64f
commit 87aedf51a9
2 changed files with 79 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
mdadm-3.1.5-unused-param.patch
View File

@ -1,5 +1,49 @@
--- mdadm-3.1.5/Query.c.param 2011-03-22 21:19:09.000000000 -0400 --- mdadm-3.2.1/mdadm.c.param 2011-03-28 10:38:12.035258787 -0400
+++ mdadm-3.1.5/Query.c 2011-03-26 13:33:23.864978486 -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) @@ -35,7 +35,7 @@ int Query(char *dev)
int fd = open(dev, O_RDONLY); int fd = open(dev, O_RDONLY);
int vers; int vers;
@ -17,63 +61,8 @@
} else } else
superror = -1; superror = -1;
close(fd); close(fd);
--- mdadm-3.1.5/Grow.c.param 2011-03-22 21:19:09.000000000 -0400 --- mdadm-3.2.1/super1.c.param 2011-03-28 10:38:12.043259360 -0400
+++ mdadm-3.1.5/Grow.c 2011-03-26 13:33:23.866978629 -0400 +++ mdadm-3.2.1/super1.c 2011-03-28 10:53:14.423905054 -0400
@@ -2016,7 +2016,6 @@ int Grow_continue(int mdfd, struct super
unsigned long long *offsets;
int d;
struct mdinfo *sra, *sd;
- int rv;
unsigned long cache;
int done = 0;
@@ -2102,7 +2101,6 @@ int Grow_continue(int mdfd, struct super
if (fds[sd->disk.raid_disk] < 0) {
fprintf(stderr, Name ": %s: cannot open component %s\n",
info->sys_name, dn?dn:"-unknown-");
- rv = 1;
goto release;
}
free(dn);
--- mdadm-3.1.5/mdadm.c.param 2011-03-22 21:19:09.000000000 -0400
+++ mdadm-3.1.5/mdadm.c 2011-03-26 13:33:23.889980281 -0400
@@ -101,7 +101,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;
int print_help = 0;
@@ -1217,11 +1219,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.1.5/mdmon.c.param 2011-03-26 14:22:46.397366178 -0400
+++ mdadm-3.1.5/mdmon.c 2011-03-26 14:23:57.834516123 -0400
@@ -513,6 +513,8 @@ static int mdmon(char *devname, int devn
close(2);
ignore = dup(0);
#endif
+ if (ignore)
+ ignore++;
do_manager(container);
--- mdadm-3.1.5/super1.c.param 2011-03-26 13:51:30.166019581 -0400
+++ mdadm-3.1.5/super1.c 2011-03-26 13:55:02.995382097 -0400
@@ -111,7 +111,6 @@ static unsigned int calc_sb_1_csum(struc @@ -111,7 +111,6 @@ static unsigned int calc_sb_1_csum(struc
unsigned long long newcsum; unsigned long long newcsum;
int size = sizeof(*sb) + __le32_to_cpu(sb->max_dev)*2; int size = sizeof(*sb) + __le32_to_cpu(sb->max_dev)*2;
@ -91,7 +80,7 @@
newcsum += __le32_to_cpu(*isuper); newcsum += __le32_to_cpu(*isuper);
isuper++; isuper++;
} }
@@ -387,13 +386,10 @@ static void examine_super1(struct supert @@ -387,15 +386,11 @@ static void examine_super1(struct supert
printf(" Array State : "); printf(" Array State : ");
for (d=0; d<__le32_to_cpu(sb->raid_disks) + delta_extra; d++) { for (d=0; d<__le32_to_cpu(sb->raid_disks) + delta_extra; d++) {
int cnt = 0; int cnt = 0;
@ -99,32 +88,34 @@
unsigned int i; unsigned int i;
for (i=0; i< __le32_to_cpu(sb->max_dev); i++) { for (i=0; i< __le32_to_cpu(sb->max_dev); i++) {
unsigned int role = __le16_to_cpu(sb->dev_roles[i]); unsigned int role = __le16_to_cpu(sb->dev_roles[i]);
if (role == d) { - if (role == d) {
- if (i == __le32_to_cpu(sb->dev_number)) - if (i == __le32_to_cpu(sb->dev_number))
- me = 1; - me = 1;
+ if (role == d)
cnt++; cnt++;
} - }
} }
--- mdadm-3.1.5/sysfs.c.param 2011-03-26 14:03:54.206714522 -0400 if (cnt > 1) printf("?");
+++ mdadm-3.1.5/sysfs.c 2011-03-26 14:16:12.101936859 -0400 else if (cnt == 1) printf("A");
@@ -422,7 +422,7 @@ int sysfs_set_num(struct mdinfo *sra, st --- mdadm-3.2.1/Incremental.c.param 2011-03-28 10:38:12.045259502 -0400
int sysfs_uevent(struct mdinfo *sra, char *event) +++ 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
{ {
char fname[50]; struct imsm_dev *dev = NULL;
- int n; struct intel_dev *dv;
+ unsigned int n; - struct imsm_dev *dev_new;
int fd; + struct imsm_dev *dev_new = NULL;
struct imsm_map *map;
sprintf(fname, "/sys/block/%s/uevent", struct dl *dm, *du;
@@ -432,6 +432,11 @@ int sysfs_uevent(struct mdinfo *sra, cha int i;
return -1;
n = write(fd, event, strlen(event));
close(fd);
+ if (n != strlen(event)) {
+ dprintf(Name ": failed to write '%s' to '%s' (%s)\n",
+ event, fname, strerror(errno));
+ return -1;
+ }
return 0;
}

9
mdadm.spec
View File

@ -30,7 +30,7 @@ file can be used to help with some common tasks.
%prep %prep
%setup -q %setup -q
#%patch0 -p1 -b .param %patch0 -p1 -b .param
%patch19 -p1 -b .udev %patch19 -p1 -b .udev
%patch20 -p1 -b .static %patch20 -p1 -b .static
@ -81,10 +81,9 @@ fi
%ghost %attr(0700,root,root) %dir /var/run/mdadm %ghost %attr(0700,root,root) %dir /var/run/mdadm
%changelog %changelog
* Mon Mar 28 2011 Doug Ledford <dledford@redhat.com> - 3.2.1-0.fc16.1 * Mon Mar 28 2011 Doug Ledford <dledford@redhat.com> - 3.2.1-1
- Test build of latest upstream version. Will build for real once I know - Update to latest upstream version
if I need to fix up the param patch - Resolves: 691353
- Related: 691353
* Fri Mar 25 2011 Doug Ledford <dledford@redhat.com> - 3.1.5-1 * Fri Mar 25 2011 Doug Ledford <dledford@redhat.com> - 3.1.5-1
- Update to latest upstream stable release - Update to latest upstream stable release