imsm: Do not require MDADM_EXPERIMENTAL flag anymore

Grow feature for IMSM metadata is currently fully supported and tested.
Reshape operation is not in experimental state anymore, so usage of this
flag is unnecessary.

Do not require MDADM_EXPERIMENTAL flag and remove obsolete information
from manual.

Signed-off-by: Michal Zylowski <michal.zylowski@intel.com>
Acked-by: Mariusz Dabrowski <mariusz.dabrowski@intel.com>
Acked-by: Roman Sobanski <roman.sobanski@intel.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>

diff --git a/mdadm.8.in b/mdadm.8.in
index ea45bbc8eb826de24d23218dafb6552f850cd579..d6bb3faee51913a1229f1b60e4dfe0b6bdf77ab3 100644 (file)
--- a/mdadm.8.in
+++ b/mdadm.8.in
@@ -2718,27 +2718,15 @@ above.  Resizing arrays in an IMSM container with
 .B "--grow --size"
 is not yet supported.
 
 .B "--grow --size"
 is not yet supported.
 

-Grow functionality (e.g. expand a number of raid devices) for Intel's
-IMSM container format has an experimental status. It is guarded by the
-.B MDADM_EXPERIMENTAL
-environment variable which must be set to '1' for a GROW command to
-succeed.
-This is for the following reasons:
-
-.IP 1.
-Intel's native IMSM check-pointing is not fully tested yet.
-This can causes IMSM incompatibility during the grow process: an array
-which is growing cannot roam between Microsoft Windows(R) and Linux
-systems.
-
-.IP 2.
-Interrupting a grow operation is not recommended, because it
-has not been fully tested for Intel's IMSM container format yet.
-

 .PP
 .PP

-Note: Intel's native checkpointing doesn't use
+Notes:
+.IP \(bu 4
+Intel's native checkpointing doesn't use

 .B --backup-file
 option and it is transparent for assembly feature.
 .B --backup-file
 option and it is transparent for assembly feature.

+.IP \(bu 4
+Roaming between Windows(R) and Linux systems for IMSM metadata is not
+supported during grow process.

 
 .SS SIZE CHANGES
 Normally when an array is built the "size" is taken from the smallest
 
 .SS SIZE CHANGES
 Normally when an array is built the "size" is taken from the smallest

diff --git a/mdadm.h b/mdadm.h
index 61bc7afe036ea4af3632866736b6d6ddc48f1140..387e681aa4edb1fe2ea90c0c7fb15865aee66b64 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -1485,7 +1485,6 @@ extern struct mddev_ident *conf_match(struct supertype *st,
                                      struct mdinfo *info,
                                      char *devname,
                                      int verbose, int *rvp);
                                      struct mdinfo *info,
                                      char *devname,
                                      int verbose, int *rvp);

-extern int experimental(void);

 
 extern void free_line(char *line);
 extern int match_oneof(char *devices, char *devname);
 
 extern void free_line(char *line);
 extern int match_oneof(char *devices, char *devname);

diff --git a/super-intel.c b/super-intel.c
index 12f60f659f131470838b911197d08f9d50c04d74..a01be132e3a3ac1286193ca2087043fb7d595014 100644 (file)
--- a/super-intel.c
+++ b/super-intel.c
@@ -11607,9 +11607,6 @@ static int imsm_reshape_super(struct supertype *st, unsigned long long size,
        dprintf("for level      : %i\n", geo.level);
        dprintf("for raid_disks : %i\n", geo.raid_disks);
 
        dprintf("for level      : %i\n", geo.level);
        dprintf("for raid_disks : %i\n", geo.raid_disks);
 

-       if (experimental() == 0)
-               return ret_val;
-

        if (strcmp(st->container_devnm, st->devnm) == 0) {
                /* On container level we can only increase number of devices. */
                dprintf("imsm: info: Container operation\n");
        if (strcmp(st->container_devnm, st->devnm) == 0) {
                /* On container level we can only increase number of devices. */
                dprintf("imsm: info: Container operation\n");

diff --git a/tests/env-imsm-template b/tests/env-imsm-template
index bc5f585213bc26958ab05d2955f99a4f7a792599..ea45bae9608b6516004e3c7b1464af0fd6a88f54 100644 (file)
--- a/tests/env-imsm-template
+++ b/tests/env-imsm-template
@@ -65,7 +65,6 @@ imsm_check() {
 export IMSM_NO_PLATFORM=1
 export IMSM_DEVNAME_AS_SERIAL=1
 export IMSM_TEST_OROM=1
 export IMSM_NO_PLATFORM=1
 export IMSM_DEVNAME_AS_SERIAL=1
 export IMSM_TEST_OROM=1

-export MDADM_EXPERIMENTAL=1

 container=/dev/md/container
 member0=/dev/md/vol0
 member1=/dev/md/vol1
 container=/dev/md/container
 member0=/dev/md/vol0
 member1=/dev/md/vol1

diff --git a/util.c b/util.c
index 4adbbff0295e30c984f59b5c5a5c4bfe024e1d60..c26cf5f3f78b41662d988025a13ecc24a0ba54b2 100644 (file)
--- a/util.c
+++ b/util.c
@@ -2149,16 +2149,6 @@ void append_metadata_update(struct supertype *st, void *buf, int len)
 unsigned int __invalid_size_argument_for_IOC = 0;
 #endif
 
 unsigned int __invalid_size_argument_for_IOC = 0;
 #endif
 

-int experimental(void)
-{
-       if (check_env("MDADM_EXPERIMENTAL"))
-               return 1;
-       else {
-               pr_err("To use this feature MDADM_EXPERIMENTAL environment variable has to be defined.\n");
-               return 0;
-       }
-}
-

 /* Pick all spares matching given criteria from a container
  * if min_size == 0 do not check size
  * if domlist == NULL do not check domains
 /* Pick all spares matching given criteria from a container
  * if min_size == 0 do not check size
  * if domlist == NULL do not check domains