From 46ccebf6f3cefecbf968d1a67df62554585b66f7 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 02:01:58 +0000 Subject: [PATCH 01/16] Initialize branch F-13 for mdadm --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 25ef040df7125501c0f11bfd0d74f3604f814963 Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Thu, 18 Feb 2010 18:02:36 +0000 Subject: [PATCH 02/16] - Fix s390/ppc64 UUID byte swap issue --- .cvsignore | 1 + mdadm-2.5.2-static.patch | 16 +++- mdadm-3.0-mdmon-dev-.mdadm.patch | 81 ---------------- mdadm-3.0-metadata.patch | 29 ------ mdadm-3.0-uuid.patch | 15 --- mdadm-3.0.3-auto.patch | 25 ----- mdadm-3.0.3-intel-serial.patch | 14 --- mdadm-3.1.1-endian.patch | 13 +++ mdadm-3.1.1-warn.patch | 152 +++++++++++++++++++++++++++++++ mdadm.spec | 27 +++--- sources | 2 +- 11 files changed, 193 insertions(+), 182 deletions(-) delete mode 100644 mdadm-3.0-mdmon-dev-.mdadm.patch delete mode 100644 mdadm-3.0-metadata.patch delete mode 100644 mdadm-3.0-uuid.patch delete mode 100644 mdadm-3.0.3-auto.patch delete mode 100644 mdadm-3.0.3-intel-serial.patch create mode 100644 mdadm-3.1.1-endian.patch create mode 100644 mdadm-3.1.1-warn.patch diff --git a/.cvsignore b/.cvsignore index c1f995d..439a87b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ mdadm-3.0.3.tar.bz2 +mdadm-3.1.1-gcd9a8b5.tar.bz2 diff --git a/mdadm-2.5.2-static.patch b/mdadm-2.5.2-static.patch index eb4f24a..62fcf4d 100644 --- a/mdadm-2.5.2-static.patch +++ b/mdadm-2.5.2-static.patch @@ -1,7 +1,15 @@ -Binary files mdadm-3.0-devel2/mdadm.static and mdadm-3.0-devel2/mdadm differ ---- mdadm-3.0-devel2/Makefile.static 2009-02-12 09:58:36.000000000 -0500 -+++ mdadm-3.0-devel2/Makefile 2009-02-12 09:59:22.000000000 -0500 -@@ -183,16 +183,16 @@ sha1.o : sha1.c sha1.h md5.h +--- mdadm-3.1.1/Makefile.static 2010-02-08 01:26:18.000000000 -0500 ++++ mdadm-3.1.1/Makefile 2010-02-17 13:52:42.928428188 -0500 +@@ -62,7 +62,7 @@ CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE) + # from early boot to late boot. + # If you don't have /lib/init/rw you might want to use /dev/.something + # e.g. make ALT_RUN=/dev/.mdadm +-ALT_RUN = /lib/init/rw ++ALT_RUN = /dev/md + ALTFLAGS = -DALT_RUN=\"$(ALT_RUN)\" + CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(ALTFLAGS) + +@@ -196,16 +196,16 @@ install : mdadm mdmon install-man instal $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon install-static : mdadm.static install-man diff --git a/mdadm-3.0-mdmon-dev-.mdadm.patch b/mdadm-3.0-mdmon-dev-.mdadm.patch deleted file mode 100644 index d2473a3..0000000 --- a/mdadm-3.0-mdmon-dev-.mdadm.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- mdadm-3.0.3/mdmon.c.mdmon 2009-10-21 20:13:13.000000000 -0400 -+++ mdadm-3.0.3/mdmon.c 2009-11-04 13:00:26.924089288 -0500 -@@ -118,7 +118,7 @@ static int test_pidfile(char *devname) - char path[100]; - struct stat st; - -- sprintf(path, "/var/run/mdadm/%s.pid", devname); -+ sprintf(path, "/dev/.mdadm/%s.pid", devname); - return stat(path, &st); - } - -@@ -132,7 +132,7 @@ int make_pidfile(char *devname, int o_ex - if (sigterm) - return -1; - -- sprintf(path, "/var/run/mdadm/%s.pid", devname); -+ sprintf(path, "/dev/.mdadm/%s.pid", devname); - - fd = open(path, O_RDWR|O_CREAT|o_excl, 0600); - if (fd < 0) -@@ -163,7 +163,7 @@ pid_t devname2mdmon(char *devname) - pid_t pid = -1; - int fd; - -- sprintf(buf, "/var/run/mdadm/%s.pid", devname); -+ sprintf(buf, "/dev/.mdadm/%s.pid", devname); - fd = open(buf, O_RDONLY|O_NOATIME); - if (fd < 0) - return -1; -@@ -217,9 +217,9 @@ void remove_pidfile(char *devname) - if (sigterm) - return; - -- sprintf(buf, "/var/run/mdadm/%s.pid", devname); -+ sprintf(buf, "/dev/.mdadm/%s.pid", devname); - unlink(buf); -- sprintf(buf, "/var/run/mdadm/%s.sock", devname); -+ sprintf(buf, "/dev/.mdadm/%s.sock", devname); - unlink(buf); - } - -@@ -233,7 +233,7 @@ int make_control_sock(char *devname) - if (sigterm) - return -1; - -- sprintf(path, "/var/run/mdadm/%s.sock", devname); -+ sprintf(path, "/dev/.mdadm/%s.sock", devname); - unlink(path); - sfd = socket(PF_LOCAL, SOCK_STREAM, 0); - if (sfd < 0) ---- mdadm-3.0.3/msg.c.mdmon 2009-10-21 20:13:13.000000000 -0400 -+++ mdadm-3.0.3/msg.c 2009-11-04 12:12:46.281963910 -0500 -@@ -147,7 +147,7 @@ int connect_monitor(char *devname) - int pos; - char *c; - -- pos = sprintf(path, "/var/run/mdadm/"); -+ pos = sprintf(path, "/dev/.mdadm/"); - if (is_subarray(devname)) { - devname++; - c = strchr(devname, '/'); ---- mdadm-3.0.3/util.c.mdmon 2009-10-21 21:07:14.000000000 -0400 -+++ mdadm-3.0.3/util.c 2009-11-04 12:12:46.282963942 -0500 -@@ -1208,7 +1208,7 @@ int mdmon_running(int devnum) - char pid[10]; - int fd; - int n; -- sprintf(path, "/var/run/mdadm/%s.pid", devnum2devname(devnum)); -+ sprintf(path, "/dev/.mdadm/%s.pid", devnum2devname(devnum)); - fd = open(path, O_RDONLY, 0); - - if (fd < 0) -@@ -1228,7 +1228,7 @@ int signal_mdmon(int devnum) - char pid[10]; - int fd; - int n; -- sprintf(path, "/var/run/mdadm/%s.pid", devnum2devname(devnum)); -+ sprintf(path, "/dev/.mdadm/%s.pid", devnum2devname(devnum)); - fd = open(path, O_RDONLY, 0); - - if (fd < 0) diff --git a/mdadm-3.0-metadata.patch b/mdadm-3.0-metadata.patch deleted file mode 100644 index 5bccae4..0000000 --- a/mdadm-3.0-metadata.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- mdadm-3.0/Detail.c.metadata 2009-09-11 02:10:24.000000000 -0400 -+++ mdadm-3.0/Detail.c 2009-09-15 14:54:56.849391192 -0400 -@@ -161,7 +161,7 @@ - if (sra && sra->array.major_version < 0) - printf("MD_METADATA=%s\n", sra->text_version); - else -- printf("MD_METADATA=%d.%02d\n", -+ printf("MD_METADATA=%d.%d\n", - array.major_version, array.minor_version); - } - -@@ -208,7 +208,7 @@ - if (sra && sra->array.major_version < 0) - printf(" metadata=%s", sra->text_version); - else -- printf(" metadata=%d.%02d", -+ printf(" metadata=%d.%d", - array.major_version, array.minor_version); - } - -@@ -241,7 +241,7 @@ - if (sra && sra->array.major_version < 0) - printf(" Version : %s\n", sra->text_version); - else -- printf(" Version : %d.%02d\n", -+ printf(" Version : %d.%d\n", - array.major_version, array.minor_version); - } - diff --git a/mdadm-3.0-uuid.patch b/mdadm-3.0-uuid.patch deleted file mode 100644 index 6f0deaf..0000000 --- a/mdadm-3.0-uuid.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up mdadm-3.0/Detail.c~ mdadm-3.0/Detail.c ---- mdadm-3.0/Detail.c~ 2009-06-02 07:48:29.000000000 +0200 -+++ mdadm-3.0/Detail.c 2009-09-14 17:11:15.000000000 +0200 -@@ -185,6 +185,11 @@ int Detail(char *dev, int brief, int exp - if (mp && mp->path && - strncmp(mp->path, "/dev/md/", 8) == 0) - printf("MD_DEVNAME=%s\n", mp->path+8); -+ if (mp && (mp->uuid[0] || mp->uuid[1] || mp->uuid[2] || -+ mp->uuid[3])) -+ printf("MD_UUID=%08x:%08x:%08x:%08x\n", -+ mp->uuid[0], mp->uuid[1], mp->uuid[2], -+ mp->uuid[3]); - } - goto out; - } diff --git a/mdadm-3.0.3-auto.patch b/mdadm-3.0.3-auto.patch deleted file mode 100644 index 92f12e3..0000000 --- a/mdadm-3.0.3-auto.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- mdadm-3.0.3/config.c 2009-10-01 02:57:03.000000000 -0400 -+++ mdadm-3.0.3/config.c 2010-01-04 11:24:58.700853405 -0500 -@@ -677,12 +677,21 @@ - static char *auto_options = NULL; - void autoline(char *line) - { -+ char *w; -+ - if (auto_options) { - fprintf(stderr, Name ": AUTO line may only be give once." - " Subsequent lines ignored\n"); - return; - } -- auto_options = line; -+ -+ auto_options = dl_strdup(line); -+ dl_init(auto_options); -+ -+ for (w=dl_next(line); w != line ; w=dl_next(w)) { -+ char *w2 = dl_strdup(w); -+ dl_add(auto_options, w2); -+ } - } - - int loaded = 0; diff --git a/mdadm-3.0.3-intel-serial.patch b/mdadm-3.0.3-intel-serial.patch deleted file mode 100644 index 9f6820e..0000000 --- a/mdadm-3.0.3-intel-serial.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- mdadm-3.0.3/super-intel.c.serial 2009-10-21 20:13:13.000000000 -0400 -+++ mdadm-3.0.3/super-intel.c 2009-11-05 16:07:28.896089680 -0500 -@@ -2987,7 +2987,10 @@ static int add_to_super_imsm(struct supe - dd->fd = fd; - dd->e = NULL; - rv = imsm_read_serial(fd, devname, dd->serial); -- if (rv) { -+ if (rv && check_env("IMSM_DEVNAME_AS_SERIAL")) { -+ memset(dd->serial, 0, MAX_RAID_SERIAL_LEN); -+ fd2devname(fd, (char *) dd->serial); -+ } else if (rv) { - fprintf(stderr, - Name ": failed to retrieve scsi serial, aborting\n"); - free(dd); diff --git a/mdadm-3.1.1-endian.patch b/mdadm-3.1.1-endian.patch new file mode 100644 index 0000000..4ea127c --- /dev/null +++ b/mdadm-3.1.1-endian.patch @@ -0,0 +1,13 @@ +--- mdadm-3.1.1/super1.c.endian 2010-02-18 01:39:56.079803165 -0500 ++++ mdadm-3.1.1/super1.c 2010-02-18 01:40:07.973803550 -0500 +@@ -1667,10 +1667,6 @@ struct superswitch super1 = { + .locate_bitmap = locate_bitmap1, + .write_bitmap = write_bitmap1, + .free_super = free_super1, +-#if __BYTE_ORDER == BIG_ENDIAN +- .swapuuid = 0, +-#else + .swapuuid = 1, +-#endif + .name = "1.x", + }; diff --git a/mdadm-3.1.1-warn.patch b/mdadm-3.1.1-warn.patch new file mode 100644 index 0000000..9f07bb9 --- /dev/null +++ b/mdadm-3.1.1-warn.patch @@ -0,0 +1,152 @@ +--- mdadm-3.1.1/Grow.c.warn 2010-02-08 01:26:18.000000000 -0500 ++++ mdadm-3.1.1/Grow.c 2010-02-17 14:58:43.615427833 -0500 +@@ -1096,7 +1096,7 @@ int Grow_reshape(char *devname, int fd, + /* set them all just in case some old 'new_*' value + * persists from some earlier problem + */ +- int err; ++ int err = 0; + if (sysfs_set_num(sra, NULL, "chunk_size", nchunk) < 0) + rv = 1, err = errno; + if (!rv && sysfs_set_num(sra, NULL, "layout", nlayout) < 0) +@@ -1269,6 +1269,7 @@ int grow_backup(struct mdinfo *sra, + int odata = disks; + int rv = 0; + int i; ++ int ret; + unsigned long long new_degraded; + //printf("offset %llu\n", offset); + if (level >= 4) +@@ -1334,10 +1335,10 @@ int grow_backup(struct mdinfo *sra, + ((char*)&bsb.sb_csum2)-((char*)&bsb)); + + lseek64(destfd[i], destoffsets[i] - 4096, 0); +- write(destfd[i], &bsb, 512); ++ ret = write(destfd[i], &bsb, 512); + if (destoffsets[i] > 4096) { + lseek64(destfd[i], destoffsets[i]+stripes*chunk*odata, 0); +- write(destfd[i], &bsb, 512); ++ ret = write(destfd[i], &bsb, 512); + } + fsync(destfd[i]); + } +@@ -1368,6 +1369,7 @@ int wait_backup(struct mdinfo *sra, + int fd = sysfs_get_fd(sra, NULL, "sync_completed"); + unsigned long long completed; + int i; ++ int ret; + + if (fd < 0) + return -1; +@@ -1406,7 +1408,7 @@ int wait_backup(struct mdinfo *sra, + bsb.sb_csum2 = bsb_csum((char*)&bsb, + ((char*)&bsb.sb_csum2)-((char*)&bsb)); + lseek64(destfd[i], destoffsets[i]-4096, 0); +- write(destfd[i], &bsb, 512); ++ ret = write(destfd[i], &bsb, 512); + fsync(destfd[i]); + } + return 0; +@@ -1414,8 +1416,9 @@ int wait_backup(struct mdinfo *sra, + + static void fail(char *msg) + { +- write(2, msg, strlen(msg)); +- write(2, "\n", 1); ++ int ret; ++ ret = write(2, msg, strlen(msg)); ++ ret = write(2, "\n", 1); + exit(1); + } + +@@ -1452,8 +1455,10 @@ static void validate(int afd, int bfd, u + free(abuf); + free(bbuf); + abuflen = len; +- posix_memalign((void**)&abuf, 4096, abuflen); +- posix_memalign((void**)&bbuf, 4096, abuflen); ++ if (posix_memalign((void**)&abuf, 4096, abuflen) != 0) ++ fail("unable to allocate aligned memory"); ++ if (posix_memalign((void**)&bbuf, 4096, abuflen) != 0) ++ fail("unable to allocate aligned memory"); + } + + lseek64(bfd, offset, 0); +@@ -1486,7 +1491,11 @@ static void validate(int afd, int bfd, u + free(bbuf); + abuflen = len; + abuf = malloc(abuflen); ++ if (abuf == NULL) ++ fail("unable to allocate memory"); + bbuf = malloc(abuflen); ++ if (bbuf == NULL) ++ fail("unable to allocate memory"); + } + + lseek64(bfd, offset+__le64_to_cpu(bsb2.devstart2)*512, 0); +@@ -1508,7 +1517,8 @@ static int child_grow(int afd, struct md + char *buf; + int degraded = 0; + +- posix_memalign((void**)&buf, 4096, disks * chunk); ++ if (posix_memalign((void**)&buf, 4096, disks * chunk) != 0) ++ fail("unable to allocate aligned memory"); + sysfs_set_num(sra, NULL, "suspend_hi", 0); + sysfs_set_num(sra, NULL, "suspend_lo", 0); + grow_backup(sra, 0, stripes, +@@ -1536,7 +1546,8 @@ static int child_shrink(int afd, struct + int rv; + int degraded = 0; + +- posix_memalign((void**)&buf, 4096, disks * chunk); ++ if (posix_memalign((void**)&buf, 4096, disks * chunk) != 0) ++ fail("unable to allocate alinged memory"); + start = sra->component_size - stripes * chunk/512; + sysfs_set_num(sra, NULL, "sync_max", start); + sysfs_set_str(sra, NULL, "sync_action", "reshape"); +@@ -1575,7 +1586,8 @@ static int child_same_size(int afd, stru + int degraded = 0; + + +- posix_memalign((void**)&buf, 4096, disks * chunk); ++ if (posix_memalign((void**)&buf, 4096, disks * chunk) != 0) ++ fail("unable to allocate alinged memory"); + + sysfs_set_num(sra, NULL, "suspend_lo", 0); + sysfs_set_num(sra, NULL, "suspend_hi", 0); +--- mdadm-3.1.1/restripe.c.warn 2010-02-08 01:26:18.000000000 -0500 ++++ mdadm-3.1.1/restripe.c 2010-02-17 14:58:43.615427833 -0500 +@@ -565,7 +565,10 @@ int restore_stripes(int *dest, unsigned + + int data_disks = raid_disks - (level == 0 ? 0 : level <= 5 ? 1 : 2); + +- posix_memalign((void**)&stripe_buf, 4096, raid_disks * chunk_size); ++ if (posix_memalign((void**)&stripe_buf, 4096, raid_disks * chunk_size) != 0) { ++ fprintf(stderr, "unable to allocate aligned memory\n"); ++ exit(1); ++ } + if (zero == NULL) { + zero = malloc(chunk_size); + if (zero) +--- mdadm-3.1.1/mdmon.c.warn 2010-02-08 01:26:18.000000000 -0500 ++++ mdadm-3.1.1/mdmon.c 2010-02-17 14:58:43.616427642 -0500 +@@ -176,7 +176,7 @@ static void try_kill_monitor(pid_t pid, + fl = fcntl(sock, F_GETFL, 0); + fl &= ~O_NONBLOCK; + fcntl(sock, F_SETFL, fl); +- read(sock, buf, 100); ++ n = read(sock, buf, 100); + } + + void remove_pidfile(char *devname) +--- mdadm-3.1.1/super-intel.c.warn 2010-02-17 14:59:16.757425375 -0500 ++++ mdadm-3.1.1/super-intel.c 2010-02-17 15:00:15.309803578 -0500 +@@ -698,7 +698,7 @@ static void print_imsm_dev(struct imsm_d + printf(" <-- %s", map_state_str[map->map_state]); + printf("\n Checkpoint : %u (%llu)", + __le32_to_cpu(dev->vol.curr_migr_unit), +- blocks_per_migr_unit(dev)); ++ (unsigned long long)blocks_per_migr_unit(dev)); + } + printf("\n"); + printf(" Dirty State : %s\n", dev->vol.dirty ? "dirty" : "clean"); diff --git a/mdadm.spec b/mdadm.spec index 7d6497e..0325c91 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,18 +1,15 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm -Version: 3.0.3 -Release: 3%{?dist} -Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2 +Version: 3.1.1 +Release: 0.gcd9a8b5.2%{?dist} +Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-gcd9a8b5.tar.bz2 Source1: mdmonitor.init Source2: raid-check Source3: mdadm.rules Source4: mdadm-raid-check-sysconfig Patch1: mdadm-2.5.2-static.patch -Patch2: mdadm-3.0-metadata.patch -Patch3: mdadm-3.0-uuid.patch -Patch4: mdadm-3.0-mdmon-dev-.mdadm.patch -Patch5: mdadm-3.0.3-intel-serial.patch -Patch6: mdadm-3.0.3-auto.patch +Patch2: mdadm-3.1.1-warn.patch +Patch3: mdadm-3.1.1-endian.patch URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ License: GPLv2+ Group: System Environment/Base @@ -34,11 +31,8 @@ file can be used to help with some common tasks. %prep %setup -q %patch1 -p1 -b .static -%patch2 -p1 -b .metadata -%patch3 -p1 -b .uuid -%patch4 -p1 -b .mdmon -%patch5 -p1 -b .serial -%patch6 -p1 -b .auto +%patch2 -p1 -b .warn +%patch3 -p1 -b .endian %build make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon @@ -85,6 +79,13 @@ fi %attr(0700,root,root) %dir /var/run/mdadm %changelog +* Thu Feb 18 2010 Doug Ledford - 3.1.1-0.gcd9a8b5.2 +- Fix s390/ppc64 UUID byte swap issue + +* Wed Feb 17 2010 Doug Ledford - 3.1.1-0.gcd9a8b5.1 +- Update to head of upstream git repo, which contains a significant number + of bug fixes we need + * Fri Jan 15 2010 Doug Ledford - 3.0.3-3 - Fix crash when AUTO keyword is in mdadm.conf (bz552342) diff --git a/sources b/sources index 50d7f0b..622391f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ab786dee6c65c68ea74199788bf88c7 mdadm-3.0.3.tar.bz2 +fd4bcda48d6dc3d6113b5c25950c9671 mdadm-3.1.1-gcd9a8b5.tar.bz2 From 6aac98e8e7a052de5dc223acfefc71ab3f73abe6 Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Fri, 19 Feb 2010 23:54:16 +0000 Subject: [PATCH 03/16] - Don't run the raid-check script if the kernel doesn't support md devices (bz557053) - Don't report any mismatch_cnt issues on raid1 devices as there are legitimate reasons why the count may not be 0 and we are getting enough false positives that it renders the check useless (bz554217, bz547128) --- mdadm.spec | 11 +++++++++-- raid-check | 18 +++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/mdadm.spec b/mdadm.spec index 0325c91..85d9454 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 3.1.1 -Release: 0.gcd9a8b5.2%{?dist} +Release: 0.gcd9a8b5.3%{?dist} Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-gcd9a8b5.tar.bz2 Source1: mdmonitor.init Source2: raid-check @@ -79,12 +79,19 @@ fi %attr(0700,root,root) %dir /var/run/mdadm %changelog +* Fri Feb 19 2010 Doug Ledford - 3.1.1-0.gcd9a8b5.3 +- Don't run the raid-check script if the kernel doesn't support + md devices (bz557053) +- Don't report any mismatch_cnt issues on raid1 devices as there are + legitimate reasons why the count may not be 0 and we are getting enough + false positives that it renders the check useless (bz554217, bz547128) + * Thu Feb 18 2010 Doug Ledford - 3.1.1-0.gcd9a8b5.2 - Fix s390/ppc64 UUID byte swap issue * Wed Feb 17 2010 Doug Ledford - 3.1.1-0.gcd9a8b5.1 - Update to head of upstream git repo, which contains a significant number - of bug fixes we need + of bug fixes we need (bz543746) * Fri Jan 15 2010 Doug Ledford - 3.0.3-3 - Fix crash when AUTO keyword is in mdadm.conf (bz552342) diff --git a/raid-check b/raid-check index 27f9b8c..0f8c263 100644 --- a/raid-check +++ b/raid-check @@ -4,6 +4,10 @@ # Please use that file to enable/disable this script or to set the # type of check you wish performed. +# We might be on a kernel with no raid support at all, exit if so +[ -f /proc/mdstat ] || exit 0 + +# and exit if we haven't been set up properly [ -f /etc/sysconfig/raid-check ] || exit 0 . /etc/sysconfig/raid-check @@ -62,7 +66,19 @@ do done for dev in $check_list; do mismatch_cnt=`cat /sys/block/$dev/md/mismatch_cnt` - if [ "$mismatch_cnt" -ne 0 ]; then + # Due to the fact that raid1 writes in the kernel are unbuffered, + # a raid1 array can have non-0 mismatch counts even when the + # array is healthy. These non-0 counts will only exist in + # transient data areas where they don't pose a problem. However, + # since we can't tell the difference between a non-0 count that + # is just in transient data or a non-0 count that signifies a + # real problem, simply don't check the mismatch_cnt on raid1 + # devices as it's providing far too many false positives. But by + # leaving the raid1 device in the check list and performing the + # check, we still catch and correct any bad sectors there might + # be in the device. + raid_lvl=`cat /sys/block/$dev/md/level` + if [ "$mismatch_cnt" -ne 0 -a "$raid_lvl" != "raid1" ]; then echo "WARNING: mismatch_cnt is not 0 on /dev/$dev" fi done From b370167f463c1a623fb807bbfd43d00226b133a4 Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Sun, 21 Feb 2010 15:33:20 +0000 Subject: [PATCH 04/16] - Fix problem with booting multiple imsm containers when they aren't listed "just so" in the mdadm.conf file (bz554974) --- mdadm-3.1.1-imsm.patch | 18 ++++++++++++++++++ mdadm.spec | 8 +++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 mdadm-3.1.1-imsm.patch diff --git a/mdadm-3.1.1-imsm.patch b/mdadm-3.1.1-imsm.patch new file mode 100644 index 0000000..336afd5 --- /dev/null +++ b/mdadm-3.1.1-imsm.patch @@ -0,0 +1,18 @@ +diff --git a/Assemble.c b/Assemble.c +index e4d6181..72f7942 100644 +--- a/Assemble.c ++++ b/Assemble.c +@@ -434,13 +434,6 @@ int Assemble(struct supertype *st, char *mddev, + } + } + st = tst; tst = NULL; +- if (!auto_assem && tmpdev->next != NULL) { +- fprintf(stderr, Name ": %s is a container, but is not " +- "only device given: confused and aborting\n", +- devname); +- st->ss->free_super(st); +- return 1; +- } + if (verbose > 0) + fprintf(stderr, Name ": found match on member %s in %s\n", + content->text_version, devname); diff --git a/mdadm.spec b/mdadm.spec index 85d9454..8032812 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 3.1.1 -Release: 0.gcd9a8b5.3%{?dist} +Release: 0.gcd9a8b5.4%{?dist} Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-gcd9a8b5.tar.bz2 Source1: mdmonitor.init Source2: raid-check @@ -10,6 +10,7 @@ Source4: mdadm-raid-check-sysconfig Patch1: mdadm-2.5.2-static.patch Patch2: mdadm-3.1.1-warn.patch Patch3: mdadm-3.1.1-endian.patch +Patch4: mdadm-3.1.1-imsm.patch URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ License: GPLv2+ Group: System Environment/Base @@ -33,6 +34,7 @@ file can be used to help with some common tasks. %patch1 -p1 -b .static %patch2 -p1 -b .warn %patch3 -p1 -b .endian +%patch4 -p1 -b .imsm %build make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon @@ -79,6 +81,10 @@ fi %attr(0700,root,root) %dir /var/run/mdadm %changelog +* Sun Feb 21 2010 Doug Ledford - 3.1.1-0.gcd9a8b5.4 +- Fix problem with booting multiple imsm containers when they aren't listed + "just so" in the mdadm.conf file (bz554974) + * Fri Feb 19 2010 Doug Ledford - 3.1.1-0.gcd9a8b5.3 - Don't run the raid-check script if the kernel doesn't support md devices (bz557053) From 20929c0606cef175567060b50527fe1deeebaf19 Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Mon, 22 Feb 2010 00:28:48 +0000 Subject: [PATCH 05/16] - The uuid patch cause a different problem during assembly, so use a gross hack to work around the uuid issue that won't break assembly until fixed properly upstream (bz567132) --- mdadm-3.1.1-endian.patch | 29 ++++++++++++++++------------- mdadm.spec | 7 ++++++- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/mdadm-3.1.1-endian.patch b/mdadm-3.1.1-endian.patch index 4ea127c..7342019 100644 --- a/mdadm-3.1.1-endian.patch +++ b/mdadm-3.1.1-endian.patch @@ -1,13 +1,16 @@ ---- mdadm-3.1.1/super1.c.endian 2010-02-18 01:39:56.079803165 -0500 -+++ mdadm-3.1.1/super1.c 2010-02-18 01:40:07.973803550 -0500 -@@ -1667,10 +1667,6 @@ struct superswitch super1 = { - .locate_bitmap = locate_bitmap1, - .write_bitmap = write_bitmap1, - .free_super = free_super1, --#if __BYTE_ORDER == BIG_ENDIAN -- .swapuuid = 0, --#else - .swapuuid = 1, --#endif - .name = "1.x", - }; +--- mdadm-3.1.1/util.c.endian 2010-02-21 19:13:56.253610477 -0500 ++++ mdadm-3.1.1/util.c 2010-02-21 19:16:26.338375501 -0500 +@@ -395,7 +395,12 @@ char *__fname_from_uuid(int id[4], int s + + char *fname_from_uuid(struct supertype *st, struct mdinfo *info, char *buf, char sep) + { +- return __fname_from_uuid(info->uuid, st->ss->swapuuid, buf, sep); ++ // dirty hack to work around an issue with super1 superblocks... ++ // super1 superblocks need swapuuid set in order for assembly to ++ // work, but can't have it set if we want this printout to match ++ // all the other uuid printouts in super1.c, so we force swapuuid ++ // to 1 to make our printout match the rest of super1 ++ return __fname_from_uuid(info->uuid, (st->ss == &super1) ? 1 : st->ss->swapuuid, buf, sep); + } + + #ifndef MDASSEMBLE diff --git a/mdadm.spec b/mdadm.spec index 8032812..8b30c4b 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 3.1.1 -Release: 0.gcd9a8b5.4%{?dist} +Release: 0.gcd9a8b5.5%{?dist} Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-gcd9a8b5.tar.bz2 Source1: mdmonitor.init Source2: raid-check @@ -81,6 +81,11 @@ fi %attr(0700,root,root) %dir /var/run/mdadm %changelog +* Sun Feb 21 2010 Doug Ledford - 3.1.1-0.gcd9a8b5.5 +- The uuid patch cause a different problem during assembly, so use a gross + hack to work around the uuid issue that won't break assembly until fixed + properly upstream (bz567132) + * Sun Feb 21 2010 Doug Ledford - 3.1.1-0.gcd9a8b5.4 - Fix problem with booting multiple imsm containers when they aren't listed "just so" in the mdadm.conf file (bz554974) From 877588c6108d1f2a6d77a7916064b7c35edbbced Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Tue, 23 Feb 2010 14:53:10 +0000 Subject: [PATCH 06/16] - Newer version of imsm patch that leaves warning, but only when there actually are too many devices on the command line (bz554974) --- mdadm-3.1.1-imsm.patch | 17 ++++++----------- mdadm.spec | 6 +++++- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/mdadm-3.1.1-imsm.patch b/mdadm-3.1.1-imsm.patch index 336afd5..a5d74ed 100644 --- a/mdadm-3.1.1-imsm.patch +++ b/mdadm-3.1.1-imsm.patch @@ -1,18 +1,13 @@ diff --git a/Assemble.c b/Assemble.c -index e4d6181..72f7942 100644 +index e4d6181..23cc438 100644 --- a/Assemble.c +++ b/Assemble.c -@@ -434,13 +434,6 @@ int Assemble(struct supertype *st, char *mddev, +@@ -434,7 +434,7 @@ int Assemble(struct supertype *st, char *mddev, } } st = tst; tst = NULL; - if (!auto_assem && tmpdev->next != NULL) { -- fprintf(stderr, Name ": %s is a container, but is not " -- "only device given: confused and aborting\n", -- devname); -- st->ss->free_super(st); -- return 1; -- } - if (verbose > 0) - fprintf(stderr, Name ": found match on member %s in %s\n", - content->text_version, devname); ++ if (!auto_assem && inargv && tmpdev->next != NULL) { + fprintf(stderr, Name ": %s is a container, but is not " + "only device given: confused and aborting\n", + devname); diff --git a/mdadm.spec b/mdadm.spec index 8b30c4b..82e265a 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 3.1.1 -Release: 0.gcd9a8b5.5%{?dist} +Release: 0.gcd9a8b5.6%{?dist} Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-gcd9a8b5.tar.bz2 Source1: mdmonitor.init Source2: raid-check @@ -81,6 +81,10 @@ fi %attr(0700,root,root) %dir /var/run/mdadm %changelog +* Tue Feb 23 2010 Doug Ledford - 3.1.1-0.gcd9a8b5.6 +- Newer version of imsm patch that leaves warning, but only when there + actually are too many devices on the command line (bz554974) + * Sun Feb 21 2010 Doug Ledford - 3.1.1-0.gcd9a8b5.5 - The uuid patch cause a different problem during assembly, so use a gross hack to work around the uuid issue that won't break assembly until fixed From efe92bcae0067b85ba380a1d63a488f0328d16e0 Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Tue, 6 Apr 2010 16:45:46 +0000 Subject: [PATCH 07/16] - Clean up directory mess once and for all - Add incremental remove support --- .cvsignore | 1 + mdadm-2.5.2-static.patch | 26 +- mdadm-3.1.1-endian.patch | 20 +- mdadm-3.1.1-imsm.patch | 13 - mdadm-3.1.1-warn.patch | 152 -------- mdadm-3.1.2-decremental-2.patch | 36 ++ mdadm-3.1.2-decremental.patch | 633 ++++++++++++++++++++++++++++++++ mdadm-3.1.2-directory.patch | 265 +++++++++++++ mdadm-3.1.2-mapfile.patch | 80 ++++ mdadm-3.1.2-mapname.patch | 58 +++ mdadm-3.1.2-rebuild.patch | 38 ++ mdadm.rules | 5 +- mdadm.spec | 44 ++- sources | 2 +- 14 files changed, 1180 insertions(+), 193 deletions(-) delete mode 100644 mdadm-3.1.1-imsm.patch delete mode 100644 mdadm-3.1.1-warn.patch create mode 100644 mdadm-3.1.2-decremental-2.patch create mode 100644 mdadm-3.1.2-decremental.patch create mode 100644 mdadm-3.1.2-directory.patch create mode 100644 mdadm-3.1.2-mapfile.patch create mode 100644 mdadm-3.1.2-mapname.patch create mode 100644 mdadm-3.1.2-rebuild.patch diff --git a/.cvsignore b/.cvsignore index 439a87b..1b8b081 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ mdadm-3.0.3.tar.bz2 mdadm-3.1.1-gcd9a8b5.tar.bz2 +mdadm-3.1.2.tar.bz2 diff --git a/mdadm-2.5.2-static.patch b/mdadm-2.5.2-static.patch index 62fcf4d..a0cd1c3 100644 --- a/mdadm-2.5.2-static.patch +++ b/mdadm-2.5.2-static.patch @@ -1,15 +1,19 @@ ---- mdadm-3.1.1/Makefile.static 2010-02-08 01:26:18.000000000 -0500 -+++ mdadm-3.1.1/Makefile 2010-02-17 13:52:42.928428188 -0500 -@@ -62,7 +62,7 @@ CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE) - # from early boot to late boot. +--- mdadm-3.1.2/Makefile.static 2010-04-06 11:55:03.098505021 -0400 ++++ mdadm-3.1.2/Makefile 2010-04-06 11:55:44.120254408 -0400 +@@ -62,9 +62,9 @@ CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE) + # pivotroot from early boot to late boot. # If you don't have /lib/init/rw you might want to use /dev/.something - # e.g. make ALT_RUN=/dev/.mdadm --ALT_RUN = /lib/init/rw -+ALT_RUN = /dev/md - ALTFLAGS = -DALT_RUN=\"$(ALT_RUN)\" - CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(ALTFLAGS) - -@@ -196,16 +196,16 @@ install : mdadm mdmon install-man instal + # e.g. make MAP_DIR=/dev/.mdadm +-MAP_DIR = /lib/init/rw/mdadm +-MAP_FILE = map +-MDMON_DIR = /lib/init/rw/mdmon ++MAP_DIR = /dev/md ++MAP_FILE = md-device-map ++MDMON_DIR = /dev/md + DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\" + DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\" + CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS) +@@ -206,16 +206,16 @@ install : mdadm mdmon install-man instal $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon install-static : mdadm.static install-man diff --git a/mdadm-3.1.1-endian.patch b/mdadm-3.1.1-endian.patch index 7342019..c45f175 100644 --- a/mdadm-3.1.1-endian.patch +++ b/mdadm-3.1.1-endian.patch @@ -1,6 +1,17 @@ ---- mdadm-3.1.1/util.c.endian 2010-02-21 19:13:56.253610477 -0500 -+++ mdadm-3.1.1/util.c 2010-02-21 19:16:26.338375501 -0500 -@@ -395,7 +395,12 @@ char *__fname_from_uuid(int id[4], int s +From 86983cce34645efb2b270a737d573e01eeee96e5 Mon Sep 17 00:00:00 2001 +From: NeilBrown +Date: Wed, 24 Mar 2010 09:07:02 +1100 +Subject: [PATCH 1/6] + +--- + util.c | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) + +diff --git a/util.c b/util.c +index d292a66..79d2b0f 100644 +--- a/util.c ++++ b/util.c +@@ -425,7 +425,12 @@ char *__fname_from_uuid(int id[4], int swap, char *buf, char sep) char *fname_from_uuid(struct supertype *st, struct mdinfo *info, char *buf, char sep) { @@ -14,3 +25,6 @@ } #ifndef MDASSEMBLE +-- +1.6.6.1 + diff --git a/mdadm-3.1.1-imsm.patch b/mdadm-3.1.1-imsm.patch deleted file mode 100644 index a5d74ed..0000000 --- a/mdadm-3.1.1-imsm.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Assemble.c b/Assemble.c -index e4d6181..23cc438 100644 ---- a/Assemble.c -+++ b/Assemble.c -@@ -434,7 +434,7 @@ int Assemble(struct supertype *st, char *mddev, - } - } - st = tst; tst = NULL; -- if (!auto_assem && tmpdev->next != NULL) { -+ if (!auto_assem && inargv && tmpdev->next != NULL) { - fprintf(stderr, Name ": %s is a container, but is not " - "only device given: confused and aborting\n", - devname); diff --git a/mdadm-3.1.1-warn.patch b/mdadm-3.1.1-warn.patch deleted file mode 100644 index 9f07bb9..0000000 --- a/mdadm-3.1.1-warn.patch +++ /dev/null @@ -1,152 +0,0 @@ ---- mdadm-3.1.1/Grow.c.warn 2010-02-08 01:26:18.000000000 -0500 -+++ mdadm-3.1.1/Grow.c 2010-02-17 14:58:43.615427833 -0500 -@@ -1096,7 +1096,7 @@ int Grow_reshape(char *devname, int fd, - /* set them all just in case some old 'new_*' value - * persists from some earlier problem - */ -- int err; -+ int err = 0; - if (sysfs_set_num(sra, NULL, "chunk_size", nchunk) < 0) - rv = 1, err = errno; - if (!rv && sysfs_set_num(sra, NULL, "layout", nlayout) < 0) -@@ -1269,6 +1269,7 @@ int grow_backup(struct mdinfo *sra, - int odata = disks; - int rv = 0; - int i; -+ int ret; - unsigned long long new_degraded; - //printf("offset %llu\n", offset); - if (level >= 4) -@@ -1334,10 +1335,10 @@ int grow_backup(struct mdinfo *sra, - ((char*)&bsb.sb_csum2)-((char*)&bsb)); - - lseek64(destfd[i], destoffsets[i] - 4096, 0); -- write(destfd[i], &bsb, 512); -+ ret = write(destfd[i], &bsb, 512); - if (destoffsets[i] > 4096) { - lseek64(destfd[i], destoffsets[i]+stripes*chunk*odata, 0); -- write(destfd[i], &bsb, 512); -+ ret = write(destfd[i], &bsb, 512); - } - fsync(destfd[i]); - } -@@ -1368,6 +1369,7 @@ int wait_backup(struct mdinfo *sra, - int fd = sysfs_get_fd(sra, NULL, "sync_completed"); - unsigned long long completed; - int i; -+ int ret; - - if (fd < 0) - return -1; -@@ -1406,7 +1408,7 @@ int wait_backup(struct mdinfo *sra, - bsb.sb_csum2 = bsb_csum((char*)&bsb, - ((char*)&bsb.sb_csum2)-((char*)&bsb)); - lseek64(destfd[i], destoffsets[i]-4096, 0); -- write(destfd[i], &bsb, 512); -+ ret = write(destfd[i], &bsb, 512); - fsync(destfd[i]); - } - return 0; -@@ -1414,8 +1416,9 @@ int wait_backup(struct mdinfo *sra, - - static void fail(char *msg) - { -- write(2, msg, strlen(msg)); -- write(2, "\n", 1); -+ int ret; -+ ret = write(2, msg, strlen(msg)); -+ ret = write(2, "\n", 1); - exit(1); - } - -@@ -1452,8 +1455,10 @@ static void validate(int afd, int bfd, u - free(abuf); - free(bbuf); - abuflen = len; -- posix_memalign((void**)&abuf, 4096, abuflen); -- posix_memalign((void**)&bbuf, 4096, abuflen); -+ if (posix_memalign((void**)&abuf, 4096, abuflen) != 0) -+ fail("unable to allocate aligned memory"); -+ if (posix_memalign((void**)&bbuf, 4096, abuflen) != 0) -+ fail("unable to allocate aligned memory"); - } - - lseek64(bfd, offset, 0); -@@ -1486,7 +1491,11 @@ static void validate(int afd, int bfd, u - free(bbuf); - abuflen = len; - abuf = malloc(abuflen); -+ if (abuf == NULL) -+ fail("unable to allocate memory"); - bbuf = malloc(abuflen); -+ if (bbuf == NULL) -+ fail("unable to allocate memory"); - } - - lseek64(bfd, offset+__le64_to_cpu(bsb2.devstart2)*512, 0); -@@ -1508,7 +1517,8 @@ static int child_grow(int afd, struct md - char *buf; - int degraded = 0; - -- posix_memalign((void**)&buf, 4096, disks * chunk); -+ if (posix_memalign((void**)&buf, 4096, disks * chunk) != 0) -+ fail("unable to allocate aligned memory"); - sysfs_set_num(sra, NULL, "suspend_hi", 0); - sysfs_set_num(sra, NULL, "suspend_lo", 0); - grow_backup(sra, 0, stripes, -@@ -1536,7 +1546,8 @@ static int child_shrink(int afd, struct - int rv; - int degraded = 0; - -- posix_memalign((void**)&buf, 4096, disks * chunk); -+ if (posix_memalign((void**)&buf, 4096, disks * chunk) != 0) -+ fail("unable to allocate alinged memory"); - start = sra->component_size - stripes * chunk/512; - sysfs_set_num(sra, NULL, "sync_max", start); - sysfs_set_str(sra, NULL, "sync_action", "reshape"); -@@ -1575,7 +1586,8 @@ static int child_same_size(int afd, stru - int degraded = 0; - - -- posix_memalign((void**)&buf, 4096, disks * chunk); -+ if (posix_memalign((void**)&buf, 4096, disks * chunk) != 0) -+ fail("unable to allocate alinged memory"); - - sysfs_set_num(sra, NULL, "suspend_lo", 0); - sysfs_set_num(sra, NULL, "suspend_hi", 0); ---- mdadm-3.1.1/restripe.c.warn 2010-02-08 01:26:18.000000000 -0500 -+++ mdadm-3.1.1/restripe.c 2010-02-17 14:58:43.615427833 -0500 -@@ -565,7 +565,10 @@ int restore_stripes(int *dest, unsigned - - int data_disks = raid_disks - (level == 0 ? 0 : level <= 5 ? 1 : 2); - -- posix_memalign((void**)&stripe_buf, 4096, raid_disks * chunk_size); -+ if (posix_memalign((void**)&stripe_buf, 4096, raid_disks * chunk_size) != 0) { -+ fprintf(stderr, "unable to allocate aligned memory\n"); -+ exit(1); -+ } - if (zero == NULL) { - zero = malloc(chunk_size); - if (zero) ---- mdadm-3.1.1/mdmon.c.warn 2010-02-08 01:26:18.000000000 -0500 -+++ mdadm-3.1.1/mdmon.c 2010-02-17 14:58:43.616427642 -0500 -@@ -176,7 +176,7 @@ static void try_kill_monitor(pid_t pid, - fl = fcntl(sock, F_GETFL, 0); - fl &= ~O_NONBLOCK; - fcntl(sock, F_SETFL, fl); -- read(sock, buf, 100); -+ n = read(sock, buf, 100); - } - - void remove_pidfile(char *devname) ---- mdadm-3.1.1/super-intel.c.warn 2010-02-17 14:59:16.757425375 -0500 -+++ mdadm-3.1.1/super-intel.c 2010-02-17 15:00:15.309803578 -0500 -@@ -698,7 +698,7 @@ static void print_imsm_dev(struct imsm_d - printf(" <-- %s", map_state_str[map->map_state]); - printf("\n Checkpoint : %u (%llu)", - __le32_to_cpu(dev->vol.curr_migr_unit), -- blocks_per_migr_unit(dev)); -+ (unsigned long long)blocks_per_migr_unit(dev)); - } - printf("\n"); - printf(" Dirty State : %s\n", dev->vol.dirty ? "dirty" : "clean"); diff --git a/mdadm-3.1.2-decremental-2.patch b/mdadm-3.1.2-decremental-2.patch new file mode 100644 index 0000000..2ab9f6b --- /dev/null +++ b/mdadm-3.1.2-decremental-2.patch @@ -0,0 +1,36 @@ +commit ddda49f6daf481471334f5675fbc1fa149d83ad6 +Author: Doug Ledford +Date: Tue Apr 6 12:17:25 2010 -0400 + + Minor bug fix to incremental remove support + + Signed-off-by: Doug Ledford + +diff --git a/Manage.c b/Manage.c +index 6539eda..b15586b 100644 +--- a/Manage.c ++++ b/Manage.c +@@ -386,6 +386,7 @@ int Manage_subdevs(char *devname, int fd, + + next = dv->next; + jnext = 0; ++ tfd = -1; + + if (strcmp(dv->devname, "failed")==0 || + strcmp(dv->devname, "faulty")==0) { +@@ -406,6 +407,7 @@ int Manage_subdevs(char *devname, int fd, + stb.st_rdev = makedev(disc.major, disc.minor); + next = dv; + jnext = j+1; ++ tfd = 0; + sprintf(dvname,"%d:%d", disc.major, disc.minor); + dnprintable = dvname; + break; +@@ -440,6 +442,7 @@ int Manage_subdevs(char *devname, int fd, + stb.st_rdev = makedev(disc.major, disc.minor); + next = dv; + jnext = j+1; ++ tfd = 0; + dnprintable = dvname; + break; + } diff --git a/mdadm-3.1.2-decremental.patch b/mdadm-3.1.2-decremental.patch new file mode 100644 index 0000000..5e2515f --- /dev/null +++ b/mdadm-3.1.2-decremental.patch @@ -0,0 +1,633 @@ +From 8c43c776715301ff020639801a8b1b4716fdf745 Mon Sep 17 00:00:00 2001 +From: Doug Ledford +Date: Mon, 5 Apr 2010 12:32:08 -0400 +Subject: [PATCH 6/6] Initial implementation of incremental remove support + +Signed-off-by: Doug Ledford +--- + Incremental.c | 36 ++++++++++++++++++ + Manage.c | 105 +++++++++++++++++++++++++++++++++++++-------------- + ReadMe.c | 21 +++++++--- + mdadm.8 | 23 ++++++++++- + mdadm.c | 13 ++++++ + mdadm.h | 8 ++++ + mdstat.c | 90 +++++++++++++++++++++++++++++++++++++++++++- + sysfs.c | 13 ++++-- + udev-md-raid.rules | 16 +++++--- + 9 files changed, 274 insertions(+), 51 deletions(-) + +diff --git a/Incremental.c b/Incremental.c +index 7ad648a..d32a8e5 100644 +--- a/Incremental.c ++++ b/Incremental.c +@@ -843,3 +843,39 @@ int Incremental_container(struct supertype *st, char *devname, int verbose, + map_unlock(&map); + return 0; + } ++ ++/* ++ * IncrementalRemove - Attempt to see if the passed in device belongs to any ++ * raid arrays, and if so first fail (if needed) and then remove the device. ++ * ++ * @devname - The device we want to remove ++ * ++ * Special note: We would like to just use Managedevs to fail/remove the ++ * device, but unfortunately, by the time we are called via udev, the device ++ * special file is already gone, and so we can't stat the device and se we ++ * don't have the right rdev value to use in the ioctls. So, we use the ++ * sysfs method of device removal instead, but since that's not gauranteed ++ * to work depending on the version of kernel we run on, try to use the ++ * ioctl method first and only fallback if we don't have a valid device ++ * special file. That way we can support operation manually on older kernels ++ * even if we won't be able to do this automatically via udev on older ++ * kernels. ++ */ ++int IncrementalRemove(char *devname, int verbose) ++{ ++ char mddev[100] = "/dev/"; ++ int mdfd; ++ struct mddev_dev_s devlist; ++ ++ strncpy(mddev + 5, devname, sizeof(mddev) - 5); ++ if (mdstat_check_active(mddev + 5)) ++ return 1; ++ if ((mdfd = open_mddev(mddev, 0)) < 0) ++ return 1; ++ memset(&devlist, 0, sizeof(devlist)); ++ devlist.devname = devname; ++ devlist.disposition = 'f'; ++ Manage_subdevs(mddev, mdfd, &devlist, verbose); ++ devlist.disposition = 'r'; ++ return Manage_subdevs(mddev, mdfd, &devlist, verbose); ++} +diff --git a/Manage.c b/Manage.c +index f848d8b..6539eda 100644 +--- a/Manage.c ++++ b/Manage.c +@@ -346,6 +346,9 @@ int Manage_subdevs(char *devname, int fd, + mdu_disk_info_t disc; + unsigned long long array_size; + mddev_dev_t dv, next = NULL; ++ struct mdinfo *mdi = NULL; ++ struct mdinfo *dev = NULL; ++ char sys_name[20] = "dev-"; + struct stat stb; + int j, jnext = 0; + int tfd; +@@ -443,16 +446,43 @@ int Manage_subdevs(char *devname, int fd, + if (jnext == 0) + continue; + } else { ++ /* ++ * For fail/remove operations, allow the disk ++ * to be completely missing, use name matching ++ * to a device in our sysfs entries to ++ * suffice. For add we need a valid block device. ++ * Leave this loop one of three ways: ++ * 1) tfd < 0 and dev is set to our device ++ * 2) tfd >= 0 and dev is NULL ++ * 3) failed to find suitable device and return ++ */ + j = 0; + + tfd = dev_open(dv->devname, O_RDONLY); +- if (tfd < 0 && dv->disposition == 'r' && +- lstat(dv->devname, &stb) == 0) +- /* Be happy, the lstat worked, that is +- * enough for --remove +- */ +- ; +- else { ++ if (tfd < 0 && dv->disposition != 'a') { ++ strcpy(&sys_name[4], ++ strrchr(dv->devname, '/') + 1); ++ mdi = sysfs_read(fd, 0, ++ GET_DEVS | KEEP_GONE_DEVS); ++ if (!mdi) { ++ fprintf(stderr, Name ": can't open %s " ++ "and can't read sysfs info\n", ++ dv->devname); ++ return 1; ++ } ++ for (dev = mdi->devs; dev; dev = dev->next) { ++ if (strcmp(sys_name, dev->sys_name)) ++ continue; ++ break; ++ } ++ if (!dev) { ++ fprintf(stderr, Name ": can't open %s " ++ "and %s not listed in sysfs\n", ++ dv->devname, sys_name); ++ sysfs_free(mdi); ++ return 1; ++ } ++ } else { + if (tfd < 0 || fstat(tfd, &stb) != 0) { + fprintf(stderr, Name ": cannot find %s: %s\n", + dv->devname, strerror(errno)); +@@ -461,12 +491,12 @@ int Manage_subdevs(char *devname, int fd, + return 1; + } + close(tfd); +- } +- if ((stb.st_mode & S_IFMT) != S_IFBLK) { +- fprintf(stderr, Name ": %s is not a " +- "block device.\n", +- dv->devname); +- return 1; ++ if ((stb.st_mode & S_IFMT) != S_IFBLK) { ++ fprintf(stderr, Name ": %s is not a " ++ "block device.\n", ++ dv->devname); ++ return 1; ++ } + } + } + switch(dv->disposition){ +@@ -790,26 +820,36 @@ int Manage_subdevs(char *devname, int fd, + return 1; + } + } +- /* FIXME check that it is a current member */ +- err = ioctl(fd, HOT_REMOVE_DISK, (unsigned long)stb.st_rdev); +- if (err && errno == ENODEV) { ++ /* stb.st_rdev is only valid if we have a tfd that ++ * does not indicate an error on attempt to open ++ * the devname ++ */ ++ if (tfd >= 0) ++ err = ioctl(fd, HOT_REMOVE_DISK, ++ (unsigned long)stb.st_rdev); ++ if (tfd < 0 || (err && errno == ENODEV)) { + /* Old kernels rejected this if no personality + * registered */ +- struct mdinfo *sra = sysfs_read(fd, 0, GET_DEVS); +- struct mdinfo *dv = NULL; +- if (sra) +- dv = sra->devs; +- for ( ; dv ; dv=dv->next) +- if (dv->disk.major == major(stb.st_rdev) && +- dv->disk.minor == minor(stb.st_rdev)) ++ if (!mdi) { ++ strcpy(&sys_name[4], ++ strrchr(dv->devname, '/') + 1); ++ mdi = sysfs_read(fd, 0, GET_DEVS | ++ KEEP_GONE_DEVS); ++ if (mdi) ++ dev = mdi->devs; ++ for ( ; dev ; dev=dev->next) { ++ if (strcmp(sys_name, dev->sys_name)) ++ continue; + break; +- if (dv) +- err = sysfs_set_str(sra, dv, ++ } ++ } ++ if (dev) ++ err = sysfs_set_str(mdi, dev, + "state", "remove"); + else + err = -1; +- if (sra) +- sysfs_free(sra); ++ if (mdi) ++ sysfs_free(mdi); + } + if (err) { + fprintf(stderr, Name ": hot remove failed " +@@ -844,11 +884,18 @@ int Manage_subdevs(char *devname, int fd, + + case 'f': /* set faulty */ + /* FIXME check current member */ +- if (ioctl(fd, SET_DISK_FAULTY, (unsigned long) stb.st_rdev)) { ++ if ((tfd >= 0 && ioctl(fd, SET_DISK_FAULTY, ++ (unsigned long) stb.st_rdev)) || ++ (tfd < 0 && sysfs_set_str(mdi, dev, "state", ++ "faulty"))) { + fprintf(stderr, Name ": set device faulty failed for %s: %s\n", + dnprintable, strerror(errno)); ++ if (mdi) ++ sysfs_free(mdi); + return 1; +- } ++ } ++ if (mdi) ++ sysfs_free(mdi); + if (verbose >= 0) + fprintf(stderr, Name ": set %s faulty in %s\n", + dnprintable, devname); +diff --git a/ReadMe.c b/ReadMe.c +index 9d5a211..fd216ec 100644 +--- a/ReadMe.c ++++ b/ReadMe.c +@@ -86,11 +86,12 @@ char Version[] = Name " - v3.1.2 - 10th March 2010\n"; + * At the time if writing, there is only minimal support. + */ + +-char short_options[]="-ABCDEFGIQhVXWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:"; ++char short_options[]= ++ "-ABCDEFGIQhVXWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:"; + char short_bitmap_options[]= +- "-ABCDEFGIQhVXWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:"; ++ "-ABCDEFGIQhVXWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:"; + char short_bitmap_auto_options[]= +- "-ABCDEFGIQhVXWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sa:rfRSow1tye:"; ++ "-ABCDEFGIQhVXWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sa:rfRSow1tye:"; + + struct option long_options[] = { + {"manage", 0, 0, '@'}, +@@ -213,7 +214,7 @@ char Help[] = + " mdadm --grow options device\n" + " resize/reshape an active array\n" + " mdadm --incremental device\n" +-" add a device to an array as appropriate\n" ++" add/remove a device to/from an array as appropriate\n" + " mdadm --monitor options...\n" + " Monitor one or more array for significant changes.\n" + " mdadm device options...\n" +@@ -535,20 +536,26 @@ char Help_grow[] = + ; + + char Help_incr[] = +-"Usage: mdadm --incremental [-Rqrs] device\n" ++"Usage: mdadm --incremental [-Rqrsf] device\n" + "\n" + "This usage allows for incremental assembly of md arrays. Devices can be\n" + "added one at a time as they are discovered. Once an array has all expected\n" + "devices, it will be started.\n" + "\n" +-"Options that are valid with incremental assembly (-I --incremental) more are:\n" +-" --run -R : run arrays as soon as a minimal number of devices are\n" ++"Optionally, the process can be reversed by using the fail option.\n" ++"When fail mode is invoked, mdadm will see if the device belongs to an array\n" ++"and then both fail (if needed) and remove the device from that array.\n" ++"\n" ++"Options that are valid with incremental assembly (-I --incremental) are:\n" ++" --run -R : Run arrays as soon as a minimal number of devices are\n" + " : present rather than waiting for all expected.\n" + " --quiet -q : Don't print any information messages, just errors.\n" + " --rebuild -r : Rebuild the 'map' file that mdadm uses for tracking\n" + " : partial arrays.\n" + " --scan -s : Use with -R to start any arrays that have the minimal\n" + " : required number of devices, but are not yet started.\n" ++" --fail -f : First fail (if needed) and then remove device from\n" ++" : any array that it is a member of.\n" + ; + + char Help_config[] = +diff --git a/mdadm.8 b/mdadm.8 +index 4edfc41..eaf9155 100644 +--- a/mdadm.8 ++++ b/mdadm.8 +@@ -135,7 +135,11 @@ This provides a convenient interface to a + .I hot-plug + system. As each device is detected, + .I mdadm +-has a chance to include it in some array as appropriate. ++has a chance to include it in some array as appropriate. Optionally, ++with the ++.I \-\-fail ++flag is passed in then we will remove the device from any active array ++instead of adding it. + + If a + .B CONTAINER +@@ -189,7 +193,7 @@ Change the size or shape of an active array. + + .TP + .BR \-I ", " \-\-incremental +-Add a single device into an appropriate array, and possibly start the array. ++Add/remove a single device to/from an appropriate array, and possibly start the array. + + .TP + .B \-\-auto-detect +@@ -1235,6 +1239,12 @@ in + .B mdadm.conf + as requiring an external bitmap, that bitmap will be attached first. + ++.TP ++.BR \-\-fail ", " \-f ++This allows the hot-plug system to remove devices that have fully disappeared ++from the kernel. It will first fail and then remove the device from any ++array it belongs to. ++ + .SH For Monitor mode: + .TP + .BR \-m ", " \-\-mail +@@ -2141,6 +2151,10 @@ Usage: + .I component-device + .HP 12 + Usage: ++.B mdadm \-\-incremental \-\-fail ++.I component-device ++.HP 12 ++Usage: + .B mdadm \-\-incremental \-\-rebuild + .HP 12 + Usage: +@@ -2153,6 +2167,11 @@ passed to + .B "mdadm \-\-incremental" + to be conditionally added to an appropriate array. + ++Conversely, it can also be used with the ++.B \-\-fail ++flag to do just the opposite and find whatever array a particular device ++is part of and remove the device from the array. ++ + If the device passed is a + .B CONTAINER + device created by a previous call to +diff --git a/mdadm.c b/mdadm.c +index d5e34c0..cd6fd8f 100644 +--- a/mdadm.c ++++ b/mdadm.c +@@ -124,6 +124,7 @@ int main(int argc, char *argv[]) + ident.name[0] = 0; + ident.container = NULL; + ident.member = NULL; ++ ident.member_index = -1; + + while ((option_index = -1) , + (opt=getopt_long(argc, argv, +@@ -774,6 +775,9 @@ int main(int argc, char *argv[]) + devmode = 'r'; + continue; + case O(MANAGE,'f'): /* set faulty */ ++ case O(INCREMENTAL,'f'): /* r for incremental is taken, use f ++ * even though we will both fail and ++ * remove the device */ + devmode = 'f'; + continue; + case O(INCREMENTAL,'R'): +@@ -1517,6 +1521,11 @@ int main(int argc, char *argv[]) + ": --incremental --scan meaningless without --run.\n"); + break; + } ++ if (devmode == 'f') { ++ fprintf(stderr, Name ++ ": --incremental --scan --fail not supported.\n"); ++ break; ++ } + rv = IncrementalScan(verbose); + } + if (!devlist) { +@@ -1533,6 +1542,10 @@ int main(int argc, char *argv[]) + rv = 1; + break; + } ++ if (devmode == 'f') { ++ rv = IncrementalRemove(devlist->devname, verbose-quiet); ++ break; ++ } + rv = Incremental(devlist->devname, verbose-quiet, runstop, + ss, homehost, require_homehost, autof); + break; +diff --git a/mdadm.h b/mdadm.h +index d8ab85f..c113d0f 100644 +--- a/mdadm.h ++++ b/mdadm.h +@@ -315,6 +315,7 @@ typedef struct mddev_ident_s { + * of some other entry. + */ + char *member; /* subarray within a container */ ++ int member_index; /* subarray index within a container */ + + struct mddev_ident_s *next; + union { +@@ -355,6 +356,10 @@ struct mdstat_ent { + int raid_disks; + int chunk_size; + char * metadata_version; ++ struct dev_member { ++ char *name; ++ struct dev_member *next; ++ } *members; + struct mdstat_ent *next; + }; + +@@ -363,6 +368,7 @@ extern void free_mdstat(struct mdstat_ent *ms); + extern void mdstat_wait(int seconds); + extern void mdstat_wait_fd(int fd, const sigset_t *sigmask); + extern int mddev_busy(int devnum); ++extern int mdstat_check_active(char *devname); + + struct map_ent { + struct map_ent *next; +@@ -404,6 +410,7 @@ enum sysfs_read_flags { + GET_STATE = (1 << 13), + GET_ERROR = (1 << 14), + SKIP_GONE_DEVS = (1 << 15), ++ KEEP_GONE_DEVS = (1 << 16), + }; + + /* If fd >= 0, get the array it is open on, +@@ -817,6 +824,7 @@ extern int Incremental_container(struct supertype *st, char *devname, + int trustworthy); + extern void RebuildMap(void); + extern int IncrementalScan(int verbose); ++extern int IncrementalRemove(char *devname, int verbose); + + extern int CreateBitmap(char *filename, int force, char uuid[16], + unsigned long chunksize, unsigned long daemon_sleep, +diff --git a/mdstat.c b/mdstat.c +index 4a9f370..81d2212 100644 +--- a/mdstat.c ++++ b/mdstat.c +@@ -83,6 +83,45 @@ + #include + #include + ++static void free_member_devnames(struct dev_member **m) ++{ ++ struct dev_member *t; ++ if (!*m) ++ return; ++ while(*m) { ++ t = *m; ++ *m = (*m)->next; ++ if (t->name) ++ free(t->name); ++ free(t); ++ } ++ *m = NULL; ++} ++ ++static struct dev_member *add_member_devname(struct dev_member **m, char *name) ++{ ++ struct dev_member *new; ++ char *t; ++ ++ if (!m || !name) ++ return NULL; ++ ++ new = malloc(sizeof(*new)); ++ if (!new) ++ return NULL; ++ if ((t = strchr(name, '[')) == NULL) ++ { ++ /* not a device */ ++ free(new); ++ return *m; ++ } ++ new->name = strndup(name, t - name); ++ new->next = *m; ++ *m = new; ++ ++ return new; ++} ++ + void free_mdstat(struct mdstat_ent *ms) + { + while (ms) { +@@ -91,6 +130,7 @@ void free_mdstat(struct mdstat_ent *ms) + if (ms->level) free(ms->level); + if (ms->pattern) free(ms->pattern); + if (ms->metadata_version) free(ms->metadata_version); ++ if (ms->members) free_member_devnames(&ms->members); + t = ms; + ms = ms->next; + free(t); +@@ -159,6 +199,7 @@ struct mdstat_ent *mdstat_read(int hold, int start) + ent->raid_disks = 0; + ent->chunk_size = 0; + ent->devcnt = 0; ++ ent->members = NULL; + + ent->dev = strdup(line); + ent->devnum = devnum; +@@ -170,15 +211,23 @@ struct mdstat_ent *mdstat_read(int hold, int start) + ent->active = 1; + else if (strcmp(w, "inactive")==0) + ent->active = 0; +- else if (ent->active >=0 && ++ else if (ent->active > 0 && + ent->level == NULL && + w[0] != '(' /*readonly*/) { + ent->level = strdup(w); + in_devs = 1; + } else if (in_devs && strcmp(w, "blocks")==0) + in_devs = 0; +- else if (in_devs) { ++ else if (in_devs || (ent->active == 0 && w[0] != '(' && ++ w[l - 1] == ')')) { ++ if (isdigit(w[0])) ++ continue; ++ in_devs = 1; + ent->devcnt++; ++ if (!add_member_devname(&ent->members, w)) { ++ free_mdstat(ent); ++ break; ++ } + if (strncmp(w, "md", 2)==0) { + /* This has an md device as a component. + * If that device is already in the +@@ -310,3 +359,40 @@ int mddev_busy(int devnum) + free_mdstat(mdstat); + return me != NULL; + } ++ ++/* ++ * Finds name of the active array holding this device ++ * @param[in] devname name of member device ++ * @param[out] devname name of array ++ * ++ * @return found (0), or ++ * not found, failure (1) ++ */ ++ ++int mdstat_check_active(char *devname) ++{ ++ struct mdstat_ent *mdstat = mdstat_read(0, 0); ++ struct mdstat_ent *ent; ++ char *name; ++ ++ if (!devname) ++ return 1; ++ name = strrchr(devname, '/'); ++ if (name++ == NULL) ++ return 1; ++ ++ for (ent = mdstat; ent; ent = ent->next) { ++ struct dev_member *m; ++ if (ent->active && (strstr(ent->metadata_version,"imsm") || ++ strstr(ent->metadata_version,"ddf"))) ++ /* only return container matches, not subarrays */ ++ continue; ++ for (m = ent->members; m; m = m->next) { ++ if (!strcmp(m->name, name)) { ++ strcpy(devname, ent->dev); ++ return 0; ++ } ++ } ++ } ++ return 1; ++} +diff --git a/sysfs.c b/sysfs.c +index ebf9d8a..65dd848 100644 +--- a/sysfs.c ++++ b/sysfs.c +@@ -273,13 +273,16 @@ struct mdinfo *sysfs_read(int fd, int devnum, unsigned long options) + + strcpy(dbase, "block/dev"); + if (load_sys(fname, buf)) { +- free(dev); +- if (options & SKIP_GONE_DEVS) ++ if (options & SKIP_GONE_DEVS) { ++ free(dev); + continue; +- else ++ } else if (options & KEEP_GONE_DEVS) { ++ dev->disk.major = dev->disk.minor = -1; ++ } else + goto abort; +- } +- sscanf(buf, "%d:%d", &dev->disk.major, &dev->disk.minor); ++ } else ++ sscanf(buf, "%d:%d", &dev->disk.major, ++ &dev->disk.minor); + + /* special case check for block devices that can go 'offline' */ + if (options & SKIP_GONE_DEVS) { +diff --git a/udev-md-raid.rules b/udev-md-raid.rules +index c9a4f0e..aff14fa 100644 +--- a/udev-md-raid.rules ++++ b/udev-md-raid.rules +@@ -1,17 +1,16 @@ + # do not edit this file, it will be overwritten on update + + SUBSYSTEM!="block", GOTO="md_end" +-ACTION!="add|change", GOTO="md_end" ++ACTION!="add|change|remove", GOTO="md_end" ++ACTION=="remove", GOTO="md_remove" + ACTION=="change", GOTO="md_no_incr" + +-# import data from a raid member and activate it +-#ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}" +-# import data from a raid set ++# we are adding a raid member, activate it ++ENV{ID_FS_TYPE}=="linux_raid_member", RUN+="/sbin/mdadm -I $env{DEVNAME}" + LABEL="md_no_incr" + KERNEL!="md*", GOTO="md_end" + +-# partitions have no md/{array_state,metadata_version}, but should not +-# for that reason be ignored. ++# partitions have no md/{array_state,metadata_version} + ENV{DEVTYPE}=="partition", GOTO="md_ignore_state" + + # container devices have a metadata version of e.g. 'external:ddf' and +@@ -32,7 +31,12 @@ ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNA + + IMPORT{program}="/sbin/blkid -o udev -p $tempnode" + OPTIONS+="link_priority=100" ++OPTIONS+="watch" + ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" + ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" ++GOTO="md_end" ++ ++LABEL="md_remove" ++ENV{ID_FS_TYPE}=="linux_raid_member", RUN+="/sbin/mdadm -If $env{DEVNAME}" + + LABEL="md_end" +-- +1.6.6.1 + diff --git a/mdadm-3.1.2-directory.patch b/mdadm-3.1.2-directory.patch new file mode 100644 index 0000000..61132a4 --- /dev/null +++ b/mdadm-3.1.2-directory.patch @@ -0,0 +1,265 @@ +From df3e08eaa7ee07528968bb7152dfaaeebd3c97cb Mon Sep 17 00:00:00 2001 +From: Doug Ledford +Date: Fri, 2 Apr 2010 10:53:47 -0400 +Subject: [PATCH 5/6] Fix all the confusion over directories once and for all. We now have + 3 directory definitions: mdmon directory for its pid and sock files, + mdmonitor directory which is for the mdadm monitor mode pid file and + can only be passed in via command line, and the directory for the + mdadm map file. Only the mdadm map file still hunts multiple locations, + and the number of locations has been reduced to /var/run and the + compile time specified location. I could see lowering that to just + 1 location, but I didn't do that with this patch. + +Signed-off-by: Doug Ledford +--- + Makefile | 18 +++++++++--------- + mapfile.c | 18 ++++++++---------- + mdadm.h | 41 +++++++++++++++++++++-------------------- + mdmon.c | 28 ++++++---------------------- + msg.c | 2 +- + util.c | 4 +--- + 6 files changed, 46 insertions(+), 65 deletions(-) + +diff --git a/Makefile b/Makefile +index 2aafad0..30e52a7 100644 +--- a/Makefile ++++ b/Makefile +@@ -58,16 +58,16 @@ CONFFILE = $(SYSCONFDIR)/mdadm.conf + CONFFILE2 = $(SYSCONFDIR)/mdadm/mdadm.conf + MAILCMD =/usr/sbin/sendmail -t + CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\" +-# ALT_RUN should be somewhere that persists across the pivotroot +-# from early boot to late boot. ++# Both MAP_DIR and MDMON_DIR should be somewhere that persists across the ++# pivotroot from early boot to late boot. + # If you don't have /lib/init/rw you might want to use /dev/.something +-# e.g. make ALT_RUN=/dev/.mdadm +-ALT_RUN = /lib/init/rw +-ALT_MAPFILE = map +-VAR_RUN = /var/run +-ALTFLAGS = -DALT_RUN=\"$(ALT_RUN)\" -DALT_MAPFILE=\"$(ALT_MAPFILE)\" +-VARFLAGS = -DVAR_RUN=\"$(VAR_RUN)\" +-CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(ALTFLAGS) $(VARFLAGS) ++# e.g. make MAP_DIR=/dev/.mdadm ++MAP_DIR = /lib/init/rw/mdadm ++MAP_FILE = map ++MDMON_DIR = /lib/init/rw/mdmon ++DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\" ++DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\" ++CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS) + + # If you want a static binary, you might uncomment these + # LDFLAGS = -static +diff --git a/mapfile.c b/mapfile.c +index d47fde1..f4339db 100644 +--- a/mapfile.c ++++ b/mapfile.c +@@ -52,28 +52,26 @@ + #include + + #define mapnames(base) { base, base ".new", base ".lock"} +-char *mapname[3][3] = { +- mapnames(VAR_RUN "/map"), +- mapnames("/var/run/mdadm.map"), +- mapnames(ALT_RUN "/" ALT_MAPFILE) ++char *mapname[2][3] = { ++ mapnames(MAP_DIR "/" MAP_FILE), ++ mapnames("/var/run/mdadm.map") + }; +-char *mapdir[3] = { VAR_RUN, NULL, ALT_RUN }; ++char *mapdir[2] = { MAP_DIR, NULL }; + +-int mapmode[3] = { O_RDONLY, O_RDWR|O_CREAT, O_RDWR|O_CREAT | O_TRUNC }; ++int mapmode[3] = { O_RDONLY, O_RDWR|O_CREAT, O_RDWR|O_CREAT|O_TRUNC }; + char *mapsmode[3] = { "r", "w", "w"}; + + FILE *open_map(int modenum, int *choice) + { + int i; + +- for (i = 0 ; i < 3 ; i++) { ++ for (i = 0 ; i < 2 ; i++) { + int fd; +- if ((mapmode[modenum] & O_CREAT) && +- mapdir[modenum]) ++ if ((mapmode[modenum] & O_CREAT) && mapdir[i]) + /* Attempt to create directory, don't worry about + * failure. + */ +- mkdir(mapdir[modenum], 0755); ++ mkdir(mapdir[i], 0755); + fd = open(mapname[i][modenum], mapmode[modenum], 0600); + if (fd >= 0) { + *choice = i; +diff --git a/mdadm.h b/mdadm.h +index 0386129..d8ab85f 100644 +--- a/mdadm.h ++++ b/mdadm.h +@@ -68,28 +68,30 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); + #define DEFAULT_BITMAP_DELAY 5 + #define DEFAULT_MAX_WRITE_BEHIND 256 + +-/* VAR_RUN is where pid and socket files used for communicating +- * with mdmon normally live. It should be /var/run, but if +- * it is too hard to remount /var/run as read-only rather than +- * unmounting it at shutdown time, then it should be +- * redefined to some place that comfortably persists until +- * final shutdown, possibly in /dev if that is a tmpfs. +- * Note: VAR_RUN does not need to be writable at shutdown, +- * only during boot when "mdmon --takeover" is run. +- */ +-#ifndef VAR_RUN +-#define VAR_RUN "/var/run/mdadm" +-#endif /* VAR_RUN */ +-/* ALT_RUN should be somewhere that persists across the pivotroot ++/* MAP_DIR should be somewhere that persists across the pivotroot + * from early boot to late boot. + * If you don't have /lib/init/rw you might want to use /dev/.something + */ +-#ifndef ALT_RUN +-#define ALT_RUN "/lib/init/rw/mdadm" +-#endif /* ALT_RUN */ +-#ifndef ALT_MAPFILE +-#define ALT_MAPFILE "map" +-#endif /* ALT_MAPFILE */ ++#ifndef MAP_DIR ++#define MAP_DIR "/lib/init/rw/mdadm" ++#endif /* MAP_DIR */ ++/* MAP_FILE is what we name the map file we put in MAP_DIR, in case you ++ * want something other than the default of "map" ++ */ ++#ifndef MAP_FILE ++#define MAP_FILE "map" ++#endif /* MAP_FILE */ ++/* MDMON_DIR is where pid and socket files used for communicating ++ * with mdmon normally live. It *should* be /var/run, but when ++ * mdmon is needed at early boot then it needs to write there prior ++ * to /var/run being mounted read/write, and it also then needs to ++ * persist beyond when /var/run is mounter read-only. So, to be ++ * safe, the default is somewhere that is read/write early in the ++ * boot process and stays up as long as possible during shutdown. ++ */ ++#ifndef MDMON_DIR ++#define MDMON_DIR "/lib/init/rw/mdmon" ++#endif /* MDMON_DIR */ + + #include "md_u.h" + #include "md_p.h" +@@ -910,7 +912,6 @@ extern int create_mddev(char *dev, char *name, int autof, int trustworthy, + extern int open_mddev(char *dev, int report_errors); + extern int open_container(int fd); + +-extern char *pid_dir; + extern int mdmon_running(int devnum); + extern int mdmon_pid(int devnum); + extern int check_env(char *name); +diff --git a/mdmon.c b/mdmon.c +index 69c320e..cbb72cc 100644 +--- a/mdmon.c ++++ b/mdmon.c +@@ -120,10 +120,10 @@ static int make_pidfile(char *devname) + int fd; + int n; + +- if (mkdir(pid_dir, 0700) < 0 && ++ if (mkdir(MDMON_DIR, 0755) < 0 && + errno != EEXIST) + return -errno; +- sprintf(path, "%s/%s.pid", pid_dir, devname); ++ sprintf(path, "%s/%s.pid", MDMON_DIR, devname); + + fd = open(path, O_RDWR|O_CREAT|O_EXCL, 0600); + if (fd < 0) +@@ -189,13 +189,10 @@ void remove_pidfile(char *devname) + { + char buf[100]; + +- sprintf(buf, "%s/%s.pid", pid_dir, devname); ++ sprintf(buf, "%s/%s.pid", MDMON_DIR, devname); + unlink(buf); +- sprintf(buf, "%s/%s.sock", pid_dir, devname); ++ sprintf(buf, "%s/%s.sock", MDMON_DIR, devname); + unlink(buf); +- if (strcmp(pid_dir, ALT_RUN) == 0) +- /* try to clean up when we are finished with this dir */ +- rmdir(pid_dir); + } + + static int make_control_sock(char *devname) +@@ -208,7 +205,7 @@ static int make_control_sock(char *devname) + if (sigterm) + return -1; + +- sprintf(path, "%s/%s.sock", pid_dir, devname); ++ sprintf(path, "%s/%s.sock", MDMON_DIR, devname); + unlink(path); + sfd = socket(PF_LOCAL, SOCK_STREAM, 0); + if (sfd < 0) +@@ -445,12 +442,7 @@ static int mdmon(char *devname, int devnum, int must_fork, int takeover) + act.sa_handler = SIG_IGN; + sigaction(SIGPIPE, &act, NULL); + +- pid_dir = VAR_RUN; + victim = mdmon_pid(container->devnum); +- if (victim < 0) { +- pid_dir = ALT_RUN; +- victim = mdmon_pid(container->devnum); +- } + if (victim >= 0) + victim_sock = connect_monitor(container->devname); + +@@ -474,16 +466,8 @@ static int mdmon(char *devname, int devnum, int must_fork, int takeover) + */ + if (victim > 0) + remove_pidfile(devname); +- pid_dir = VAR_RUN; + if (make_pidfile(devname) < 0) { +- /* Try the alternate */ +- pid_dir = ALT_RUN; +- if (make_pidfile(devname) < 0) { +- fprintf(stderr, "mdmon: Neither %s nor %s are writable\n" +- " cannot create .pid or .sock files. Aborting\n", +- VAR_RUN, ALT_RUN); +- exit(3); +- } ++ exit(3); + } + container->sock = make_control_sock(devname); + +diff --git a/msg.c b/msg.c +index d2d8445..aabfa8f 100644 +--- a/msg.c ++++ b/msg.c +@@ -147,7 +147,7 @@ int connect_monitor(char *devname) + int pos; + char *c; + +- pos = sprintf(path, "%s/", pid_dir); ++ pos = sprintf(path, "%s/", MDMON_DIR); + if (is_subarray(devname)) { + devname++; + c = strchr(devname, '/'); +diff --git a/util.c b/util.c +index 79d2b0f..bdb19f9 100644 +--- a/util.c ++++ b/util.c +@@ -1499,15 +1499,13 @@ int fd2devnum(int fd) + return NoMdDev; + } + +-char *pid_dir = VAR_RUN; +- + int mdmon_pid(int devnum) + { + char path[100]; + char pid[10]; + int fd; + int n; +- sprintf(path, "%s/%s.pid", pid_dir, devnum2devname(devnum)); ++ sprintf(path, "%s/%s.pid", MDMON_DIR, devnum2devname(devnum)); + fd = open(path, O_RDONLY | O_NOATIME, 0); + + if (fd < 0) +-- +1.6.6.1 + diff --git a/mdadm-3.1.2-mapfile.patch b/mdadm-3.1.2-mapfile.patch new file mode 100644 index 0000000..5523c0d --- /dev/null +++ b/mdadm-3.1.2-mapfile.patch @@ -0,0 +1,80 @@ +From 435b90e7d41a17f35a984112cace471c975906f4 Mon Sep 17 00:00:00 2001 +From: Doug Ledford +Date: Tue, 16 Mar 2010 23:00:11 -0400 +Subject: [PATCH 2/6] Create directory to contain mapfile (Assuming parent exists and + filesystem is writable). + This particularly keeps udev happy if VAR_RUN is set to /dev/md. + +Signed-off-by: Doug Ledford +Signed-off-by: NeilBrown +--- + mapfile.c | 17 +++++++++++++---- + mdmon.c | 2 +- + 2 files changed, 14 insertions(+), 5 deletions(-) + +diff --git a/mapfile.c b/mapfile.c +index 366ebe3..89187ac 100644 +--- a/mapfile.c ++++ b/mapfile.c +@@ -29,7 +29,7 @@ + */ + + /* /var/run/mdadm.map is used to track arrays being created in --incremental +- * more. It particularly allows lookup from UUID to array device, but ++ * mode. It particularly allows lookup from UUID to array device, but + * also allows the array device name to be easily found. + * + * The map file is line based with space separated fields. The fields are: +@@ -42,8 +42,8 @@ + * However /var/run may not exist or be writable in early boot. And if + * no-one has created /var/run/mdadm, we still want to survive. + * So possible locations are: +- * /var/run/mdadm/map /var/run/mdadm.map /dev/.mdadm.map +- * the last, because udev requires a writable /dev very early. ++ * /var/run/mdadm/map /var/run/mdadm.map /lib/initrw/madam/map ++ * The last can easily be change at compile to e.g. somewhere in /dev. + * We read from the first one that exists and write to the first + * one that we can. + */ +@@ -57,6 +57,7 @@ char *mapname[3][3] = { + mapnames("/var/run/mdadm.map"), + mapnames(ALT_RUN "/map") + }; ++char *mapdir[3] = { VAR_RUN, NULL, ALT_RUN }; + + int mapmode[3] = { O_RDONLY, O_RDWR|O_CREAT, O_RDWR|O_CREAT | O_TRUNC }; + char *mapsmode[3] = { "r", "w", "w"}; +@@ -64,8 +65,16 @@ char *mapsmode[3] = { "r", "w", "w"}; + FILE *open_map(int modenum, int *choice) + { + int i; ++ + for (i = 0 ; i < 3 ; i++) { +- int fd = open(mapname[i][modenum], mapmode[modenum], 0600); ++ int fd; ++ if ((mapmode[modenum] & O_CREAT) && ++ mapdir[modenum]) ++ /* Attempt to create directory, don't worry about ++ * failure. ++ */ ++ mkdir(mapdir[modenum], 0755); ++ fd = open(mapname[i][modenum], mapmode[modenum], 0600); + if (fd >= 0) { + *choice = i; + return fdopen(fd, mapsmode[modenum]); +diff --git a/mdmon.c b/mdmon.c +index 961aa77..69c320e 100644 +--- a/mdmon.c ++++ b/mdmon.c +@@ -120,7 +120,7 @@ static int make_pidfile(char *devname) + int fd; + int n; + +- if (mkdir(pid_dir, 0600) < 0 && ++ if (mkdir(pid_dir, 0700) < 0 && + errno != EEXIST) + return -errno; + sprintf(path, "%s/%s.pid", pid_dir, devname); +-- +1.6.6.1 + diff --git a/mdadm-3.1.2-mapname.patch b/mdadm-3.1.2-mapname.patch new file mode 100644 index 0000000..a8f88f5 --- /dev/null +++ b/mdadm-3.1.2-mapname.patch @@ -0,0 +1,58 @@ +From e259df4e63f553c1271fa7d7612c110d2518e572 Mon Sep 17 00:00:00 2001 +From: Doug Ledford +Date: Wed, 17 Mar 2010 10:52:22 -0400 +Subject: [PATCH 3/6] mapfile: if we putting the mapfile in a custom location via ALT_RUN, allow + a custom filename too. + +Signed-off-by: Doug Ledford +--- + Makefile | 3 ++- + mapfile.c | 2 +- + mdadm.h | 3 +++ + 3 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 1035ea8..2aafad0 100644 +--- a/Makefile ++++ b/Makefile +@@ -63,8 +63,9 @@ CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\" + # If you don't have /lib/init/rw you might want to use /dev/.something + # e.g. make ALT_RUN=/dev/.mdadm + ALT_RUN = /lib/init/rw ++ALT_MAPFILE = map + VAR_RUN = /var/run +-ALTFLAGS = -DALT_RUN=\"$(ALT_RUN)\" ++ALTFLAGS = -DALT_RUN=\"$(ALT_RUN)\" -DALT_MAPFILE=\"$(ALT_MAPFILE)\" + VARFLAGS = -DVAR_RUN=\"$(VAR_RUN)\" + CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(ALTFLAGS) $(VARFLAGS) + +diff --git a/mapfile.c b/mapfile.c +index 89187ac..74f7256 100644 +--- a/mapfile.c ++++ b/mapfile.c +@@ -55,7 +55,7 @@ + char *mapname[3][3] = { + mapnames(VAR_RUN "/map"), + mapnames("/var/run/mdadm.map"), +- mapnames(ALT_RUN "/map") ++ mapnames(ALT_RUN "/" ALT_MAPFILE) + }; + char *mapdir[3] = { VAR_RUN, NULL, ALT_RUN }; + +diff --git a/mdadm.h b/mdadm.h +index 362b66b..0386129 100644 +--- a/mdadm.h ++++ b/mdadm.h +@@ -87,6 +87,9 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); + #ifndef ALT_RUN + #define ALT_RUN "/lib/init/rw/mdadm" + #endif /* ALT_RUN */ ++#ifndef ALT_MAPFILE ++#define ALT_MAPFILE "map" ++#endif /* ALT_MAPFILE */ + + #include "md_u.h" + #include "md_p.h" +-- +1.6.6.1 + diff --git a/mdadm-3.1.2-rebuild.patch b/mdadm-3.1.2-rebuild.patch new file mode 100644 index 0000000..a9be5c3 --- /dev/null +++ b/mdadm-3.1.2-rebuild.patch @@ -0,0 +1,38 @@ +From 7bf59f5c16d928d3826fdf0c406d1aac5775e78b Mon Sep 17 00:00:00 2001 +From: Doug Ledford +Date: Wed, 17 Mar 2010 09:28:07 -0400 +Subject: [PATCH 4/6] Only signal a udev change event if we actually write a mapfile in RebuildMap + +Signed-off-by: Doug Ledford +--- + mapfile.c | 14 ++++++++------ + 1 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/mapfile.c b/mapfile.c +index 74f7256..d47fde1 100644 +--- a/mapfile.c ++++ b/mapfile.c +@@ -471,12 +471,14 @@ void RebuildMap(void) + } + sysfs_free(sra); + } +- map_write(map); ++ /* Only trigger a change if we wrote a new map file */ ++ if (map_write(map)) ++ for (md = mdstat ; md ; md = md->next) { ++ struct mdinfo *sra = sysfs_read(-1, md->devnum, ++ GET_VERSION); ++ sysfs_uevent(sra, "change"); ++ sysfs_free(sra); ++ } + map_free(map); +- for (md = mdstat ; md ; md = md->next) { +- struct mdinfo *sra = sysfs_read(-1, md->devnum, GET_VERSION); +- sysfs_uevent(sra, "change"); +- sysfs_free(sra); +- } + free_mdstat(mdstat); + } +-- +1.6.6.1 + diff --git a/mdadm.rules b/mdadm.rules index 39fd0cd..df3d906 100644 --- a/mdadm.rules +++ b/mdadm.rules @@ -3,6 +3,7 @@ # See udev(8) for syntax SUBSYSTEM=="block", ACTION=="add", ENV{ID_FS_TYPE}=="linux_raid_member", \ - IMPORT{program}="/sbin/mdadm --examine --export $tempnode", \ - RUN+="/bin/bash -c '[ ! -f /dev/.in_sysinit ] && mdadm -I $env{DEVNAME}'" + RUN+="/sbin/mdadm -I $env{DEVNAME}" +SUBSYSTEM=="block", ACTION=="remove", ENV{ID_FS_TYPE}=="linux_raid_member", \ + RUN+="/sbin/mdadm -If $env{DEVNAME}" diff --git a/mdadm.spec b/mdadm.spec index 82e265a..66f9412 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,16 +1,20 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm -Version: 3.1.1 -Release: 0.gcd9a8b5.6%{?dist} -Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-gcd9a8b5.tar.bz2 +Version: 3.1.2 +Release: 3%{?dist} +Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2 Source1: mdmonitor.init Source2: raid-check Source3: mdadm.rules Source4: mdadm-raid-check-sysconfig -Patch1: mdadm-2.5.2-static.patch -Patch2: mdadm-3.1.1-warn.patch -Patch3: mdadm-3.1.1-endian.patch -Patch4: mdadm-3.1.1-imsm.patch +Patch1: mdadm-3.1.2-mapname.patch +Patch2: mdadm-3.1.1-endian.patch +Patch3: mdadm-3.1.2-mapfile.patch +Patch4: mdadm-3.1.2-rebuild.patch +Patch5: mdadm-3.1.2-directory.patch +Patch6: mdadm-3.1.2-decremental.patch +Patch7: mdadm-3.1.2-decremental-2.patch +Patch9: mdadm-2.5.2-static.patch URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ License: GPLv2+ Group: System Environment/Base @@ -31,10 +35,14 @@ file can be used to help with some common tasks. %prep %setup -q -%patch1 -p1 -b .static -%patch2 -p1 -b .warn -%patch3 -p1 -b .endian -%patch4 -p1 -b .imsm +%patch3 -p1 -b .mapfile +%patch1 -p1 -b .mapname +%patch2 -p1 -b .endian +%patch4 -p1 -b .rebuild +%patch5 -p1 -b .directory +%patch6 -p1 -b .decremental +%patch7 -p1 -b .decremental-2 +%patch9 -p1 -b .static %build make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon @@ -81,6 +89,20 @@ fi %attr(0700,root,root) %dir /var/run/mdadm %changelog +* Tue Apr 06 2010 Doug Ledford - 3.1.2-3 +- Clean up directory mess once and for all +- Add incremental remove support + +* Wed Mar 17 2010 Doug Ledford - 3.1.2-2 +- Add a little more paranoia checking to the RebuildMap code to avoid ever + having the same infinite loop as in bz569019 again even if we change file + locations to somewhere where we can't create a mapfile + +* Tue Mar 16 2010 Doug Ledford - 3.1.2-1 +- Grab latest upstream release instead of git repo snapshot (bz552344, bz572561) +- The lack of /dev/md is causing problems, so add code to mapfile.c to cause + us to create /dev/md if it doesn't exist (bz569019) + * Tue Feb 23 2010 Doug Ledford - 3.1.1-0.gcd9a8b5.6 - Newer version of imsm patch that leaves warning, but only when there actually are too many devices on the command line (bz554974) diff --git a/sources b/sources index 622391f..bab8ed6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd4bcda48d6dc3d6113b5c25950c9671 mdadm-3.1.1-gcd9a8b5.tar.bz2 +c5a39f38c465229767a5af2a4eb81bef mdadm-3.1.2.tar.bz2 From a2b3d7f053dca3c2c712cc531fa10afd39184917 Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Thu, 8 Apr 2010 17:09:28 +0000 Subject: [PATCH 08/16] - Fix up directory in mdmonitor init script so that we restart mdmon like we are supposed to - Add a rule to run incremental assembly on containers in case there are multiple volumes in a container and we only started some of them in the initramfs - Make -If work with imsm arrays. We had too restrictive of a test in sysfs_unique_holder. - Make incremental assembly of containers act like incremental assembly of regular devices (aka, --run is needed to start a degraded array) --- mdadm-3.1.2-container.patch | 95 +++++++++++++++++++++++++++++++ mdadm-3.1.2-decremental-3.patch | 35 ++++++++++++ mdadm-3.1.2-powerpc-compile.patch | 21 +++++++ mdadm.rules | 19 ++++++- mdadm.spec | 32 ++++++++++- mdmonitor.init | 13 +++-- 6 files changed, 206 insertions(+), 9 deletions(-) create mode 100644 mdadm-3.1.2-container.patch create mode 100644 mdadm-3.1.2-decremental-3.patch create mode 100644 mdadm-3.1.2-powerpc-compile.patch diff --git a/mdadm-3.1.2-container.patch b/mdadm-3.1.2-container.patch new file mode 100644 index 0000000..926e265 --- /dev/null +++ b/mdadm-3.1.2-container.patch @@ -0,0 +1,95 @@ +commit 3f45610e6b9e2419f09f7f1b415170b6128d91ad +Author: Doug Ledford +Date: Thu Apr 8 12:39:03 2010 -0400 + + Make Incremental container assembly behave like native array assembly + + Signed-off-by: Doug Ledford :4000 + +diff --git a/Assemble.c b/Assemble.c +index 1504f1f..d059155 100644 +--- a/Assemble.c ++++ b/Assemble.c +@@ -1327,8 +1327,10 @@ int assemble_container_content(struct supertype *st, int mdfd, + content->text_version, + content->uuid, chosen_name); + +- if (runstop > 0 || +- (working + preexist) >= content->array.working_disks) { ++ if ((runstop > 0 && ++ (working + preexist) >= content->array.working_disks) || ++ (runstop == 0 && ++ (working + preexist) == content->array.raid_disks)) { + int err; + + switch(content->array.level) { +diff --git a/Incremental.c b/Incremental.c +index d32a8e5..2a2df82 100644 +--- a/Incremental.c ++++ b/Incremental.c +@@ -424,20 +424,21 @@ int Incremental(char *devname, int verbose, int runstop, + sysfs_uevent(&info, "change"); + if (verbose >= 0) + fprintf(stderr, Name +- ": container %s now has %d devices\n", +- chosen_name, info.array.working_disks); ++ ": container %s now has %d out of %d devices\n", ++ chosen_name, info.array.working_disks, ++ info.array.raid_disks); + wait_for(chosen_name, mdfd); + close(mdfd); +- if (runstop < 0) +- return 0; /* don't try to assemble */ +- rv = Incremental(chosen_name, verbose, runstop, +- NULL, homehost, require_homehost, autof); +- if (rv == 1) +- /* Don't fail the whole -I if a subarray didn't +- * have enough devices to start yet ++ if (runstop == 1 || ++ info.array.working_disks == info.array.raid_disks) ++ /* The return value of our container assembly doesn't ++ * depend on whether or not subarrays assembled ++ * properly, so no need to preserve the return value ++ * here. + */ +- rv = 0; +- return rv; ++ Incremental(chosen_name, verbose, runstop, NULL, ++ homehost, require_homehost, autof); ++ return 0; + } + avail = NULL; + active_disks = count_active(st, mdfd, &avail, &info); +diff --git a/super-intel.c b/super-intel.c +index 999b970..7bcfcdb 100644 +--- a/super-intel.c ++++ b/super-intel.c +@@ -1536,12 +1536,27 @@ static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info) + if (super->current_vol >= 0) { + getinfo_super_imsm_volume(st, info); + return; ++ } else { ++ struct mdinfo vol_info; ++ ++ super->current_vol = 0; ++ getinfo_super_imsm_volume(st, &vol_info); ++ super->current_vol = -1; ++ info->array.raid_disks = vol_info.array.raid_disks; + } + + /* Set raid_disks to zero so that Assemble will always pull in valid + * spares +- */ ++ * ++ * Note: my testing with assemble shows that it still works even ++ * when we set the raid_disks to a proper setting. However, without ++ * this it is impossible to tell when a container has the right ++ * number of disks to start cleanly without violating layering ++ * boundaries. So, not violating layering boundaries trumps spare ++ * disk issues. Doug Ledford ++ * + info->array.raid_disks = 0; ++ */ + info->array.level = LEVEL_CONTAINER; + info->array.layout = 0; + info->array.md_minor = -1; diff --git a/mdadm-3.1.2-decremental-3.patch b/mdadm-3.1.2-decremental-3.patch new file mode 100644 index 0000000..0716d63 --- /dev/null +++ b/mdadm-3.1.2-decremental-3.patch @@ -0,0 +1,35 @@ +commit 1934c67fe5bc25a79393ad78e29bf9ef778bc701 +Author: Doug Ledford +Date: Tue Apr 6 23:02:47 2010 -0400 + + Only close lfd if we have an external metadata type since that's the only + time we'll have it open. + + If we weren't able to open the device file, assume the device is gone + already and skip the sysfs_unique_holder test as it is guaranteed to + fail. + + Signed-off-by: Doug Ledford + +diff --git a/Manage.c b/Manage.c +index b15586b..a690cfc 100644 +--- a/Manage.c ++++ b/Manage.c +@@ -811,6 +811,7 @@ int Manage_subdevs(char *devname, int fd, + * rely on the 'detached' checks + */ + if (strcmp(dv->devname, "detached") == 0 || ++ tfd < 0 || + sysfs_unique_holder(dnum, stb.st_rdev)) + /* pass */; + else { +@@ -878,8 +879,8 @@ int Manage_subdevs(char *devname, int fd, + + ping_manager(name); + free(name); ++ close(lfd); + } +- close(lfd); + if (verbose >= 0) + fprintf(stderr, Name ": hot removed %s\n", + dnprintable); diff --git a/mdadm-3.1.2-powerpc-compile.patch b/mdadm-3.1.2-powerpc-compile.patch new file mode 100644 index 0000000..3dec0d1 --- /dev/null +++ b/mdadm-3.1.2-powerpc-compile.patch @@ -0,0 +1,21 @@ +commit 995511f26e8d661d32d1c3fc42a08960989d1e6d +Author: Doug Ledford +Date: Tue Apr 6 14:04:30 2010 -0400 + + powerpc compile fix + + Signed-off-by: Doug Ledford + +diff --git a/super-intel.c b/super-intel.c +index a196ca3..999b970 100644 +--- a/super-intel.c ++++ b/super-intel.c +@@ -697,7 +697,7 @@ static void print_imsm_dev(struct imsm_dev *dev, char *uuid, int disk_idx) + printf(" <-- %s", map_state_str[map->map_state]); + printf("\n Checkpoint : %u (%llu)", + __le32_to_cpu(dev->vol.curr_migr_unit), +- blocks_per_migr_unit(dev)); ++ (unsigned long long)blocks_per_migr_unit(dev)); + } + printf("\n"); + printf(" Dirty State : %s\n", dev->vol.dirty ? "dirty" : "clean"); diff --git a/mdadm.rules b/mdadm.rules index df3d906..396b342 100644 --- a/mdadm.rules +++ b/mdadm.rules @@ -3,7 +3,24 @@ # See udev(8) for syntax SUBSYSTEM=="block", ACTION=="add", ENV{ID_FS_TYPE}=="linux_raid_member", \ - RUN+="/sbin/mdadm -I $env{DEVNAME}" + RUN+="/sbin/mdadm -I $tempnode" SUBSYSTEM=="block", ACTION=="remove", ENV{ID_FS_TYPE}=="linux_raid_member", \ RUN+="/sbin/mdadm -If $env{DEVNAME}" +ENV{rd_NO_MDIMSM}=="?*", GOTO="md_imsm_inc_end" +# In case the initramfs only started some of the arrays in our container, +# run incremental assembly on the container itself. Note: we ran mdadm +# on the container in 64-md-raid.rules, and that's how the MD_LEVEL +# environment variable is already set. If that disappears from the other +# file, we will need to add this line into the middle of the next rule: +# IMPORT{program}="/sbin/mdadm -D --export $tempnode", \ + +SUBSYSTEM=="block", ACTION=="add", KERNEL=="md*", \ + ENV{MD_LEVEL}=="container", RUN+="/sbin/mdadm -I $tempnode" + +SUBSYSTEM=="block", ACTION=="add", ENV{ID_FS_TYPE}=="isw_raid_member", \ + RUN+="/sbin/mdadm -I $tempnode" +SUBSYSTEM=="block", ACTION=="remove", ENV{ID_FS_TYPE}=="isw_raid_member", \ + RUN+="/sbin/mdadm -If $env{DEVNAME}" +LABEL="md_imsm_inc_end" + diff --git a/mdadm.spec b/mdadm.spec index 66f9412..4beb590 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 3.1.2 -Release: 3%{?dist} +Release: 7%{?dist} Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2 Source1: mdmonitor.init Source2: raid-check @@ -14,7 +14,10 @@ Patch4: mdadm-3.1.2-rebuild.patch Patch5: mdadm-3.1.2-directory.patch Patch6: mdadm-3.1.2-decremental.patch Patch7: mdadm-3.1.2-decremental-2.patch -Patch9: mdadm-2.5.2-static.patch +Patch8: mdadm-3.1.2-decremental-3.patch +Patch9: mdadm-3.1.2-powerpc-compile.patch +Patch10: mdadm-3.1.2-container.patch +Patch20: mdadm-2.5.2-static.patch URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ License: GPLv2+ Group: System Environment/Base @@ -42,7 +45,10 @@ file can be used to help with some common tasks. %patch5 -p1 -b .directory %patch6 -p1 -b .decremental %patch7 -p1 -b .decremental-2 -%patch9 -p1 -b .static +%patch8 -p1 -b .decremental-3 +%patch9 -p1 -b .powerpc +%patch10 -p1 -b .contrainer +%patch20 -p1 -b .static %build make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon @@ -89,6 +95,26 @@ fi %attr(0700,root,root) %dir /var/run/mdadm %changelog +* Tue Apr 06 2010 Doug Ledford - 3.1.2-7 +- Fix up directory in mdmonitor init script so that we restart mdmon like we + are supposed to +- Add a rule to run incremental assembly on containers in case there are + multiple volumes in a container and we only started some of them in the + initramfs +- Make -If work with imsm arrays. We had too restrictive of a test in + sysfs_unique_holder. +- Make incremental assembly of containers act like incremental assembly of + regular devices (aka, --run is needed to start a degraded array) + +* Tue Apr 06 2010 Doug Ledford - 3.1.2-6 +- Typo in new rules file + +* Tue Apr 06 2010 Doug Ledford - 3.1.2-5 +- Enable incremental support for imsm devices + +* Tue Apr 06 2010 Doug Ledford - 3.1.2-4 +- One line fix for ppc64 compiles + * Tue Apr 06 2010 Doug Ledford - 3.1.2-3 - Clean up directory mess once and for all - Add incremental remove support diff --git a/mdmonitor.init b/mdmonitor.init index d7b68fb..cb2cfed 100755 --- a/mdmonitor.init +++ b/mdmonitor.init @@ -41,11 +41,14 @@ usage () start () { # (Re)start mdmon to take over monitoring of mdmon started from the initrd - if [ -f /dev/.mdadm/*.pid ]; then - origprog="$prog"; prog="mdmon" - action $"Starting $prog: " /sbin/mdmon /proc/mdstat / - prog="$origprog" - fi + for i in /dev/md/*.pid; do + if [ -r $i ]; then + origprog="$prog"; prog="mdmon" + action $"Starting $prog: " /sbin/mdmon --takeover --all + prog="$origprog" + break + fi + done # Make sure configuration file exists and has information we can use # MAILADDR or PROGRAM or both must be set in order to run mdadm --monitor [ -f /etc/mdadm.conf ] || return 6 From 2d6de14b7404404e92eaa5551f2a77761260e34e Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Thu, 8 Apr 2010 20:57:35 +0000 Subject: [PATCH 09/16] - Updated container patch that also enables mdadm -IRs for imsm devices --- mdadm-3.1.2-container.patch | 28 +++++++++++++++++++++++----- mdadm.spec | 5 ++++- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/mdadm-3.1.2-container.patch b/mdadm-3.1.2-container.patch index 926e265..048c4cb 100644 --- a/mdadm-3.1.2-container.patch +++ b/mdadm-3.1.2-container.patch @@ -1,10 +1,10 @@ -commit 3f45610e6b9e2419f09f7f1b415170b6128d91ad +commit b775cd39c498b0db4ca9f94bcc8615f59e534c7d Author: Doug Ledford -Date: Thu Apr 8 12:39:03 2010 -0400 +Date: Thu Apr 8 16:56:02 2010 -0400 Make Incremental container assembly behave like native array assembly - Signed-off-by: Doug Ledford :4000 + Signed-off-by: Doug Ledford diff --git a/Assemble.c b/Assemble.c index 1504f1f..d059155 100644 @@ -24,7 +24,7 @@ index 1504f1f..d059155 100644 switch(content->array.level) { diff --git a/Incremental.c b/Incremental.c -index d32a8e5..2a2df82 100644 +index d32a8e5..9d77d4d 100644 --- a/Incremental.c +++ b/Incremental.c @@ -424,20 +424,21 @@ int Incremental(char *devname, int verbose, int runstop, @@ -45,7 +45,7 @@ index d32a8e5..2a2df82 100644 - if (rv == 1) - /* Don't fail the whole -I if a subarray didn't - * have enough devices to start yet -+ if (runstop == 1 || ++ if (runstop > 0 || + info.array.working_disks == info.array.raid_disks) + /* The return value of our container assembly doesn't + * depend on whether or not subarrays assembled @@ -60,6 +60,24 @@ index d32a8e5..2a2df82 100644 } avail = NULL; active_disks = count_active(st, mdfd, &avail, &info); +@@ -666,6 +667,17 @@ int IncrementalScan(int verbose) + + if (mdfd < 0) + continue; ++ if (strcmp("imsm",me->metadata) == 0) { ++ /* ++ * Just do a blind incremental assembly on the ++ * container. If there's anything to be started, ++ * we will, if it's already started, we'll silently ++ * exit, if there's a problem, incremental will ++ * catch it. ++ */ ++ Incremental(me->path, verbose, 1, NULL, "", 0, 1); ++ continue; ++ } + if (ioctl(mdfd, GET_ARRAY_INFO, &array) == 0 || + errno != ENODEV) { + close(mdfd); diff --git a/super-intel.c b/super-intel.c index 999b970..7bcfcdb 100644 --- a/super-intel.c diff --git a/mdadm.spec b/mdadm.spec index 4beb590..ffddd98 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 3.1.2 -Release: 7%{?dist} +Release: 8%{?dist} Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2 Source1: mdmonitor.init Source2: raid-check @@ -95,6 +95,9 @@ fi %attr(0700,root,root) %dir /var/run/mdadm %changelog +* Thu Apr 08 2010 Doug Ledford - 3.1.2-8 +- Updated container patch that also enables mdadm -IRs for imsm devices + * Tue Apr 06 2010 Doug Ledford - 3.1.2-7 - Fix up directory in mdmonitor init script so that we restart mdmon like we are supposed to From 31c5bf74cb858c3eb7de30526251cde863a9bd24 Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Thu, 8 Apr 2010 21:12:13 +0000 Subject: [PATCH 10/16] - Slight fix on container patch --- mdadm-3.1.2-container-2.patch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 mdadm-3.1.2-container-2.patch diff --git a/mdadm-3.1.2-container-2.patch b/mdadm-3.1.2-container-2.patch new file mode 100644 index 0000000..5548944 --- /dev/null +++ b/mdadm-3.1.2-container-2.patch @@ -0,0 +1,26 @@ +commit 3e77dfbe97a30d97c42787b15e7a9c703fda0431 +Author: Doug Ledford +Date: Thu Apr 8 17:10:08 2010 -0400 + + Don't even try to activate non-redundant array types unless all disks + are present. This keeps arrays from getting marked as broken in + the superblock and then permanently blocked from being assembled. + + Signed-off-by: Doug Ledford + +diff --git a/Assemble.c b/Assemble.c +index d059155..9580066 100644 +--- a/Assemble.c ++++ b/Assemble.c +@@ -1337,8 +1337,9 @@ int assemble_container_content(struct supertype *st, int mdfd, + case LEVEL_LINEAR: + case LEVEL_MULTIPATH: + case 0: +- err = sysfs_set_str(content, NULL, "array_state", +- "active"); ++ if ((working + preexist) == content->array.raid_disks) ++ err = sysfs_set_str(content, NULL, ++ "array_state", "active"); + break; + default: + err = sysfs_set_str(content, NULL, "array_state", From d6f29f1fb8cdec8915632b6cb6a60b371c838504 Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Thu, 8 Apr 2010 21:35:32 +0000 Subject: [PATCH 11/16] - Slight fix on container patch --- mdadm-3.1.2-container-2.patch | 10 ++++++---- mdadm.spec | 9 +++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/mdadm-3.1.2-container-2.patch b/mdadm-3.1.2-container-2.patch index 5548944..971dee8 100644 --- a/mdadm-3.1.2-container-2.patch +++ b/mdadm-3.1.2-container-2.patch @@ -1,6 +1,6 @@ -commit 3e77dfbe97a30d97c42787b15e7a9c703fda0431 +commit e750ad9d6fbd4e6606681a9c81b9a99994255940 Author: Doug Ledford -Date: Thu Apr 8 17:10:08 2010 -0400 +Date: Thu Apr 8 17:34:47 2010 -0400 Don't even try to activate non-redundant array types unless all disks are present. This keeps arrays from getting marked as broken in @@ -9,10 +9,10 @@ Date: Thu Apr 8 17:10:08 2010 -0400 Signed-off-by: Doug Ledford diff --git a/Assemble.c b/Assemble.c -index d059155..9580066 100644 +index d059155..81178da 100644 --- a/Assemble.c +++ b/Assemble.c -@@ -1337,8 +1337,9 @@ int assemble_container_content(struct supertype *st, int mdfd, +@@ -1337,8 +1337,11 @@ int assemble_container_content(struct supertype *st, int mdfd, case LEVEL_LINEAR: case LEVEL_MULTIPATH: case 0: @@ -21,6 +21,8 @@ index d059155..9580066 100644 + if ((working + preexist) == content->array.raid_disks) + err = sysfs_set_str(content, NULL, + "array_state", "active"); ++ else ++ err = 1; break; default: err = sysfs_set_str(content, NULL, "array_state", diff --git a/mdadm.spec b/mdadm.spec index ffddd98..dc4d4bb 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 3.1.2 -Release: 8%{?dist} +Release: 9%{?dist} Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2 Source1: mdmonitor.init Source2: raid-check @@ -17,6 +17,7 @@ Patch7: mdadm-3.1.2-decremental-2.patch Patch8: mdadm-3.1.2-decremental-3.patch Patch9: mdadm-3.1.2-powerpc-compile.patch Patch10: mdadm-3.1.2-container.patch +Patch11: mdadm-3.1.2-container-2.patch Patch20: mdadm-2.5.2-static.patch URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ License: GPLv2+ @@ -47,7 +48,8 @@ file can be used to help with some common tasks. %patch7 -p1 -b .decremental-2 %patch8 -p1 -b .decremental-3 %patch9 -p1 -b .powerpc -%patch10 -p1 -b .contrainer +%patch10 -p1 -b .container +%patch11 -p1 -b .container-2 %patch20 -p1 -b .static %build @@ -95,6 +97,9 @@ fi %attr(0700,root,root) %dir /var/run/mdadm %changelog +* Thu Apr 08 2010 Doug Ledford - 3.1.2-9 +- Slight fix on container patch + * Thu Apr 08 2010 Doug Ledford - 3.1.2-8 - Updated container patch that also enables mdadm -IRs for imsm devices From e0d3e8aae9ee9697ad1a04a18b8cdd2eeb560306 Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Tue, 13 Apr 2010 23:18:29 +0000 Subject: [PATCH 12/16] - Minor update to mdadm.rules to make anaconda happy --- mdadm.rules | 1 + mdadm.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mdadm.rules b/mdadm.rules index 396b342..8ff3847 100644 --- a/mdadm.rules +++ b/mdadm.rules @@ -2,6 +2,7 @@ # automatically cause mdadm to be run. # See udev(8) for syntax +ENV{ANACONDA}=="?*", GOTO="md_imsm_inc_end" SUBSYSTEM=="block", ACTION=="add", ENV{ID_FS_TYPE}=="linux_raid_member", \ RUN+="/sbin/mdadm -I $tempnode" SUBSYSTEM=="block", ACTION=="remove", ENV{ID_FS_TYPE}=="linux_raid_member", \ diff --git a/mdadm.spec b/mdadm.spec index dc4d4bb..407603f 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 3.1.2 -Release: 9%{?dist} +Release: 10%{?dist} Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2 Source1: mdmonitor.init Source2: raid-check @@ -97,6 +97,9 @@ fi %attr(0700,root,root) %dir /var/run/mdadm %changelog +* Tue Apr 13 2010 Doug Ledford - 3.1.2-10 +- Minor update to mdadm.rules to make anaconda happy + * Thu Apr 08 2010 Doug Ledford - 3.1.2-9 - Slight fix on container patch From 7b2267d85b20cc893ce06ef009f346ca8814911e Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Tue, 20 Jul 2010 22:01:40 +0000 Subject: [PATCH 13/16] - Fix racy locking of mapfile (bz600900) --- .cvsignore | 1 + mdadm-3.1.1-endian.patch | 30 -- mdadm-3.1.2-container-2.patch | 28 -- mdadm-3.1.2-container.patch | 113 ------ mdadm-3.1.2-decremental-2.patch | 36 -- mdadm-3.1.2-decremental-3.patch | 35 -- mdadm-3.1.2-decremental.patch | 633 ------------------------------ mdadm-3.1.2-directory.patch | 265 ------------- mdadm-3.1.2-lock.patch | 65 +++ mdadm-3.1.2-mapfile.patch | 80 ---- mdadm-3.1.2-mapname.patch | 58 --- mdadm-3.1.2-powerpc-compile.patch | 21 - mdadm-3.1.2-rebuild.patch | 38 -- mdadm-3.1.3-read.patch | 11 + mdadm.spec | 46 +-- sources | 1 + 16 files changed, 95 insertions(+), 1366 deletions(-) delete mode 100644 mdadm-3.1.1-endian.patch delete mode 100644 mdadm-3.1.2-container-2.patch delete mode 100644 mdadm-3.1.2-container.patch delete mode 100644 mdadm-3.1.2-decremental-2.patch delete mode 100644 mdadm-3.1.2-decremental-3.patch delete mode 100644 mdadm-3.1.2-decremental.patch delete mode 100644 mdadm-3.1.2-directory.patch create mode 100644 mdadm-3.1.2-lock.patch delete mode 100644 mdadm-3.1.2-mapfile.patch delete mode 100644 mdadm-3.1.2-mapname.patch delete mode 100644 mdadm-3.1.2-powerpc-compile.patch delete mode 100644 mdadm-3.1.2-rebuild.patch create mode 100644 mdadm-3.1.3-read.patch diff --git a/.cvsignore b/.cvsignore index 1b8b081..6f7aa65 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ mdadm-3.0.3.tar.bz2 mdadm-3.1.1-gcd9a8b5.tar.bz2 mdadm-3.1.2.tar.bz2 +mdadm-3.1.3-git07202010.tar.bz2 diff --git a/mdadm-3.1.1-endian.patch b/mdadm-3.1.1-endian.patch deleted file mode 100644 index c45f175..0000000 --- a/mdadm-3.1.1-endian.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 86983cce34645efb2b270a737d573e01eeee96e5 Mon Sep 17 00:00:00 2001 -From: NeilBrown -Date: Wed, 24 Mar 2010 09:07:02 +1100 -Subject: [PATCH 1/6] - ---- - util.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -diff --git a/util.c b/util.c -index d292a66..79d2b0f 100644 ---- a/util.c -+++ b/util.c -@@ -425,7 +425,12 @@ char *__fname_from_uuid(int id[4], int swap, char *buf, char sep) - - char *fname_from_uuid(struct supertype *st, struct mdinfo *info, char *buf, char sep) - { -- return __fname_from_uuid(info->uuid, st->ss->swapuuid, buf, sep); -+ // dirty hack to work around an issue with super1 superblocks... -+ // super1 superblocks need swapuuid set in order for assembly to -+ // work, but can't have it set if we want this printout to match -+ // all the other uuid printouts in super1.c, so we force swapuuid -+ // to 1 to make our printout match the rest of super1 -+ return __fname_from_uuid(info->uuid, (st->ss == &super1) ? 1 : st->ss->swapuuid, buf, sep); - } - - #ifndef MDASSEMBLE --- -1.6.6.1 - diff --git a/mdadm-3.1.2-container-2.patch b/mdadm-3.1.2-container-2.patch deleted file mode 100644 index 971dee8..0000000 --- a/mdadm-3.1.2-container-2.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit e750ad9d6fbd4e6606681a9c81b9a99994255940 -Author: Doug Ledford -Date: Thu Apr 8 17:34:47 2010 -0400 - - Don't even try to activate non-redundant array types unless all disks - are present. This keeps arrays from getting marked as broken in - the superblock and then permanently blocked from being assembled. - - Signed-off-by: Doug Ledford - -diff --git a/Assemble.c b/Assemble.c -index d059155..81178da 100644 ---- a/Assemble.c -+++ b/Assemble.c -@@ -1337,8 +1337,11 @@ int assemble_container_content(struct supertype *st, int mdfd, - case LEVEL_LINEAR: - case LEVEL_MULTIPATH: - case 0: -- err = sysfs_set_str(content, NULL, "array_state", -- "active"); -+ if ((working + preexist) == content->array.raid_disks) -+ err = sysfs_set_str(content, NULL, -+ "array_state", "active"); -+ else -+ err = 1; - break; - default: - err = sysfs_set_str(content, NULL, "array_state", diff --git a/mdadm-3.1.2-container.patch b/mdadm-3.1.2-container.patch deleted file mode 100644 index 048c4cb..0000000 --- a/mdadm-3.1.2-container.patch +++ /dev/null @@ -1,113 +0,0 @@ -commit b775cd39c498b0db4ca9f94bcc8615f59e534c7d -Author: Doug Ledford -Date: Thu Apr 8 16:56:02 2010 -0400 - - Make Incremental container assembly behave like native array assembly - - Signed-off-by: Doug Ledford - -diff --git a/Assemble.c b/Assemble.c -index 1504f1f..d059155 100644 ---- a/Assemble.c -+++ b/Assemble.c -@@ -1327,8 +1327,10 @@ int assemble_container_content(struct supertype *st, int mdfd, - content->text_version, - content->uuid, chosen_name); - -- if (runstop > 0 || -- (working + preexist) >= content->array.working_disks) { -+ if ((runstop > 0 && -+ (working + preexist) >= content->array.working_disks) || -+ (runstop == 0 && -+ (working + preexist) == content->array.raid_disks)) { - int err; - - switch(content->array.level) { -diff --git a/Incremental.c b/Incremental.c -index d32a8e5..9d77d4d 100644 ---- a/Incremental.c -+++ b/Incremental.c -@@ -424,20 +424,21 @@ int Incremental(char *devname, int verbose, int runstop, - sysfs_uevent(&info, "change"); - if (verbose >= 0) - fprintf(stderr, Name -- ": container %s now has %d devices\n", -- chosen_name, info.array.working_disks); -+ ": container %s now has %d out of %d devices\n", -+ chosen_name, info.array.working_disks, -+ info.array.raid_disks); - wait_for(chosen_name, mdfd); - close(mdfd); -- if (runstop < 0) -- return 0; /* don't try to assemble */ -- rv = Incremental(chosen_name, verbose, runstop, -- NULL, homehost, require_homehost, autof); -- if (rv == 1) -- /* Don't fail the whole -I if a subarray didn't -- * have enough devices to start yet -+ if (runstop > 0 || -+ info.array.working_disks == info.array.raid_disks) -+ /* The return value of our container assembly doesn't -+ * depend on whether or not subarrays assembled -+ * properly, so no need to preserve the return value -+ * here. - */ -- rv = 0; -- return rv; -+ Incremental(chosen_name, verbose, runstop, NULL, -+ homehost, require_homehost, autof); -+ return 0; - } - avail = NULL; - active_disks = count_active(st, mdfd, &avail, &info); -@@ -666,6 +667,17 @@ int IncrementalScan(int verbose) - - if (mdfd < 0) - continue; -+ if (strcmp("imsm",me->metadata) == 0) { -+ /* -+ * Just do a blind incremental assembly on the -+ * container. If there's anything to be started, -+ * we will, if it's already started, we'll silently -+ * exit, if there's a problem, incremental will -+ * catch it. -+ */ -+ Incremental(me->path, verbose, 1, NULL, "", 0, 1); -+ continue; -+ } - if (ioctl(mdfd, GET_ARRAY_INFO, &array) == 0 || - errno != ENODEV) { - close(mdfd); -diff --git a/super-intel.c b/super-intel.c -index 999b970..7bcfcdb 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -1536,12 +1536,27 @@ static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info) - if (super->current_vol >= 0) { - getinfo_super_imsm_volume(st, info); - return; -+ } else { -+ struct mdinfo vol_info; -+ -+ super->current_vol = 0; -+ getinfo_super_imsm_volume(st, &vol_info); -+ super->current_vol = -1; -+ info->array.raid_disks = vol_info.array.raid_disks; - } - - /* Set raid_disks to zero so that Assemble will always pull in valid - * spares -- */ -+ * -+ * Note: my testing with assemble shows that it still works even -+ * when we set the raid_disks to a proper setting. However, without -+ * this it is impossible to tell when a container has the right -+ * number of disks to start cleanly without violating layering -+ * boundaries. So, not violating layering boundaries trumps spare -+ * disk issues. Doug Ledford -+ * - info->array.raid_disks = 0; -+ */ - info->array.level = LEVEL_CONTAINER; - info->array.layout = 0; - info->array.md_minor = -1; diff --git a/mdadm-3.1.2-decremental-2.patch b/mdadm-3.1.2-decremental-2.patch deleted file mode 100644 index 2ab9f6b..0000000 --- a/mdadm-3.1.2-decremental-2.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit ddda49f6daf481471334f5675fbc1fa149d83ad6 -Author: Doug Ledford -Date: Tue Apr 6 12:17:25 2010 -0400 - - Minor bug fix to incremental remove support - - Signed-off-by: Doug Ledford - -diff --git a/Manage.c b/Manage.c -index 6539eda..b15586b 100644 ---- a/Manage.c -+++ b/Manage.c -@@ -386,6 +386,7 @@ int Manage_subdevs(char *devname, int fd, - - next = dv->next; - jnext = 0; -+ tfd = -1; - - if (strcmp(dv->devname, "failed")==0 || - strcmp(dv->devname, "faulty")==0) { -@@ -406,6 +407,7 @@ int Manage_subdevs(char *devname, int fd, - stb.st_rdev = makedev(disc.major, disc.minor); - next = dv; - jnext = j+1; -+ tfd = 0; - sprintf(dvname,"%d:%d", disc.major, disc.minor); - dnprintable = dvname; - break; -@@ -440,6 +442,7 @@ int Manage_subdevs(char *devname, int fd, - stb.st_rdev = makedev(disc.major, disc.minor); - next = dv; - jnext = j+1; -+ tfd = 0; - dnprintable = dvname; - break; - } diff --git a/mdadm-3.1.2-decremental-3.patch b/mdadm-3.1.2-decremental-3.patch deleted file mode 100644 index 0716d63..0000000 --- a/mdadm-3.1.2-decremental-3.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 1934c67fe5bc25a79393ad78e29bf9ef778bc701 -Author: Doug Ledford -Date: Tue Apr 6 23:02:47 2010 -0400 - - Only close lfd if we have an external metadata type since that's the only - time we'll have it open. - - If we weren't able to open the device file, assume the device is gone - already and skip the sysfs_unique_holder test as it is guaranteed to - fail. - - Signed-off-by: Doug Ledford - -diff --git a/Manage.c b/Manage.c -index b15586b..a690cfc 100644 ---- a/Manage.c -+++ b/Manage.c -@@ -811,6 +811,7 @@ int Manage_subdevs(char *devname, int fd, - * rely on the 'detached' checks - */ - if (strcmp(dv->devname, "detached") == 0 || -+ tfd < 0 || - sysfs_unique_holder(dnum, stb.st_rdev)) - /* pass */; - else { -@@ -878,8 +879,8 @@ int Manage_subdevs(char *devname, int fd, - - ping_manager(name); - free(name); -+ close(lfd); - } -- close(lfd); - if (verbose >= 0) - fprintf(stderr, Name ": hot removed %s\n", - dnprintable); diff --git a/mdadm-3.1.2-decremental.patch b/mdadm-3.1.2-decremental.patch deleted file mode 100644 index 5e2515f..0000000 --- a/mdadm-3.1.2-decremental.patch +++ /dev/null @@ -1,633 +0,0 @@ -From 8c43c776715301ff020639801a8b1b4716fdf745 Mon Sep 17 00:00:00 2001 -From: Doug Ledford -Date: Mon, 5 Apr 2010 12:32:08 -0400 -Subject: [PATCH 6/6] Initial implementation of incremental remove support - -Signed-off-by: Doug Ledford ---- - Incremental.c | 36 ++++++++++++++++++ - Manage.c | 105 +++++++++++++++++++++++++++++++++++++-------------- - ReadMe.c | 21 +++++++--- - mdadm.8 | 23 ++++++++++- - mdadm.c | 13 ++++++ - mdadm.h | 8 ++++ - mdstat.c | 90 +++++++++++++++++++++++++++++++++++++++++++- - sysfs.c | 13 ++++-- - udev-md-raid.rules | 16 +++++--- - 9 files changed, 274 insertions(+), 51 deletions(-) - -diff --git a/Incremental.c b/Incremental.c -index 7ad648a..d32a8e5 100644 ---- a/Incremental.c -+++ b/Incremental.c -@@ -843,3 +843,39 @@ int Incremental_container(struct supertype *st, char *devname, int verbose, - map_unlock(&map); - return 0; - } -+ -+/* -+ * IncrementalRemove - Attempt to see if the passed in device belongs to any -+ * raid arrays, and if so first fail (if needed) and then remove the device. -+ * -+ * @devname - The device we want to remove -+ * -+ * Special note: We would like to just use Managedevs to fail/remove the -+ * device, but unfortunately, by the time we are called via udev, the device -+ * special file is already gone, and so we can't stat the device and se we -+ * don't have the right rdev value to use in the ioctls. So, we use the -+ * sysfs method of device removal instead, but since that's not gauranteed -+ * to work depending on the version of kernel we run on, try to use the -+ * ioctl method first and only fallback if we don't have a valid device -+ * special file. That way we can support operation manually on older kernels -+ * even if we won't be able to do this automatically via udev on older -+ * kernels. -+ */ -+int IncrementalRemove(char *devname, int verbose) -+{ -+ char mddev[100] = "/dev/"; -+ int mdfd; -+ struct mddev_dev_s devlist; -+ -+ strncpy(mddev + 5, devname, sizeof(mddev) - 5); -+ if (mdstat_check_active(mddev + 5)) -+ return 1; -+ if ((mdfd = open_mddev(mddev, 0)) < 0) -+ return 1; -+ memset(&devlist, 0, sizeof(devlist)); -+ devlist.devname = devname; -+ devlist.disposition = 'f'; -+ Manage_subdevs(mddev, mdfd, &devlist, verbose); -+ devlist.disposition = 'r'; -+ return Manage_subdevs(mddev, mdfd, &devlist, verbose); -+} -diff --git a/Manage.c b/Manage.c -index f848d8b..6539eda 100644 ---- a/Manage.c -+++ b/Manage.c -@@ -346,6 +346,9 @@ int Manage_subdevs(char *devname, int fd, - mdu_disk_info_t disc; - unsigned long long array_size; - mddev_dev_t dv, next = NULL; -+ struct mdinfo *mdi = NULL; -+ struct mdinfo *dev = NULL; -+ char sys_name[20] = "dev-"; - struct stat stb; - int j, jnext = 0; - int tfd; -@@ -443,16 +446,43 @@ int Manage_subdevs(char *devname, int fd, - if (jnext == 0) - continue; - } else { -+ /* -+ * For fail/remove operations, allow the disk -+ * to be completely missing, use name matching -+ * to a device in our sysfs entries to -+ * suffice. For add we need a valid block device. -+ * Leave this loop one of three ways: -+ * 1) tfd < 0 and dev is set to our device -+ * 2) tfd >= 0 and dev is NULL -+ * 3) failed to find suitable device and return -+ */ - j = 0; - - tfd = dev_open(dv->devname, O_RDONLY); -- if (tfd < 0 && dv->disposition == 'r' && -- lstat(dv->devname, &stb) == 0) -- /* Be happy, the lstat worked, that is -- * enough for --remove -- */ -- ; -- else { -+ if (tfd < 0 && dv->disposition != 'a') { -+ strcpy(&sys_name[4], -+ strrchr(dv->devname, '/') + 1); -+ mdi = sysfs_read(fd, 0, -+ GET_DEVS | KEEP_GONE_DEVS); -+ if (!mdi) { -+ fprintf(stderr, Name ": can't open %s " -+ "and can't read sysfs info\n", -+ dv->devname); -+ return 1; -+ } -+ for (dev = mdi->devs; dev; dev = dev->next) { -+ if (strcmp(sys_name, dev->sys_name)) -+ continue; -+ break; -+ } -+ if (!dev) { -+ fprintf(stderr, Name ": can't open %s " -+ "and %s not listed in sysfs\n", -+ dv->devname, sys_name); -+ sysfs_free(mdi); -+ return 1; -+ } -+ } else { - if (tfd < 0 || fstat(tfd, &stb) != 0) { - fprintf(stderr, Name ": cannot find %s: %s\n", - dv->devname, strerror(errno)); -@@ -461,12 +491,12 @@ int Manage_subdevs(char *devname, int fd, - return 1; - } - close(tfd); -- } -- if ((stb.st_mode & S_IFMT) != S_IFBLK) { -- fprintf(stderr, Name ": %s is not a " -- "block device.\n", -- dv->devname); -- return 1; -+ if ((stb.st_mode & S_IFMT) != S_IFBLK) { -+ fprintf(stderr, Name ": %s is not a " -+ "block device.\n", -+ dv->devname); -+ return 1; -+ } - } - } - switch(dv->disposition){ -@@ -790,26 +820,36 @@ int Manage_subdevs(char *devname, int fd, - return 1; - } - } -- /* FIXME check that it is a current member */ -- err = ioctl(fd, HOT_REMOVE_DISK, (unsigned long)stb.st_rdev); -- if (err && errno == ENODEV) { -+ /* stb.st_rdev is only valid if we have a tfd that -+ * does not indicate an error on attempt to open -+ * the devname -+ */ -+ if (tfd >= 0) -+ err = ioctl(fd, HOT_REMOVE_DISK, -+ (unsigned long)stb.st_rdev); -+ if (tfd < 0 || (err && errno == ENODEV)) { - /* Old kernels rejected this if no personality - * registered */ -- struct mdinfo *sra = sysfs_read(fd, 0, GET_DEVS); -- struct mdinfo *dv = NULL; -- if (sra) -- dv = sra->devs; -- for ( ; dv ; dv=dv->next) -- if (dv->disk.major == major(stb.st_rdev) && -- dv->disk.minor == minor(stb.st_rdev)) -+ if (!mdi) { -+ strcpy(&sys_name[4], -+ strrchr(dv->devname, '/') + 1); -+ mdi = sysfs_read(fd, 0, GET_DEVS | -+ KEEP_GONE_DEVS); -+ if (mdi) -+ dev = mdi->devs; -+ for ( ; dev ; dev=dev->next) { -+ if (strcmp(sys_name, dev->sys_name)) -+ continue; - break; -- if (dv) -- err = sysfs_set_str(sra, dv, -+ } -+ } -+ if (dev) -+ err = sysfs_set_str(mdi, dev, - "state", "remove"); - else - err = -1; -- if (sra) -- sysfs_free(sra); -+ if (mdi) -+ sysfs_free(mdi); - } - if (err) { - fprintf(stderr, Name ": hot remove failed " -@@ -844,11 +884,18 @@ int Manage_subdevs(char *devname, int fd, - - case 'f': /* set faulty */ - /* FIXME check current member */ -- if (ioctl(fd, SET_DISK_FAULTY, (unsigned long) stb.st_rdev)) { -+ if ((tfd >= 0 && ioctl(fd, SET_DISK_FAULTY, -+ (unsigned long) stb.st_rdev)) || -+ (tfd < 0 && sysfs_set_str(mdi, dev, "state", -+ "faulty"))) { - fprintf(stderr, Name ": set device faulty failed for %s: %s\n", - dnprintable, strerror(errno)); -+ if (mdi) -+ sysfs_free(mdi); - return 1; -- } -+ } -+ if (mdi) -+ sysfs_free(mdi); - if (verbose >= 0) - fprintf(stderr, Name ": set %s faulty in %s\n", - dnprintable, devname); -diff --git a/ReadMe.c b/ReadMe.c -index 9d5a211..fd216ec 100644 ---- a/ReadMe.c -+++ b/ReadMe.c -@@ -86,11 +86,12 @@ char Version[] = Name " - v3.1.2 - 10th March 2010\n"; - * At the time if writing, there is only minimal support. - */ - --char short_options[]="-ABCDEFGIQhVXWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:"; -+char short_options[]= -+ "-ABCDEFGIQhVXWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:"; - char short_bitmap_options[]= -- "-ABCDEFGIQhVXWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:"; -+ "-ABCDEFGIQhVXWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:"; - char short_bitmap_auto_options[]= -- "-ABCDEFGIQhVXWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sa:rfRSow1tye:"; -+ "-ABCDEFGIQhVXWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sa:rfRSow1tye:"; - - struct option long_options[] = { - {"manage", 0, 0, '@'}, -@@ -213,7 +214,7 @@ char Help[] = - " mdadm --grow options device\n" - " resize/reshape an active array\n" - " mdadm --incremental device\n" --" add a device to an array as appropriate\n" -+" add/remove a device to/from an array as appropriate\n" - " mdadm --monitor options...\n" - " Monitor one or more array for significant changes.\n" - " mdadm device options...\n" -@@ -535,20 +536,26 @@ char Help_grow[] = - ; - - char Help_incr[] = --"Usage: mdadm --incremental [-Rqrs] device\n" -+"Usage: mdadm --incremental [-Rqrsf] device\n" - "\n" - "This usage allows for incremental assembly of md arrays. Devices can be\n" - "added one at a time as they are discovered. Once an array has all expected\n" - "devices, it will be started.\n" - "\n" --"Options that are valid with incremental assembly (-I --incremental) more are:\n" --" --run -R : run arrays as soon as a minimal number of devices are\n" -+"Optionally, the process can be reversed by using the fail option.\n" -+"When fail mode is invoked, mdadm will see if the device belongs to an array\n" -+"and then both fail (if needed) and remove the device from that array.\n" -+"\n" -+"Options that are valid with incremental assembly (-I --incremental) are:\n" -+" --run -R : Run arrays as soon as a minimal number of devices are\n" - " : present rather than waiting for all expected.\n" - " --quiet -q : Don't print any information messages, just errors.\n" - " --rebuild -r : Rebuild the 'map' file that mdadm uses for tracking\n" - " : partial arrays.\n" - " --scan -s : Use with -R to start any arrays that have the minimal\n" - " : required number of devices, but are not yet started.\n" -+" --fail -f : First fail (if needed) and then remove device from\n" -+" : any array that it is a member of.\n" - ; - - char Help_config[] = -diff --git a/mdadm.8 b/mdadm.8 -index 4edfc41..eaf9155 100644 ---- a/mdadm.8 -+++ b/mdadm.8 -@@ -135,7 +135,11 @@ This provides a convenient interface to a - .I hot-plug - system. As each device is detected, - .I mdadm --has a chance to include it in some array as appropriate. -+has a chance to include it in some array as appropriate. Optionally, -+with the -+.I \-\-fail -+flag is passed in then we will remove the device from any active array -+instead of adding it. - - If a - .B CONTAINER -@@ -189,7 +193,7 @@ Change the size or shape of an active array. - - .TP - .BR \-I ", " \-\-incremental --Add a single device into an appropriate array, and possibly start the array. -+Add/remove a single device to/from an appropriate array, and possibly start the array. - - .TP - .B \-\-auto-detect -@@ -1235,6 +1239,12 @@ in - .B mdadm.conf - as requiring an external bitmap, that bitmap will be attached first. - -+.TP -+.BR \-\-fail ", " \-f -+This allows the hot-plug system to remove devices that have fully disappeared -+from the kernel. It will first fail and then remove the device from any -+array it belongs to. -+ - .SH For Monitor mode: - .TP - .BR \-m ", " \-\-mail -@@ -2141,6 +2151,10 @@ Usage: - .I component-device - .HP 12 - Usage: -+.B mdadm \-\-incremental \-\-fail -+.I component-device -+.HP 12 -+Usage: - .B mdadm \-\-incremental \-\-rebuild - .HP 12 - Usage: -@@ -2153,6 +2167,11 @@ passed to - .B "mdadm \-\-incremental" - to be conditionally added to an appropriate array. - -+Conversely, it can also be used with the -+.B \-\-fail -+flag to do just the opposite and find whatever array a particular device -+is part of and remove the device from the array. -+ - If the device passed is a - .B CONTAINER - device created by a previous call to -diff --git a/mdadm.c b/mdadm.c -index d5e34c0..cd6fd8f 100644 ---- a/mdadm.c -+++ b/mdadm.c -@@ -124,6 +124,7 @@ int main(int argc, char *argv[]) - ident.name[0] = 0; - ident.container = NULL; - ident.member = NULL; -+ ident.member_index = -1; - - while ((option_index = -1) , - (opt=getopt_long(argc, argv, -@@ -774,6 +775,9 @@ int main(int argc, char *argv[]) - devmode = 'r'; - continue; - case O(MANAGE,'f'): /* set faulty */ -+ case O(INCREMENTAL,'f'): /* r for incremental is taken, use f -+ * even though we will both fail and -+ * remove the device */ - devmode = 'f'; - continue; - case O(INCREMENTAL,'R'): -@@ -1517,6 +1521,11 @@ int main(int argc, char *argv[]) - ": --incremental --scan meaningless without --run.\n"); - break; - } -+ if (devmode == 'f') { -+ fprintf(stderr, Name -+ ": --incremental --scan --fail not supported.\n"); -+ break; -+ } - rv = IncrementalScan(verbose); - } - if (!devlist) { -@@ -1533,6 +1542,10 @@ int main(int argc, char *argv[]) - rv = 1; - break; - } -+ if (devmode == 'f') { -+ rv = IncrementalRemove(devlist->devname, verbose-quiet); -+ break; -+ } - rv = Incremental(devlist->devname, verbose-quiet, runstop, - ss, homehost, require_homehost, autof); - break; -diff --git a/mdadm.h b/mdadm.h -index d8ab85f..c113d0f 100644 ---- a/mdadm.h -+++ b/mdadm.h -@@ -315,6 +315,7 @@ typedef struct mddev_ident_s { - * of some other entry. - */ - char *member; /* subarray within a container */ -+ int member_index; /* subarray index within a container */ - - struct mddev_ident_s *next; - union { -@@ -355,6 +356,10 @@ struct mdstat_ent { - int raid_disks; - int chunk_size; - char * metadata_version; -+ struct dev_member { -+ char *name; -+ struct dev_member *next; -+ } *members; - struct mdstat_ent *next; - }; - -@@ -363,6 +368,7 @@ extern void free_mdstat(struct mdstat_ent *ms); - extern void mdstat_wait(int seconds); - extern void mdstat_wait_fd(int fd, const sigset_t *sigmask); - extern int mddev_busy(int devnum); -+extern int mdstat_check_active(char *devname); - - struct map_ent { - struct map_ent *next; -@@ -404,6 +410,7 @@ enum sysfs_read_flags { - GET_STATE = (1 << 13), - GET_ERROR = (1 << 14), - SKIP_GONE_DEVS = (1 << 15), -+ KEEP_GONE_DEVS = (1 << 16), - }; - - /* If fd >= 0, get the array it is open on, -@@ -817,6 +824,7 @@ extern int Incremental_container(struct supertype *st, char *devname, - int trustworthy); - extern void RebuildMap(void); - extern int IncrementalScan(int verbose); -+extern int IncrementalRemove(char *devname, int verbose); - - extern int CreateBitmap(char *filename, int force, char uuid[16], - unsigned long chunksize, unsigned long daemon_sleep, -diff --git a/mdstat.c b/mdstat.c -index 4a9f370..81d2212 100644 ---- a/mdstat.c -+++ b/mdstat.c -@@ -83,6 +83,45 @@ - #include - #include - -+static void free_member_devnames(struct dev_member **m) -+{ -+ struct dev_member *t; -+ if (!*m) -+ return; -+ while(*m) { -+ t = *m; -+ *m = (*m)->next; -+ if (t->name) -+ free(t->name); -+ free(t); -+ } -+ *m = NULL; -+} -+ -+static struct dev_member *add_member_devname(struct dev_member **m, char *name) -+{ -+ struct dev_member *new; -+ char *t; -+ -+ if (!m || !name) -+ return NULL; -+ -+ new = malloc(sizeof(*new)); -+ if (!new) -+ return NULL; -+ if ((t = strchr(name, '[')) == NULL) -+ { -+ /* not a device */ -+ free(new); -+ return *m; -+ } -+ new->name = strndup(name, t - name); -+ new->next = *m; -+ *m = new; -+ -+ return new; -+} -+ - void free_mdstat(struct mdstat_ent *ms) - { - while (ms) { -@@ -91,6 +130,7 @@ void free_mdstat(struct mdstat_ent *ms) - if (ms->level) free(ms->level); - if (ms->pattern) free(ms->pattern); - if (ms->metadata_version) free(ms->metadata_version); -+ if (ms->members) free_member_devnames(&ms->members); - t = ms; - ms = ms->next; - free(t); -@@ -159,6 +199,7 @@ struct mdstat_ent *mdstat_read(int hold, int start) - ent->raid_disks = 0; - ent->chunk_size = 0; - ent->devcnt = 0; -+ ent->members = NULL; - - ent->dev = strdup(line); - ent->devnum = devnum; -@@ -170,15 +211,23 @@ struct mdstat_ent *mdstat_read(int hold, int start) - ent->active = 1; - else if (strcmp(w, "inactive")==0) - ent->active = 0; -- else if (ent->active >=0 && -+ else if (ent->active > 0 && - ent->level == NULL && - w[0] != '(' /*readonly*/) { - ent->level = strdup(w); - in_devs = 1; - } else if (in_devs && strcmp(w, "blocks")==0) - in_devs = 0; -- else if (in_devs) { -+ else if (in_devs || (ent->active == 0 && w[0] != '(' && -+ w[l - 1] == ')')) { -+ if (isdigit(w[0])) -+ continue; -+ in_devs = 1; - ent->devcnt++; -+ if (!add_member_devname(&ent->members, w)) { -+ free_mdstat(ent); -+ break; -+ } - if (strncmp(w, "md", 2)==0) { - /* This has an md device as a component. - * If that device is already in the -@@ -310,3 +359,40 @@ int mddev_busy(int devnum) - free_mdstat(mdstat); - return me != NULL; - } -+ -+/* -+ * Finds name of the active array holding this device -+ * @param[in] devname name of member device -+ * @param[out] devname name of array -+ * -+ * @return found (0), or -+ * not found, failure (1) -+ */ -+ -+int mdstat_check_active(char *devname) -+{ -+ struct mdstat_ent *mdstat = mdstat_read(0, 0); -+ struct mdstat_ent *ent; -+ char *name; -+ -+ if (!devname) -+ return 1; -+ name = strrchr(devname, '/'); -+ if (name++ == NULL) -+ return 1; -+ -+ for (ent = mdstat; ent; ent = ent->next) { -+ struct dev_member *m; -+ if (ent->active && (strstr(ent->metadata_version,"imsm") || -+ strstr(ent->metadata_version,"ddf"))) -+ /* only return container matches, not subarrays */ -+ continue; -+ for (m = ent->members; m; m = m->next) { -+ if (!strcmp(m->name, name)) { -+ strcpy(devname, ent->dev); -+ return 0; -+ } -+ } -+ } -+ return 1; -+} -diff --git a/sysfs.c b/sysfs.c -index ebf9d8a..65dd848 100644 ---- a/sysfs.c -+++ b/sysfs.c -@@ -273,13 +273,16 @@ struct mdinfo *sysfs_read(int fd, int devnum, unsigned long options) - - strcpy(dbase, "block/dev"); - if (load_sys(fname, buf)) { -- free(dev); -- if (options & SKIP_GONE_DEVS) -+ if (options & SKIP_GONE_DEVS) { -+ free(dev); - continue; -- else -+ } else if (options & KEEP_GONE_DEVS) { -+ dev->disk.major = dev->disk.minor = -1; -+ } else - goto abort; -- } -- sscanf(buf, "%d:%d", &dev->disk.major, &dev->disk.minor); -+ } else -+ sscanf(buf, "%d:%d", &dev->disk.major, -+ &dev->disk.minor); - - /* special case check for block devices that can go 'offline' */ - if (options & SKIP_GONE_DEVS) { -diff --git a/udev-md-raid.rules b/udev-md-raid.rules -index c9a4f0e..aff14fa 100644 ---- a/udev-md-raid.rules -+++ b/udev-md-raid.rules -@@ -1,17 +1,16 @@ - # do not edit this file, it will be overwritten on update - - SUBSYSTEM!="block", GOTO="md_end" --ACTION!="add|change", GOTO="md_end" -+ACTION!="add|change|remove", GOTO="md_end" -+ACTION=="remove", GOTO="md_remove" - ACTION=="change", GOTO="md_no_incr" - --# import data from a raid member and activate it --#ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}" --# import data from a raid set -+# we are adding a raid member, activate it -+ENV{ID_FS_TYPE}=="linux_raid_member", RUN+="/sbin/mdadm -I $env{DEVNAME}" - LABEL="md_no_incr" - KERNEL!="md*", GOTO="md_end" - --# partitions have no md/{array_state,metadata_version}, but should not --# for that reason be ignored. -+# partitions have no md/{array_state,metadata_version} - ENV{DEVTYPE}=="partition", GOTO="md_ignore_state" - - # container devices have a metadata version of e.g. 'external:ddf' and -@@ -32,7 +31,12 @@ ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNA - - IMPORT{program}="/sbin/blkid -o udev -p $tempnode" - OPTIONS+="link_priority=100" -+OPTIONS+="watch" - ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" - ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" -+GOTO="md_end" -+ -+LABEL="md_remove" -+ENV{ID_FS_TYPE}=="linux_raid_member", RUN+="/sbin/mdadm -If $env{DEVNAME}" - - LABEL="md_end" --- -1.6.6.1 - diff --git a/mdadm-3.1.2-directory.patch b/mdadm-3.1.2-directory.patch deleted file mode 100644 index 61132a4..0000000 --- a/mdadm-3.1.2-directory.patch +++ /dev/null @@ -1,265 +0,0 @@ -From df3e08eaa7ee07528968bb7152dfaaeebd3c97cb Mon Sep 17 00:00:00 2001 -From: Doug Ledford -Date: Fri, 2 Apr 2010 10:53:47 -0400 -Subject: [PATCH 5/6] Fix all the confusion over directories once and for all. We now have - 3 directory definitions: mdmon directory for its pid and sock files, - mdmonitor directory which is for the mdadm monitor mode pid file and - can only be passed in via command line, and the directory for the - mdadm map file. Only the mdadm map file still hunts multiple locations, - and the number of locations has been reduced to /var/run and the - compile time specified location. I could see lowering that to just - 1 location, but I didn't do that with this patch. - -Signed-off-by: Doug Ledford ---- - Makefile | 18 +++++++++--------- - mapfile.c | 18 ++++++++---------- - mdadm.h | 41 +++++++++++++++++++++-------------------- - mdmon.c | 28 ++++++---------------------- - msg.c | 2 +- - util.c | 4 +--- - 6 files changed, 46 insertions(+), 65 deletions(-) - -diff --git a/Makefile b/Makefile -index 2aafad0..30e52a7 100644 ---- a/Makefile -+++ b/Makefile -@@ -58,16 +58,16 @@ CONFFILE = $(SYSCONFDIR)/mdadm.conf - CONFFILE2 = $(SYSCONFDIR)/mdadm/mdadm.conf - MAILCMD =/usr/sbin/sendmail -t - CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\" --# ALT_RUN should be somewhere that persists across the pivotroot --# from early boot to late boot. -+# Both MAP_DIR and MDMON_DIR should be somewhere that persists across the -+# pivotroot from early boot to late boot. - # If you don't have /lib/init/rw you might want to use /dev/.something --# e.g. make ALT_RUN=/dev/.mdadm --ALT_RUN = /lib/init/rw --ALT_MAPFILE = map --VAR_RUN = /var/run --ALTFLAGS = -DALT_RUN=\"$(ALT_RUN)\" -DALT_MAPFILE=\"$(ALT_MAPFILE)\" --VARFLAGS = -DVAR_RUN=\"$(VAR_RUN)\" --CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(ALTFLAGS) $(VARFLAGS) -+# e.g. make MAP_DIR=/dev/.mdadm -+MAP_DIR = /lib/init/rw/mdadm -+MAP_FILE = map -+MDMON_DIR = /lib/init/rw/mdmon -+DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\" -+DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\" -+CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS) - - # If you want a static binary, you might uncomment these - # LDFLAGS = -static -diff --git a/mapfile.c b/mapfile.c -index d47fde1..f4339db 100644 ---- a/mapfile.c -+++ b/mapfile.c -@@ -52,28 +52,26 @@ - #include - - #define mapnames(base) { base, base ".new", base ".lock"} --char *mapname[3][3] = { -- mapnames(VAR_RUN "/map"), -- mapnames("/var/run/mdadm.map"), -- mapnames(ALT_RUN "/" ALT_MAPFILE) -+char *mapname[2][3] = { -+ mapnames(MAP_DIR "/" MAP_FILE), -+ mapnames("/var/run/mdadm.map") - }; --char *mapdir[3] = { VAR_RUN, NULL, ALT_RUN }; -+char *mapdir[2] = { MAP_DIR, NULL }; - --int mapmode[3] = { O_RDONLY, O_RDWR|O_CREAT, O_RDWR|O_CREAT | O_TRUNC }; -+int mapmode[3] = { O_RDONLY, O_RDWR|O_CREAT, O_RDWR|O_CREAT|O_TRUNC }; - char *mapsmode[3] = { "r", "w", "w"}; - - FILE *open_map(int modenum, int *choice) - { - int i; - -- for (i = 0 ; i < 3 ; i++) { -+ for (i = 0 ; i < 2 ; i++) { - int fd; -- if ((mapmode[modenum] & O_CREAT) && -- mapdir[modenum]) -+ if ((mapmode[modenum] & O_CREAT) && mapdir[i]) - /* Attempt to create directory, don't worry about - * failure. - */ -- mkdir(mapdir[modenum], 0755); -+ mkdir(mapdir[i], 0755); - fd = open(mapname[i][modenum], mapmode[modenum], 0600); - if (fd >= 0) { - *choice = i; -diff --git a/mdadm.h b/mdadm.h -index 0386129..d8ab85f 100644 ---- a/mdadm.h -+++ b/mdadm.h -@@ -68,28 +68,30 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); - #define DEFAULT_BITMAP_DELAY 5 - #define DEFAULT_MAX_WRITE_BEHIND 256 - --/* VAR_RUN is where pid and socket files used for communicating -- * with mdmon normally live. It should be /var/run, but if -- * it is too hard to remount /var/run as read-only rather than -- * unmounting it at shutdown time, then it should be -- * redefined to some place that comfortably persists until -- * final shutdown, possibly in /dev if that is a tmpfs. -- * Note: VAR_RUN does not need to be writable at shutdown, -- * only during boot when "mdmon --takeover" is run. -- */ --#ifndef VAR_RUN --#define VAR_RUN "/var/run/mdadm" --#endif /* VAR_RUN */ --/* ALT_RUN should be somewhere that persists across the pivotroot -+/* MAP_DIR should be somewhere that persists across the pivotroot - * from early boot to late boot. - * If you don't have /lib/init/rw you might want to use /dev/.something - */ --#ifndef ALT_RUN --#define ALT_RUN "/lib/init/rw/mdadm" --#endif /* ALT_RUN */ --#ifndef ALT_MAPFILE --#define ALT_MAPFILE "map" --#endif /* ALT_MAPFILE */ -+#ifndef MAP_DIR -+#define MAP_DIR "/lib/init/rw/mdadm" -+#endif /* MAP_DIR */ -+/* MAP_FILE is what we name the map file we put in MAP_DIR, in case you -+ * want something other than the default of "map" -+ */ -+#ifndef MAP_FILE -+#define MAP_FILE "map" -+#endif /* MAP_FILE */ -+/* MDMON_DIR is where pid and socket files used for communicating -+ * with mdmon normally live. It *should* be /var/run, but when -+ * mdmon is needed at early boot then it needs to write there prior -+ * to /var/run being mounted read/write, and it also then needs to -+ * persist beyond when /var/run is mounter read-only. So, to be -+ * safe, the default is somewhere that is read/write early in the -+ * boot process and stays up as long as possible during shutdown. -+ */ -+#ifndef MDMON_DIR -+#define MDMON_DIR "/lib/init/rw/mdmon" -+#endif /* MDMON_DIR */ - - #include "md_u.h" - #include "md_p.h" -@@ -910,7 +912,6 @@ extern int create_mddev(char *dev, char *name, int autof, int trustworthy, - extern int open_mddev(char *dev, int report_errors); - extern int open_container(int fd); - --extern char *pid_dir; - extern int mdmon_running(int devnum); - extern int mdmon_pid(int devnum); - extern int check_env(char *name); -diff --git a/mdmon.c b/mdmon.c -index 69c320e..cbb72cc 100644 ---- a/mdmon.c -+++ b/mdmon.c -@@ -120,10 +120,10 @@ static int make_pidfile(char *devname) - int fd; - int n; - -- if (mkdir(pid_dir, 0700) < 0 && -+ if (mkdir(MDMON_DIR, 0755) < 0 && - errno != EEXIST) - return -errno; -- sprintf(path, "%s/%s.pid", pid_dir, devname); -+ sprintf(path, "%s/%s.pid", MDMON_DIR, devname); - - fd = open(path, O_RDWR|O_CREAT|O_EXCL, 0600); - if (fd < 0) -@@ -189,13 +189,10 @@ void remove_pidfile(char *devname) - { - char buf[100]; - -- sprintf(buf, "%s/%s.pid", pid_dir, devname); -+ sprintf(buf, "%s/%s.pid", MDMON_DIR, devname); - unlink(buf); -- sprintf(buf, "%s/%s.sock", pid_dir, devname); -+ sprintf(buf, "%s/%s.sock", MDMON_DIR, devname); - unlink(buf); -- if (strcmp(pid_dir, ALT_RUN) == 0) -- /* try to clean up when we are finished with this dir */ -- rmdir(pid_dir); - } - - static int make_control_sock(char *devname) -@@ -208,7 +205,7 @@ static int make_control_sock(char *devname) - if (sigterm) - return -1; - -- sprintf(path, "%s/%s.sock", pid_dir, devname); -+ sprintf(path, "%s/%s.sock", MDMON_DIR, devname); - unlink(path); - sfd = socket(PF_LOCAL, SOCK_STREAM, 0); - if (sfd < 0) -@@ -445,12 +442,7 @@ static int mdmon(char *devname, int devnum, int must_fork, int takeover) - act.sa_handler = SIG_IGN; - sigaction(SIGPIPE, &act, NULL); - -- pid_dir = VAR_RUN; - victim = mdmon_pid(container->devnum); -- if (victim < 0) { -- pid_dir = ALT_RUN; -- victim = mdmon_pid(container->devnum); -- } - if (victim >= 0) - victim_sock = connect_monitor(container->devname); - -@@ -474,16 +466,8 @@ static int mdmon(char *devname, int devnum, int must_fork, int takeover) - */ - if (victim > 0) - remove_pidfile(devname); -- pid_dir = VAR_RUN; - if (make_pidfile(devname) < 0) { -- /* Try the alternate */ -- pid_dir = ALT_RUN; -- if (make_pidfile(devname) < 0) { -- fprintf(stderr, "mdmon: Neither %s nor %s are writable\n" -- " cannot create .pid or .sock files. Aborting\n", -- VAR_RUN, ALT_RUN); -- exit(3); -- } -+ exit(3); - } - container->sock = make_control_sock(devname); - -diff --git a/msg.c b/msg.c -index d2d8445..aabfa8f 100644 ---- a/msg.c -+++ b/msg.c -@@ -147,7 +147,7 @@ int connect_monitor(char *devname) - int pos; - char *c; - -- pos = sprintf(path, "%s/", pid_dir); -+ pos = sprintf(path, "%s/", MDMON_DIR); - if (is_subarray(devname)) { - devname++; - c = strchr(devname, '/'); -diff --git a/util.c b/util.c -index 79d2b0f..bdb19f9 100644 ---- a/util.c -+++ b/util.c -@@ -1499,15 +1499,13 @@ int fd2devnum(int fd) - return NoMdDev; - } - --char *pid_dir = VAR_RUN; -- - int mdmon_pid(int devnum) - { - char path[100]; - char pid[10]; - int fd; - int n; -- sprintf(path, "%s/%s.pid", pid_dir, devnum2devname(devnum)); -+ sprintf(path, "%s/%s.pid", MDMON_DIR, devnum2devname(devnum)); - fd = open(path, O_RDONLY | O_NOATIME, 0); - - if (fd < 0) --- -1.6.6.1 - diff --git a/mdadm-3.1.2-lock.patch b/mdadm-3.1.2-lock.patch new file mode 100644 index 0000000..8d90870 --- /dev/null +++ b/mdadm-3.1.2-lock.patch @@ -0,0 +1,65 @@ +--- mdadm-3.1.2/Incremental.c.lock 2010-07-20 17:21:41.879217630 -0400 ++++ mdadm-3.1.2/Incremental.c 2010-07-20 17:21:41.916342431 -0400 +@@ -285,7 +285,9 @@ int Incremental(char *devname, int verbo + + /* 4/ Check if array exists. + */ +- map_lock(&map); ++ if (map_lock(&map)) ++ fprintf(stderr, Name ": failed to get exclusive lock on " ++ "mapfile\n"); + mp = map_by_uuid(&map, info.uuid); + if (mp) + mdfd = open_dev(mp->devnum); +@@ -769,7 +771,9 @@ int Incremental_container(struct superty + struct mdinfo *ra; + struct map_ent *map = NULL; + +- map_lock(&map); ++ if (map_lock(&map)) ++ fprintf(stderr, Name ": failed to get exclusive lock on " ++ "mapfile\n"); + + for (ra = list ; ra ; ra = ra->next) { + int mdfd; +--- mdadm-3.1.2/mapfile.c.lock 2010-07-20 17:21:41.687217302 -0400 ++++ mdadm-3.1.2/mapfile.c 2010-07-20 17:23:23.038096346 -0400 +@@ -58,7 +58,7 @@ char *mapname[2][3] = { + }; + char *mapdir[2] = { MAP_DIR, NULL }; + +-int mapmode[3] = { O_RDONLY, O_RDWR|O_CREAT, O_RDWR|O_CREAT|O_TRUNC }; ++int mapmode[3] = { O_RDONLY, O_RDWR|O_CREAT, O_RDWR|O_CREAT|O_EXCL }; + char *mapsmode[3] = { "r", "w", "w"}; + + FILE *open_map(int modenum, int *choice) +@@ -120,14 +120,11 @@ static int lwhich = 0; + int map_lock(struct map_ent **melp) + { + if (lf == NULL) { +- lf = open_map(2, &lwhich); ++ do { ++ lf = open_map(2, &lwhich); ++ } while (lf == NULL && errno == EEXIST); + if (lf == NULL) + return -1; +- if (flock(fileno(lf), LOCK_EX) != 0) { +- fclose(lf); +- lf = NULL; +- return -1; +- } + } + if (*melp) + map_free(*melp); +@@ -137,10 +134,7 @@ int map_lock(struct map_ent **melp) + + void map_unlock(struct map_ent **melp) + { +- if (lf) { +- flock(fileno(lf), LOCK_UN); +- fclose(lf); +- } ++ fclose(lf); + unlink(mapname[lwhich][2]); + lf = NULL; + } diff --git a/mdadm-3.1.2-mapfile.patch b/mdadm-3.1.2-mapfile.patch deleted file mode 100644 index 5523c0d..0000000 --- a/mdadm-3.1.2-mapfile.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 435b90e7d41a17f35a984112cace471c975906f4 Mon Sep 17 00:00:00 2001 -From: Doug Ledford -Date: Tue, 16 Mar 2010 23:00:11 -0400 -Subject: [PATCH 2/6] Create directory to contain mapfile (Assuming parent exists and - filesystem is writable). - This particularly keeps udev happy if VAR_RUN is set to /dev/md. - -Signed-off-by: Doug Ledford -Signed-off-by: NeilBrown ---- - mapfile.c | 17 +++++++++++++---- - mdmon.c | 2 +- - 2 files changed, 14 insertions(+), 5 deletions(-) - -diff --git a/mapfile.c b/mapfile.c -index 366ebe3..89187ac 100644 ---- a/mapfile.c -+++ b/mapfile.c -@@ -29,7 +29,7 @@ - */ - - /* /var/run/mdadm.map is used to track arrays being created in --incremental -- * more. It particularly allows lookup from UUID to array device, but -+ * mode. It particularly allows lookup from UUID to array device, but - * also allows the array device name to be easily found. - * - * The map file is line based with space separated fields. The fields are: -@@ -42,8 +42,8 @@ - * However /var/run may not exist or be writable in early boot. And if - * no-one has created /var/run/mdadm, we still want to survive. - * So possible locations are: -- * /var/run/mdadm/map /var/run/mdadm.map /dev/.mdadm.map -- * the last, because udev requires a writable /dev very early. -+ * /var/run/mdadm/map /var/run/mdadm.map /lib/initrw/madam/map -+ * The last can easily be change at compile to e.g. somewhere in /dev. - * We read from the first one that exists and write to the first - * one that we can. - */ -@@ -57,6 +57,7 @@ char *mapname[3][3] = { - mapnames("/var/run/mdadm.map"), - mapnames(ALT_RUN "/map") - }; -+char *mapdir[3] = { VAR_RUN, NULL, ALT_RUN }; - - int mapmode[3] = { O_RDONLY, O_RDWR|O_CREAT, O_RDWR|O_CREAT | O_TRUNC }; - char *mapsmode[3] = { "r", "w", "w"}; -@@ -64,8 +65,16 @@ char *mapsmode[3] = { "r", "w", "w"}; - FILE *open_map(int modenum, int *choice) - { - int i; -+ - for (i = 0 ; i < 3 ; i++) { -- int fd = open(mapname[i][modenum], mapmode[modenum], 0600); -+ int fd; -+ if ((mapmode[modenum] & O_CREAT) && -+ mapdir[modenum]) -+ /* Attempt to create directory, don't worry about -+ * failure. -+ */ -+ mkdir(mapdir[modenum], 0755); -+ fd = open(mapname[i][modenum], mapmode[modenum], 0600); - if (fd >= 0) { - *choice = i; - return fdopen(fd, mapsmode[modenum]); -diff --git a/mdmon.c b/mdmon.c -index 961aa77..69c320e 100644 ---- a/mdmon.c -+++ b/mdmon.c -@@ -120,7 +120,7 @@ static int make_pidfile(char *devname) - int fd; - int n; - -- if (mkdir(pid_dir, 0600) < 0 && -+ if (mkdir(pid_dir, 0700) < 0 && - errno != EEXIST) - return -errno; - sprintf(path, "%s/%s.pid", pid_dir, devname); --- -1.6.6.1 - diff --git a/mdadm-3.1.2-mapname.patch b/mdadm-3.1.2-mapname.patch deleted file mode 100644 index a8f88f5..0000000 --- a/mdadm-3.1.2-mapname.patch +++ /dev/null @@ -1,58 +0,0 @@ -From e259df4e63f553c1271fa7d7612c110d2518e572 Mon Sep 17 00:00:00 2001 -From: Doug Ledford -Date: Wed, 17 Mar 2010 10:52:22 -0400 -Subject: [PATCH 3/6] mapfile: if we putting the mapfile in a custom location via ALT_RUN, allow - a custom filename too. - -Signed-off-by: Doug Ledford ---- - Makefile | 3 ++- - mapfile.c | 2 +- - mdadm.h | 3 +++ - 3 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 1035ea8..2aafad0 100644 ---- a/Makefile -+++ b/Makefile -@@ -63,8 +63,9 @@ CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\" - # If you don't have /lib/init/rw you might want to use /dev/.something - # e.g. make ALT_RUN=/dev/.mdadm - ALT_RUN = /lib/init/rw -+ALT_MAPFILE = map - VAR_RUN = /var/run --ALTFLAGS = -DALT_RUN=\"$(ALT_RUN)\" -+ALTFLAGS = -DALT_RUN=\"$(ALT_RUN)\" -DALT_MAPFILE=\"$(ALT_MAPFILE)\" - VARFLAGS = -DVAR_RUN=\"$(VAR_RUN)\" - CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(ALTFLAGS) $(VARFLAGS) - -diff --git a/mapfile.c b/mapfile.c -index 89187ac..74f7256 100644 ---- a/mapfile.c -+++ b/mapfile.c -@@ -55,7 +55,7 @@ - char *mapname[3][3] = { - mapnames(VAR_RUN "/map"), - mapnames("/var/run/mdadm.map"), -- mapnames(ALT_RUN "/map") -+ mapnames(ALT_RUN "/" ALT_MAPFILE) - }; - char *mapdir[3] = { VAR_RUN, NULL, ALT_RUN }; - -diff --git a/mdadm.h b/mdadm.h -index 362b66b..0386129 100644 ---- a/mdadm.h -+++ b/mdadm.h -@@ -87,6 +87,9 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); - #ifndef ALT_RUN - #define ALT_RUN "/lib/init/rw/mdadm" - #endif /* ALT_RUN */ -+#ifndef ALT_MAPFILE -+#define ALT_MAPFILE "map" -+#endif /* ALT_MAPFILE */ - - #include "md_u.h" - #include "md_p.h" --- -1.6.6.1 - diff --git a/mdadm-3.1.2-powerpc-compile.patch b/mdadm-3.1.2-powerpc-compile.patch deleted file mode 100644 index 3dec0d1..0000000 --- a/mdadm-3.1.2-powerpc-compile.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 995511f26e8d661d32d1c3fc42a08960989d1e6d -Author: Doug Ledford -Date: Tue Apr 6 14:04:30 2010 -0400 - - powerpc compile fix - - Signed-off-by: Doug Ledford - -diff --git a/super-intel.c b/super-intel.c -index a196ca3..999b970 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -697,7 +697,7 @@ static void print_imsm_dev(struct imsm_dev *dev, char *uuid, int disk_idx) - printf(" <-- %s", map_state_str[map->map_state]); - printf("\n Checkpoint : %u (%llu)", - __le32_to_cpu(dev->vol.curr_migr_unit), -- blocks_per_migr_unit(dev)); -+ (unsigned long long)blocks_per_migr_unit(dev)); - } - printf("\n"); - printf(" Dirty State : %s\n", dev->vol.dirty ? "dirty" : "clean"); diff --git a/mdadm-3.1.2-rebuild.patch b/mdadm-3.1.2-rebuild.patch deleted file mode 100644 index a9be5c3..0000000 --- a/mdadm-3.1.2-rebuild.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 7bf59f5c16d928d3826fdf0c406d1aac5775e78b Mon Sep 17 00:00:00 2001 -From: Doug Ledford -Date: Wed, 17 Mar 2010 09:28:07 -0400 -Subject: [PATCH 4/6] Only signal a udev change event if we actually write a mapfile in RebuildMap - -Signed-off-by: Doug Ledford ---- - mapfile.c | 14 ++++++++------ - 1 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/mapfile.c b/mapfile.c -index 74f7256..d47fde1 100644 ---- a/mapfile.c -+++ b/mapfile.c -@@ -471,12 +471,14 @@ void RebuildMap(void) - } - sysfs_free(sra); - } -- map_write(map); -+ /* Only trigger a change if we wrote a new map file */ -+ if (map_write(map)) -+ for (md = mdstat ; md ; md = md->next) { -+ struct mdinfo *sra = sysfs_read(-1, md->devnum, -+ GET_VERSION); -+ sysfs_uevent(sra, "change"); -+ sysfs_free(sra); -+ } - map_free(map); -- for (md = mdstat ; md ; md = md->next) { -- struct mdinfo *sra = sysfs_read(-1, md->devnum, GET_VERSION); -- sysfs_uevent(sra, "change"); -- sysfs_free(sra); -- } - free_mdstat(mdstat); - } --- -1.6.6.1 - diff --git a/mdadm-3.1.3-read.patch b/mdadm-3.1.3-read.patch new file mode 100644 index 0000000..7985af7 --- /dev/null +++ b/mdadm-3.1.3-read.patch @@ -0,0 +1,11 @@ +--- mdadm-3.1.3-git07202010/Grow.c.read 2010-07-20 12:18:12.000000000 -0400 ++++ mdadm-3.1.3-git07202010/Grow.c 2010-07-20 12:55:26.816805170 -0400 +@@ -1820,7 +1820,7 @@ int Grow_restart(struct supertype *st, s + } + /* There should be a duplicate backup superblock 4k before here */ + if (lseek64(fd, -4096, 1) < 0 || +- read(fd, &bsb2, 4096) != 4096) ++ read(fd, &bsb2, sizeof(bsb2)) != sizeof(bsb2)) + goto second_fail; /* Cannot find leading superblock */ + if (bsb.magic[15] == '1') + bsbsize = offsetof(struct mdp_backup_super, pad1); diff --git a/mdadm.spec b/mdadm.spec index 407603f..01dad03 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,23 +1,14 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm -Version: 3.1.2 -Release: 10%{?dist} -Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2 +Version: 3.1.3 +Release: 0.git07202010.2%{?dist} +Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-git07202010.tar.bz2 Source1: mdmonitor.init Source2: raid-check Source3: mdadm.rules Source4: mdadm-raid-check-sysconfig -Patch1: mdadm-3.1.2-mapname.patch -Patch2: mdadm-3.1.1-endian.patch -Patch3: mdadm-3.1.2-mapfile.patch -Patch4: mdadm-3.1.2-rebuild.patch -Patch5: mdadm-3.1.2-directory.patch -Patch6: mdadm-3.1.2-decremental.patch -Patch7: mdadm-3.1.2-decremental-2.patch -Patch8: mdadm-3.1.2-decremental-3.patch -Patch9: mdadm-3.1.2-powerpc-compile.patch -Patch10: mdadm-3.1.2-container.patch -Patch11: mdadm-3.1.2-container-2.patch +Patch0: mdadm-3.1.3-read.patch +PAtch1: mdadm-3.1.2-lock.patch Patch20: mdadm-2.5.2-static.patch URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ License: GPLv2+ @@ -38,18 +29,9 @@ almost all functions without a configuration file, though a configuration file can be used to help with some common tasks. %prep -%setup -q -%patch3 -p1 -b .mapfile -%patch1 -p1 -b .mapname -%patch2 -p1 -b .endian -%patch4 -p1 -b .rebuild -%patch5 -p1 -b .directory -%patch6 -p1 -b .decremental -%patch7 -p1 -b .decremental-2 -%patch8 -p1 -b .decremental-3 -%patch9 -p1 -b .powerpc -%patch10 -p1 -b .container -%patch11 -p1 -b .container-2 +%setup -q -n mdadm-3.1.3-git07202010 +%patch0 -p1 -b .read +%patch1 -p1 -b .lock %patch20 -p1 -b .static %build @@ -57,14 +39,13 @@ make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="% %install rm -rf %{buildroot} -make DESTDIR=%{buildroot} MANDIR=%{_mandir} BINDIR=/sbin install install-static -rm -f %{buildroot}/lib/udev/rules.d/* +make DESTDIR=%{buildroot} MANDIR=%{_mandir} BINDIR=/sbin install +rm -f %{buildroot}/lib/udev/rules.d/64* install -Dp -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/mdmonitor install -Dp -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/99-raid-check install -Dp -m 644 %{SOURCE3} %{buildroot}/lib/udev/rules.d/65-md-incremental.rules install -Dp -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/raid-check mkdir -p -m 700 %{buildroot}/var/run/mdadm -ln -s mdadm.8.gz %{buildroot}%{_mandir}/man8/mdadm.static.8.gz %clean rm -rf %{buildroot} @@ -97,6 +78,13 @@ fi %attr(0700,root,root) %dir /var/run/mdadm %changelog +* Tue Jul 20 2010 Doug Ledford - 3.1.3-0.git07202010.2 +- Fix racy locking of mapfile (bz600900) + +* Tue Jul 20 2010 Doug Ledford - 3.1.3-0.git07202010.1 +- Update to latest git repo (3.1.2 plus pending changes, fixes bz602457) +- Remove mdadm.static as its no longer used in initrd creation + * Tue Apr 13 2010 Doug Ledford - 3.1.2-10 - Minor update to mdadm.rules to make anaconda happy diff --git a/sources b/sources index bab8ed6..1e36607 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ c5a39f38c465229767a5af2a4eb81bef mdadm-3.1.2.tar.bz2 +3c1df7259e17ed909ddd4b28e434f10a mdadm-3.1.3-git07202010.tar.bz2 From 337638c822ed1e48dcba6c541d094c4bc33757e9 Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Thu, 22 Jul 2010 14:57:44 +0000 Subject: [PATCH 14/16] - Change git date format to the correct format (YYYYMMDD) - Update to latest upstream push (fixes bz604023) --- .cvsignore | 1 + mdadm-3.1.2-lock.patch | 65 ------------------------------------------ mdadm-3.1.3-read.patch | 11 ------- mdadm.spec | 19 ++++++------ sources | 1 + 5 files changed, 12 insertions(+), 85 deletions(-) delete mode 100644 mdadm-3.1.2-lock.patch delete mode 100644 mdadm-3.1.3-read.patch diff --git a/.cvsignore b/.cvsignore index 6f7aa65..c5f19a0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ mdadm-3.0.3.tar.bz2 mdadm-3.1.1-gcd9a8b5.tar.bz2 mdadm-3.1.2.tar.bz2 mdadm-3.1.3-git07202010.tar.bz2 +mdadm-3.1.3-git20100722.tar.bz2 diff --git a/mdadm-3.1.2-lock.patch b/mdadm-3.1.2-lock.patch deleted file mode 100644 index 8d90870..0000000 --- a/mdadm-3.1.2-lock.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- mdadm-3.1.2/Incremental.c.lock 2010-07-20 17:21:41.879217630 -0400 -+++ mdadm-3.1.2/Incremental.c 2010-07-20 17:21:41.916342431 -0400 -@@ -285,7 +285,9 @@ int Incremental(char *devname, int verbo - - /* 4/ Check if array exists. - */ -- map_lock(&map); -+ if (map_lock(&map)) -+ fprintf(stderr, Name ": failed to get exclusive lock on " -+ "mapfile\n"); - mp = map_by_uuid(&map, info.uuid); - if (mp) - mdfd = open_dev(mp->devnum); -@@ -769,7 +771,9 @@ int Incremental_container(struct superty - struct mdinfo *ra; - struct map_ent *map = NULL; - -- map_lock(&map); -+ if (map_lock(&map)) -+ fprintf(stderr, Name ": failed to get exclusive lock on " -+ "mapfile\n"); - - for (ra = list ; ra ; ra = ra->next) { - int mdfd; ---- mdadm-3.1.2/mapfile.c.lock 2010-07-20 17:21:41.687217302 -0400 -+++ mdadm-3.1.2/mapfile.c 2010-07-20 17:23:23.038096346 -0400 -@@ -58,7 +58,7 @@ char *mapname[2][3] = { - }; - char *mapdir[2] = { MAP_DIR, NULL }; - --int mapmode[3] = { O_RDONLY, O_RDWR|O_CREAT, O_RDWR|O_CREAT|O_TRUNC }; -+int mapmode[3] = { O_RDONLY, O_RDWR|O_CREAT, O_RDWR|O_CREAT|O_EXCL }; - char *mapsmode[3] = { "r", "w", "w"}; - - FILE *open_map(int modenum, int *choice) -@@ -120,14 +120,11 @@ static int lwhich = 0; - int map_lock(struct map_ent **melp) - { - if (lf == NULL) { -- lf = open_map(2, &lwhich); -+ do { -+ lf = open_map(2, &lwhich); -+ } while (lf == NULL && errno == EEXIST); - if (lf == NULL) - return -1; -- if (flock(fileno(lf), LOCK_EX) != 0) { -- fclose(lf); -- lf = NULL; -- return -1; -- } - } - if (*melp) - map_free(*melp); -@@ -137,10 +134,7 @@ int map_lock(struct map_ent **melp) - - void map_unlock(struct map_ent **melp) - { -- if (lf) { -- flock(fileno(lf), LOCK_UN); -- fclose(lf); -- } -+ fclose(lf); - unlink(mapname[lwhich][2]); - lf = NULL; - } diff --git a/mdadm-3.1.3-read.patch b/mdadm-3.1.3-read.patch deleted file mode 100644 index 7985af7..0000000 --- a/mdadm-3.1.3-read.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mdadm-3.1.3-git07202010/Grow.c.read 2010-07-20 12:18:12.000000000 -0400 -+++ mdadm-3.1.3-git07202010/Grow.c 2010-07-20 12:55:26.816805170 -0400 -@@ -1820,7 +1820,7 @@ int Grow_restart(struct supertype *st, s - } - /* There should be a duplicate backup superblock 4k before here */ - if (lseek64(fd, -4096, 1) < 0 || -- read(fd, &bsb2, 4096) != 4096) -+ read(fd, &bsb2, sizeof(bsb2)) != sizeof(bsb2)) - goto second_fail; /* Cannot find leading superblock */ - if (bsb.magic[15] == '1') - bsbsize = offsetof(struct mdp_backup_super, pad1); diff --git a/mdadm.spec b/mdadm.spec index 01dad03..165217a 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,14 +1,12 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 3.1.3 -Release: 0.git07202010.2%{?dist} -Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-git07202010.tar.bz2 +Release: 0.git20100722.1%{?dist} +Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-git20100722.tar.bz2 Source1: mdmonitor.init Source2: raid-check Source3: mdadm.rules Source4: mdadm-raid-check-sysconfig -Patch0: mdadm-3.1.3-read.patch -PAtch1: mdadm-3.1.2-lock.patch Patch20: mdadm-2.5.2-static.patch URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ License: GPLv2+ @@ -29,9 +27,7 @@ almost all functions without a configuration file, though a configuration file can be used to help with some common tasks. %prep -%setup -q -n mdadm-3.1.3-git07202010 -%patch0 -p1 -b .read -%patch1 -p1 -b .lock +%setup -q -n mdadm-3.1.3-git20100722 %patch20 -p1 -b .static %build @@ -40,7 +36,6 @@ make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="% %install rm -rf %{buildroot} make DESTDIR=%{buildroot} MANDIR=%{_mandir} BINDIR=/sbin install -rm -f %{buildroot}/lib/udev/rules.d/64* install -Dp -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/mdmonitor install -Dp -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/99-raid-check install -Dp -m 644 %{SOURCE3} %{buildroot}/lib/udev/rules.d/65-md-incremental.rules @@ -78,11 +73,17 @@ fi %attr(0700,root,root) %dir /var/run/mdadm %changelog +* Thu Jul 22 2010 Doug Ledford - 3.1.3-0.git20100722.1 +- Change git date format to the correct format (YYYYMMDD) +- Update to latest upstream push (fixes bz604023) + * Tue Jul 20 2010 Doug Ledford - 3.1.3-0.git07202010.2 -- Fix racy locking of mapfile (bz600900) +- Fix racy locking of mapfile (bz616596) * Tue Jul 20 2010 Doug Ledford - 3.1.3-0.git07202010.1 - Update to latest git repo (3.1.2 plus pending changes, fixes bz602457) +- Add in 64-md-raid.rules to compensate for it no longer being in udev + (bz581905) - Remove mdadm.static as its no longer used in initrd creation * Tue Apr 13 2010 Doug Ledford - 3.1.2-10 diff --git a/sources b/sources index 1e36607..85cad52 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ c5a39f38c465229767a5af2a4eb81bef mdadm-3.1.2.tar.bz2 3c1df7259e17ed909ddd4b28e434f10a mdadm-3.1.3-git07202010.tar.bz2 +da4e77a02b267d61e0d4073f9a1ec324 mdadm-3.1.3-git20100722.tar.bz2 From 7996d70593de0a8369d4ab2d074e1f0ee1ad3e45 Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Thu, 22 Jul 2010 16:42:56 +0000 Subject: [PATCH 15/16] - Remove the glibc-static buildreq and don't build the static mdadm since we don't install it anyway - Remove the udev file since adding it was supposed to be a rawhide only change --- mdadm.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mdadm.spec b/mdadm.spec index 165217a..f4699c6 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 3.1.3 -Release: 0.git20100722.1%{?dist} +Release: 0.git20100722.2%{?dist} Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-git20100722.tar.bz2 Source1: mdmonitor.init Source2: raid-check @@ -17,7 +17,6 @@ Requires(post): /sbin/service, /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service Requires: udev -BuildRequires: glibc-static %description The mdadm program is used to create, manage, and monitor Linux MD (software @@ -31,11 +30,12 @@ file can be used to help with some common tasks. %patch20 -p1 -b .static %build -make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon +make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm mdmon %install rm -rf %{buildroot} make DESTDIR=%{buildroot} MANDIR=%{_mandir} BINDIR=/sbin install +rm -f %{buildroot}/lib/udev/rules.d/64* install -Dp -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/mdmonitor install -Dp -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/99-raid-check install -Dp -m 644 %{SOURCE3} %{buildroot}/lib/udev/rules.d/65-md-incremental.rules @@ -73,6 +73,11 @@ fi %attr(0700,root,root) %dir /var/run/mdadm %changelog +* Thu Jul 22 2010 Doug Ledford - 3.1.3-0.git20100722.2 +- Remove the glibc-static buildreq and don't build the static mdadm since + we don't install it anyway +- Remove the udev file since adding it was supposed to be a rawhide only change + * Thu Jul 22 2010 Doug Ledford - 3.1.3-0.git20100722.1 - Change git date format to the correct format (YYYYMMDD) - Update to latest upstream push (fixes bz604023) From deeee5bd7851eec04a51511791a555c12a4914c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 03:04:41 +0000 Subject: [PATCH 16/16] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index fe53dcb..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: mdadm -# $Id: Makefile,v 1.2 2007/10/15 19:08:25 notting Exp $ -NAME := mdadm -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13