Fixed old documentation in --grow --help

diff --git a/ChangeLog b/ChangeLog
index 98736dfe8ccd43e7cfd31e8402fa4fc021b77642..79d66e5bf92924f13604fe7c3ca8456c6bfebea3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Changes Prior to this release
     -   Fully support --grow for raid6.  If a reshape crashed during the
        critical period, mdadm wouldn't restore the Q information
        properly.
+    -   Update documentation for --grow.
 
 Changes Prior to 2.6 release
     -   Fixed UUID printing in "--detail --brief" for version1 metadata.

diff --git a/ReadMe.c b/ReadMe.c
index 4e0a949ed8051f401cbeaddc93562bb4b46cde7d..6ffb0f4ece538ba4bab6d0fb4ef1a93d376cca13 100644 (file)
--- a/ReadMe.c
+++ b/ReadMe.c
@@ -504,16 +504,21 @@ char Help_grow[] =
 "\n"
 "This usage causes mdadm to attempt to reconfigure a running array.\n"
 "This is only possibly if the kernel being used supports a particular\n"
-"reconfiguration.  This version only supports changing the number of\n"
-"devices in a RAID1, and changing the active size of all devices in\n"
-"a RAID1/4/5/6.\n"
+"reconfiguration.  This version supports changing the number of\n"
+"devices in a RAID1/5/6, changing the active size of all devices in\n"
+"a RAID1/4/5/6, adding or removing a write-intent bitmap, and changing\n"
+"the error mode for a 'FAULTY' array.\n"
 "\n"
 "Options that are valid with the grow (-G --grow) mode are:\n"
+"  --level=       -l   : Tell mdadm what level the array is so that it can\n"
+"                      : interpret '--layout' properly.\n"
+"  --layout=      -p   : For a FAULTY array, set/change the error mode.\n"
 "  --size=        -z   : Change the active size of devices in an array.\n"
 "                      : This is useful if all devices have been replaced\n"
 "                      : with larger devices.\n"
-"  --raid-disks=  -n   : Change the number of active devices in a RAID1\n"
+"  --raid-disks=  -n   : Change the number of active devices in an array.\n"
 "                      : array.\n"
+"  --bitmap=      -b   : Add or remove a write-intent bitmap.\n"
 ;
 
 char Help_incr[] =

diff --git a/mdadm.8 b/mdadm.8
index 2270c7d78c77d83369aa3d97302fa6f0cb54a65d..f0a609c135a810980b174e4bc9f78f1d87828a4a 100644 (file)
--- a/mdadm.8
+++ b/mdadm.8
@@ -129,7 +129,7 @@ missing, spare, or failed drives, so there is nothing to monitor.
 Grow (or shrink) an array, or otherwise reshape it in some way.
 Currently supported growth options including changing the active size
 of component devices in RAID level 1/4/5/6 and changing the number of
-active devices in RAID1.
+active devices in RAID1/5/6.
 
 .TP
 .B "Incremental Assembly"
@@ -346,7 +346,8 @@ multipath, raid0 and raid1.  It is never allowed for raid4 or raid5.
 .br
 This number can only be changed using
 .B --grow
-for RAID1 arrays, and only on kernels which provide necessary support.
+for RAID1, RAID5 and RAID6 arrays, and only on kernels which provide
+necessary support.
 
 .TP
 .BR -x ", " --spare-devices=
@@ -1660,7 +1661,7 @@ Currently the only support available is to
 change the "size" attribute
 for RAID1, RAID5 and RAID6.
 .IP \(bu 4
-increase the "raid-disks" attribute of RAID1 and RAID5.
+increase the "raid-disks" attribute of RAID1, RAID5, and RAID6.
 .IP \(bu 4
 add a write-intent bitmap to any array which support these bitmaps, or
 remove a write-intent bitmap from such an array.