[PATCH 1/4] mdadm.8: change linux version 2.6.40 -> 3.0

[PATCH 1/4] mdadm.8: change linux version 2.6.40 -> 3.0

[Namhyung Kim]

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
 Grow.c     |    2 +-
 mdadm.8.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Grow.c b/Grow.c
index 6e31b94..a4092b5 100644
--- a/Grow.c
+++ b/Grow.c
@@ -1494,7 +1494,7 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
 			goto release;
 		}
 		if (assume_clean) {
-			/* This will fail on kernels newer than 2.6.40 unless
+			/* This will fail on kernels newer than 3.0 unless
 			 * a backport has been arranged.
 			 */
 			if (sra == NULL ||
diff --git a/mdadm.8.in b/mdadm.8.in
index d2d7ef2..44accc0 100644
--- a/mdadm.8.in
+++ b/mdadm.8.in
@@ -706,7 +706,7 @@ facts the operator knows.
 When an array is resized to a larger size with
 .B "\-\-grow \-\-size="
 the new space is normally resynced in that same way that the whole
-array is resynced at creation.  From Linux version 2.6.40,
+array is resynced at creation.  From Linux version 3.0,
 .B \-\-assume\-clean
 can be used with that command to avoid the automatic resync.
 
-- 
1.7.5.2

[PATCH 2/4] mdadm.8: move description of --add under Grow mode

[Namhyung Kim]

It is supposed to be under Grow mode. Since Create/Build/Grow modes
use common options and '-a' is already used for '--auto' in Create/
Build modes, describe it to avoid confusion.
---
 mdadm.8.in |   49 +++++++++++++++++++++++++++----------------------
 1 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/mdadm.8.in b/mdadm.8.in
index 44accc0..d56cd98 100644
--- a/mdadm.8.in
+++ b/mdadm.8.in
@@ -811,6 +811,11 @@ number, and there is no entry in /dev for that number and with a
 non-standard name.  Names that are not in 'standard' format are only
 allowed in "/dev/md/".
 
+This is meaningful with
+.B \-\-create
+or
+.BR \-\-build .
+
 .ig XX
 .\".TP
 .\".BR \-\-symlink = no
@@ -835,6 +840,28 @@ allowed in "/dev/md/".
 .\"
 .XX
 
+.TP
+.BR \-a ", " "\-\-add"
+This option can be used in Grow mode in two cases.
+
+If the target array is a Linear array, then
+.B \-\-add
+can be used to add one or more devices to the array.  They
+are simply catenated on to the end of the array.  Once added, the
+devices cannot be removed.
+
+If the
+.B \-\-raid\-disks
+option is being used to increase the number of devices in an array,
+then
+.B \-\-add
+can be used to add some extra devices to be included in the array.
+In most cases this is not needed as the extra devices can be added as
+spares first, and then the number of raid-disks can be changed.
+However for RAID0, it is not possible to add spares.  So to increase
+the number of devices in a RAID0, it is necessary to set the new
+number of devices, and to add the new devices, in the same command.
+
 .SH For assemble:
 
 .TP
@@ -912,28 +939,6 @@ not as reliable as you would like.
 See this option under Create and Build options.
 
 .TP
-.BR \-a ", " "\-\-add"
-This option can be used in Grow mode in two cases.
-
-If the target array is a Linear array, then
-.B \-\-add
-can be used to add one or more devices to the array.  They
-are simply catenated on to the end of the array.  Once added, the
-devices cannot be removed.
-
-If the
-.B \-\-raid\-disks
-option is being used to increase the number of devices in an array,
-then
-.B \-\-add
-can be used to add some extra devices to be included in the array.
-In most cases this is not needed as the extra devices can be added as
-spares first, and then the number of raid-disks can be changed.
-However for RAID0, it is not possible to add spares.  So to increase
-the number of devices in a RAID0, it is necessary to set the new
-number of devices, and to add the new devices, in the same command.
-
-.TP
 .BR \-b ", " \-\-bitmap=
 Specify the bitmap file that was given when the array was created.  If
 an array has an
-- 
1.7.5.2

[PATCH 3/4] mdadm.8: fix possible typos

[Namhyung Kim]

Fix random typos and add a few of missing words/macros.
Also update RAID website URL as it is not accessible anymore.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
 mdadm.8.in |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/mdadm.8.in b/mdadm.8.in
index d56cd98..5eee54a 100644
--- a/mdadm.8.in
+++ b/mdadm.8.in
@@ -1496,7 +1496,7 @@ the first device given is the md device.
 In the second usage example, all devices listed are treated as md
 devices and assembly is attempted.
 In the third (where no devices are listed) all md devices that are
-listed in the configuration file are assembled.  If not arrays are
+listed in the configuration file are assembled.  If no arrays are
 described by the configuration file, then any arrays that
 can be found on unused devices will be assembled.
 
@@ -1605,7 +1605,7 @@ and no devices are listed,
 will first attempt to assemble all the arrays listed in the config
 file.
 
-In no array at listed in the config (other than those marked
+If no arrays are listed in the config (other than those marked
 .BR <ignore> )
 it will look through the available devices for possible arrays and
 will try to assemble anything that it finds.  Arrays which are tagged
@@ -2205,11 +2205,11 @@ change the "size" attribute for RAID1, RAID4, RAID5 and RAID6.
 .IP \(bu 4
 increase or decrease the "raid\-devices" attribute of RAID0, RAID1, RAID4,
 RAID5, and RAID6.
-.IP \bu 4
+.IP \(bu 4
 change the chunk-size and layout of RAID0, RAID4, RAID5 and RAID6.
-.IP \bu 4
+.IP \(bu 4
 convert between RAID1 and RAID5, between RAID5 and RAID6, between
-RAID0, RAID5, and RAID5, and between RAID0 and RAID10 (in the near-2 mode).
+RAID0, RAID4, and RAID5, and between RAID0 and RAID10 (in the near-2 mode).
 .IP \(bu 4
 add a write-intent bitmap to any array which supports these bitmaps, or
 remove a write-intent bitmap from such an array.
@@ -2255,7 +2255,7 @@ space to start being used.  If the size is increased in this way, a
 are synchronised.
 
 Note that when an array changes size, any filesystem that may be
-stored in the array will not automatically grow for shrink to use or
+stored in the array will not automatically grow or shrink to use or
 vacate the space.  The
 filesystem will need to be explicitly told to use the extra space
 after growing, or to reduce its size
@@ -2264,7 +2264,7 @@ to shrinking the array.
 
 Also the size of an array cannot be changed while it has an active
 bitmap.  If an array has a bitmap, it must be removed before the size
-can be changed. Once the change it complete a new bitmap can be created.
+can be changed. Once the change is complete a new bitmap can be created.
 
 .SS RAID\-DEVICES CHANGES
 
@@ -2440,7 +2440,7 @@ must match one of the names or patterns in a
 line.
 
 .IP +
-Does the device have a valid md superblock.  If a specific metadata
+Does the device have a valid md superblock?  If a specific metadata
 version is request with
 .B \-\-metadata
 or
@@ -2472,6 +2472,7 @@ is not able to positively identify the array as belonging to the
 current host, the device will be rejected.
 ..
 
+.PP
 .I mdadm
 keeps a list of arrays that it has partially assembled in
 .B /var/run/mdadm/map
@@ -2644,7 +2645,7 @@ can be started.
 Any devices which are components of /dev/md4 will be marked as faulty
 and then remove from the array.
 
-.B "  mdadm --grow /dev/md4 --level=6 --backup-file=/root/backup-md4
+.B "  mdadm --grow /dev/md4 --level=6 --backup-file=/root/backup-md4"
 .br
 The array
 .B /dev/md4
@@ -2792,7 +2793,7 @@ configuration file at all.
 For further information on mdadm usage, MD and the various levels of
 RAID, see:
 .IP
-.B http://linux\-raid.osdl.org/
+.B http://raid.wiki.kernel.org/
 .PP
 (based upon Jakob \(/Ostergaard's Software\-RAID.HOWTO)
 .\".PP
-- 
1.7.5.2

[PATCH 4/4] .gitignore: ignore mdadm.8 file

[Namhyung Kim]

mdadm.8 is auto-generated from mdadm.8.in, so ignore it.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2503bd8..7200741 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 /*.man
 /*-stamp
 /mdadm
+/mdadm.8
 /mdadm.udeb
 /mdmon
 /swap_super
-- 
1.7.5.2

Re: [PATCH 1/4] mdadm.8: change linux version 2.6.40 -> 3.0

[NeilBrown]

On Wed, 22 Jun 2011 01:19:02 +0900 Namhyung Kim <namhyung@gmail.com> wrote:

> Signed-off-by: Namhyung Kim <namhyung@gmail.com>
> ---
>  Grow.c     |    2 +-
>  mdadm.8.in |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Grow.c b/Grow.c
> index 6e31b94..a4092b5 100644
> --- a/Grow.c
> +++ b/Grow.c
> @@ -1494,7 +1494,7 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
>  			goto release;
>  		}
>  		if (assume_clean) {
> -			/* This will fail on kernels newer than 2.6.40 unless
> +			/* This will fail on kernels newer than 3.0 unless
>  			 * a backport has been arranged.
>  			 */
>  			if (sra == NULL ||
> diff --git a/mdadm.8.in b/mdadm.8.in
> index d2d7ef2..44accc0 100644
> --- a/mdadm.8.in
> +++ b/mdadm.8.in
> @@ -706,7 +706,7 @@ facts the operator knows.
>  When an array is resized to a larger size with
>  .B "\-\-grow \-\-size="
>  the new space is normally resynced in that same way that the whole
> -array is resynced at creation.  From Linux version 2.6.40,
> +array is resynced at creation.  From Linux version 3.0,
>  .B \-\-assume\-clean
>  can be used with that command to avoid the automatic resync.
>  


Thanks for this and the other 3.  They are all applied and pushed out on my
'master' branch.

Thanks,
NeilBrown