2.0-devel-1 release

Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>

diff --git a/ChangeLog b/ChangeLog
index 420b86a2e92059fa797ca2a265ae74cb2b1df210..29cfc3a9d0097ec8177ba262588e0f5d0583ec79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,11 @@ Changes Prior to 1.10.0 release
     -   Open sub-devices with O_EXCL to detect if already in use
     -   Make sure superblock updates are flushed directly to disk.
        
+Changes Prior to 2.0-deve-1 release
+    -   Support for version-1 superblock.  See --metadata option.
+    -   Support for bitmap based intent logging.
+    -   Minor fixes.
+       
 Changes Prior to 1.9.0 release
     -   Fix rpm build problem (stray %)
     -   Minor manpage updates
@@ -28,8 +33,6 @@ Changes Prior to 1.9.0 release
        mdadm /dev/md0 -A /dev/sd[ab]
        works.
     -   Assume '-Q' if just a device is given, rather than being silent.
-
-Changes Prior to this release
     -   Change "dirty" status to "active" as it was confusing people.
        
 Changes Prior to 1.8.0 release

diff --git a/ReadMe.c b/ReadMe.c
index 856a8effcbeb604c0f0d537e185a59990a9e0511..1b8d45fad0821c38740c9f9b54907caa403ec932 100644 (file)
--- a/ReadMe.c
+++ b/ReadMe.c
@@ -29,7 +29,7 @@
 
 #include "mdadm.h"
 
-char Version[] = Name " - v1.11.0 - 11 April 2005\n";
+char Version[] = Name " - v2.0-devel-1 - DEVELOPMENT VERSION NOT FOR REGULAR USE - 18 February 2005\n";
 
 /*
  * File: ReadMe.c

diff --git a/bitmap.h b/bitmap.h
index 17027e083cf82d7b5d1c03fc30b7cf35e9ef27c5..811485d14082750c6d1840303209bebba04bd2cd 100644 (file)
--- a/bitmap.h
+++ b/bitmap.h
@@ -141,7 +141,7 @@ typedef struct bitmap_super_s {
        __u32 chunksize;    /* 52  the bitmap chunk size in bytes */
        __u32 daemon_sleep; /* 56  seconds between disk flushes */
 
-       __u8  pad[4096 - 60]; /* set to zero */
+       __u8  pad[256 - 60]; /* set to zero */
 } bitmap_super_t;
 
 /* notes:

diff --git a/inventory b/inventory
index 04e957b6aaf66777352850258dc506be44b69391..0a5dc999b67cdf43ce74f19bdf482f65e18aacd1 100644 (file)
--- a/inventory
+++ b/inventory
@@ -12,6 +12,7 @@ ANNOUNCE-1.7.0
 ANNOUNCE-1.8.0
 ANNOUNCE-1.8.1
 ANNOUNCE-1.9.0
+ANNOUNCE-2.0-devel-1
 Assemble.c
 Build.c
 COPYING
@@ -28,6 +29,8 @@ Monitor.c
 Query.c
 ReadMe.c
 TODO
+bitmap.c
+bitmap.h
 config.c
 dlink.c
 dlink.h
@@ -48,4 +51,6 @@ mdstat.c
 misc/
 misc/syslog-events
 raid5extend.c
+super0.c
+super1.c
 util.c

diff --git a/mdadm.8 b/mdadm.8
index 45e0ff9ce884c53e8eb35001d9f735bacfa33f4d..2555f63daf5e757f33c32917f0df3b9d37ffda85 100644 (file)
--- a/mdadm.8
+++ b/mdadm.8
@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.TH MDADM 8 "" v1.11.1
+.TH MDADM 8 "" v2.0-devel-1
 .SH NAME
 mdadm \- manage MD devices
 .I aka
@@ -165,6 +165,10 @@ mode.
 .BR -G ", " --grow
 Change the size or shape of an active array.
 
+.TP
+.BR -X ", " --examine-bitmap
+Report information about a bitmap file.
+
 .TP
 .BR -h ", " --help
 Display help message or, after above option, mode specific help
@@ -190,6 +194,18 @@ Be less verbose.  This is used with
 and
 .BR --examine .
 
+.TP
+.BR -b ", " --bitmap=
+Give the name of a bitmap file to use with this array.  Can be used
+with --create (file should not exist) or --assemble (file should
+exist).
+
+.TP
+.BR --bitmap-chunk=
+Set the Chunksize of the bitmap. Each bit corresponds to that many
+Kilobytes of storage. Default is 4.
+
+
 .TP
 .BR -f ", " --force
 Be more forceful about certain operations.  See the various modes of
@@ -319,6 +335,16 @@ must be specified before the fault mode is specified.
 .BR --layout=
 same as --parity
 
+.TP
+.BR -b ", " --bitmap=
+Specify a file to store a write-intent bitmap in.  The file should not
+exist unless --force is also given.  The same file should be provided
+when assembling the array.
+
+.TP
+.BR --bitmap-chunk=
+Specifty the chunksize for the bitmap.
+
 .TP
 .BR -n ", " --raid-devices=
 Specify the number of active devices in the array.  This, plus the
@@ -467,6 +493,10 @@ an attempt will be made to start it anyway.
 .BR -a ", " "--auto{=no,yes,md,mdp,part}"
 See this option under Create and Build options.
 
+.TP
+.BR -b ", " --bitmap=
+Specify the bitmap file that was given when the array was created.
+
 .TP
 .BR -U ", " --update=
 Update the superblock on each device while assembling the array.  The

diff --git a/mdadm.spec b/mdadm.spec
index cb42ed6413c2b90328268e6370b2444f0aa973ee..a517242de08f849659c6ba62a63963b95196e974 100644 (file)
--- 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:     1.11.1
+Version:     2.0-devel-1
 Release:     1
 Source:      http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz
 URL:         http://www.cse.unsw.edu.au/~neilb/source/mdadm/