Release mdadm-2.6.9mdadm-2.6.9

8 files changed, 64 insertions, 9 deletions

diff --git a/ANNOUNCE-2.6.9 b/ANNOUNCE-2.6.9
new file mode 100644
index 00000000..ddbc530e
--- /dev/null
+++ b/ANNOUNCE-2.6.9
@@ -0,0 +1,51 @@
+Subject:  ANNOUNCE: mdadm 2.6.9 - A tool for managing Soft RAID under Linux
+
+I am pleased to announce the availability of
+   mdadm version 2.6.9
+
+It is available at the usual places:
+   countrycode=xx.
+   http://www.${countrycode}kernel.org/pub/linux/utils/raid/mdadm/
+and via git at
+   git://neil.brown.name/mdadm
+   http://neil.brown.name/git?p=mdadm
+
+mdadm is a tool for creating, managing and monitoring
+device arrays using the "md" driver in Linux, also
+known as Software RAID arrays.
+
+Release 2.6.9 contains various bug fixes.
+Clearly 2.6.8 was not the final 2.x release.
+Hopefully 2.6.9 will be as I don't want go to 2.7, and
+2.6.10 might be confusing (though I'll probably go that
+way if I need to).
+
+New features will only appear in the 3.x series of which 3.0 will be
+release within a few months.
+
+Changelog Entries:
+ Bernhard Reutner-Fischer (1):
+      mdadm fix compilation for uClibc
+
+ Dustin Kirkland (2):
+      Fail overtly when asprintf fails to allocate memory
+      Typo in earlier patch : asprintf -> vasprintf
+
+ NeilBrown (11):
+      Allow --config in --incremental mode.
+      Kill:  Don't use O_EXCL when --force is used.
+      Assemble: don't assume array is 'clean' unless all devices think it is.
+      Assemble: set stripe_cache_size properly when restarting a reshape.
+      map: rebuild map if it doesn't exist.
+      Free mdstat data structures properly.
+      Fix the used device size in mdadm -D output.
+      Document 'max' option to --grow --size in --help output.
+      Fix possible crash if bitmap metadata is bad.
+      Monitor: send --test message for arrays in /proc/mdstat that aren't in mdadm.conf
+      super1: make sure max_dev grows enough when adding a device to an array.
+
+
+Development of mdadm is sponsored by
+ SUSE Labs, Novell Inc.
+
+NeilBrown  28th November 2008
diff --git a/Makefile b/Makefile
index c0e2b5da..24ad694f 100644
--- a/Makefile
+++ b/Makefile
@@ -81,8 +81,8 @@ STATICSRC = pwgr.c
 STATICOBJS = pwgr.o
 
 ASSEMBLE_SRCS := mdassemble.c Assemble.c Manage.c config.c dlink.c util.c \
-	super0.c super1.c sha1.c
-ASSEMBLE_AUTO_SRCS := mdopen.c mdstat.c sysfs.c
+	super0.c super1.c sha1.c sysfs.c
+ASSEMBLE_AUTO_SRCS := mdopen.c mdstat.c
 ASSEMBLE_FLAGS:= $(CFLAGS) -DMDASSEMBLE
 ifdef MDASSEMBLE_AUTO
 ASSEMBLE_SRCS += $(ASSEMBLE_AUTO_SRCS)
@@ -94,6 +94,9 @@ all : mdadm mdadm.man md.man mdadm.conf.man
 everything: all mdadm.static swap_super test_stripe \
 	mdassemble mdassemble.auto mdassemble.static mdassemble.man \
 	mdadm.Os mdadm.O2
+everything-test: all mdadm.static swap_super test_stripe \
+	mdassemble.auto mdassemble.static mdassemble.man \
+	mdadm.Os mdadm.O2
 # mdadm.uclibc and mdassemble.uclibc don't work on x86-64
 # mdadm.tcc doesn't work..
 
@@ -189,12 +192,12 @@ clean :
 	mdadm.Os mdadm.O2 \
 	mdassemble mdassemble.static mdassemble.auto mdassemble.uclibc \
 	mdassemble.klibc swap_super \
-	init.cpio.gz mdadm.uclibc.static test_stripe
+	init.cpio.gz mdadm.uclibc.static test_stripe mdmon
 
 dist : clean
 	./makedist
 
-testdist : everything clean
+testdist : everything-test clean
 	./makedist test
 
 TAGS :
diff --git a/ReadMe.c b/ReadMe.c
index 3164322b..818be0ad 100644
--- a/ReadMe.c
+++ b/ReadMe.c
@@ -24,7 +24,7 @@
 
 #include "mdadm.h"
 
-char Version[] = Name " - v2.6.8 - 28th November 2008\n";
+char Version[] = Name " - v2.6.9 - 10th March 2009\n";
 
 /*
  * File: ReadMe.c
diff --git a/inventory b/inventory
index 90f494d6..32e08275 100755
--- a/inventory
+++ b/inventory
@@ -23,6 +23,7 @@ ANNOUNCE-2.6.5
 ANNOUNCE-2.6.6
 ANNOUNCE-2.6.7
 ANNOUNCE-2.6.8
+ANNOUNCE-2.6.9
 Assemble.c
 bitmap.c
 bitmap.h
diff --git a/mdadm.8 b/mdadm.8
index 56e6e954..9f9b8ae1 100644
--- a/mdadm.8
+++ b/mdadm.8
@@ -5,7 +5,7 @@
 .\"   the Free Software Foundation; either version 2 of the License, or
 .\"   (at your option) any later version.
 .\" See file COPYING in distribution for details.
-.TH MDADM 8 "" v2.6.8
+.TH MDADM 8 "" v2.6.9
 .SH NAME
 mdadm \- manage MD devices
 .I aka
diff --git a/mdadm.spec b/mdadm.spec
index d682b40d..f18dc30a 100644
--- a/mdadm.spec
+++ b/mdadm.spec
@@ -1,6 +1,6 @@
 Summary:     mdadm is used for controlling Linux md devices (aka RAID arrays)
 Name:        mdadm
-Version:     2.6.8
+Version:     2.6.9
 Release:     1
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tgz
 URL:         http://neil.brown.name/blog/mdadm
diff --git a/mdassemble.8 b/mdassemble.8
index 11792449..77d877f1 100644
--- a/mdassemble.8
+++ b/mdassemble.8
@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.TH MDASSEMBLE 8 "" v2.6.8
+.TH MDASSEMBLE 8 "" v2.6.9
 .SH NAME
 mdassemble \- assemble MD devices
 .I aka
diff --git a/util.c b/util.c
index 64100cff..1b2ae6b2 100644
--- a/util.c
+++ b/util.c
@@ -627,7 +627,6 @@ void print_r10_layout(int layout)
 }
 #endif
 
-#if !defined(MDASSEMBLE) || defined(MDASSEMBLE) && defined(MDASSEMBLE_AUTO)
 int get_mdp_major(void)
 {
 static int mdp_major = -1;
@@ -657,6 +656,7 @@ static int mdp_major = -1;
 }
 
 
+#if !defined(MDASSEMBLE) || defined(MDASSEMBLE) && defined(MDASSEMBLE_AUTO)
 
 char *get_md_name(int dev)
 {