Status: ok 2.0-devel-1 release Signed-off-by: Neil Brown ### Diffstat output ./ChangeLog | 7 +++++-- ./ReadMe.c | 2 +- ./bitmap.h | 2 +- ./inventory | 5 +++++ ./mdadm.8 | 32 +++++++++++++++++++++++++++++++- ./mdadm.spec | 2 +- 6 files changed, 44 insertions(+), 6 deletions(-) diff ./ChangeLog~current~ ./ChangeLog --- ./ChangeLog~current~ 2005-04-04 15:43:31.000000000 +1000 +++ ./ChangeLog 2005-04-04 15:43:31.000000000 +1000 @@ -1,3 +1,8 @@ +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 @@ -20,8 +25,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 ./ReadMe.c~current~ ./ReadMe.c --- ./ReadMe.c~current~ 2005-04-04 15:43:31.000000000 +1000 +++ ./ReadMe.c 2005-04-04 15:43:31.000000000 +1000 @@ -29,7 +29,7 @@ #include "mdadm.h" -char Version[] = Name " - v1.9.0 - 04 February 2005\n"; +char Version[] = Name " - v2.0-devel-1 - DEVELOPMENT VERSION NOT FOR REGULAR USE - 18 February 2005\n"; /* * File: ReadMe.c diff ./bitmap.h~current~ ./bitmap.h --- ./bitmap.h~current~ 2005-04-04 15:43:31.000000000 +1000 +++ ./bitmap.h 2005-04-04 15:43:31.000000000 +1000 @@ -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 ./inventory~current~ ./inventory --- ./inventory~current~ 2005-04-04 15:43:31.000000000 +1000 +++ ./inventory 2005-04-04 15:43:31.000000000 +1000 @@ -10,6 +10,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 @@ -26,6 +27,8 @@ Monitor.c Query.c ReadMe.c TODO +bitmap.c +bitmap.h config.c dlink.c dlink.h @@ -46,4 +49,6 @@ mdstat.c misc/ misc/syslog-events raid5extend.c +super0.c +super1.c util.c diff ./mdadm.8~current~ ./mdadm.8 --- ./mdadm.8~current~ 2005-04-04 15:43:31.000000000 +1000 +++ ./mdadm.8 2005-04-04 15:43:31.000000000 +1000 @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH MDADM 8 "" v1.9.1 +.TH MDADM 8 "" v2.0-devel-1 .SH NAME mdadm \- manage MD devices .I aka @@ -166,6 +166,10 @@ mode. 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 message. @@ -191,6 +195,18 @@ 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 the exact meaning of this option in different contexts. @@ -320,6 +336,16 @@ must be specified before the fault mode 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 number of spare devices (see below) must equal the number of @@ -468,6 +494,10 @@ an attempt will be made to start it anyw 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 argument given to this flag can be one of diff ./mdadm.spec~current~ ./mdadm.spec --- ./mdadm.spec~current~ 2005-04-04 15:43:31.000000000 +1000 +++ ./mdadm.spec 2005-04-04 15:43:31.000000000 +1000 @@ -1,6 +1,6 @@ Summary: mdadm is used for controlling Linux md devices (aka RAID arrays) Name: mdadm -Version: 1.9.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/