let '-a' be specified for Incremental mode

From: Dan Williams <dan.j.williams@intel.com>

Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/mdadm.c b/mdadm.c
index b4b503dd288b1b70ec27419350d0b9d385aaf284..f2a7bcd53d3ec8da5ce13f13bc8b81640974f4b8 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -199,7 +199,8 @@ int main(int argc, char *argv[])
                case 'G': newmode = GROW;
                        shortopt = short_bitmap_options;
                        break;
-               case 'I': newmode = INCREMENTAL; break;
+               case 'I': newmode = INCREMENTAL;
+                       shortopt = short_bitmap_auto_options; break;
                case AutoDetect:
                        newmode = AUTODETECT; break;
 
@@ -511,6 +512,7 @@ int main(int argc, char *argv[])
 
                case O(CREATE,'a'):
                case O(BUILD,'a'):
+               case O(INCREMENTAL,'a'):
                case O(ASSEMBLE,'a'): /* auto-creation of device node */
                        autof = parse_auto(optarg, "--auto flag", 0);
                        continue;

diff --git a/util.c b/util.c
index 514b7139252120b50e5f4d80bcaa246290c1d023..108f3c168d2414aa1e0473d7d0042a1933935584 100644 (file)
--- a/util.c
+++ b/util.c
@@ -884,11 +884,14 @@ int find_free_devnum(int use_partitions)
        for (devnum = 127; devnum != 128;
             devnum = devnum ? devnum-1 : (1<<22)-1) {
                char *dn;
-               if (mddev_busy(use_partitions ? (-1-devnum) : devnum))
+               int _devnum;
+
+               _devnum = use_partitions ? (-1-devnum) : devnum;
+               if (mddev_busy(_devnum))
                        continue;
                /* make sure it is new to /dev too, at least as a
                 * non-standard */
-               dn = map_dev(dev2major(devnum), dev2minor(devnum), 0);
+               dn = map_dev(dev2major(_devnum), dev2minor(_devnum), 0);
                if (dn && ! is_standard(dn, NULL))
                        continue;
                break;