util: make env checking more generic

Change the "env_check_mdmon" function to be more generic, accepting
and environment variable name, as soon we will have a new use for it.

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/mdadm.h b/mdadm.h
index f6f2c1d16a65c32be6afde7890bde6f1c76e938b..69afe7cc674127391b0fba7d3613a18e682c523d 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -809,7 +809,7 @@ extern int open_container(int fd);
 
 extern int mdmon_running(int devnum);
 extern int signal_mdmon(int devnum);
-extern int env_no_mdmon(void);
+extern int check_env(char *name);
 extern int start_mdmon(int devnum);
 
 extern char *devnum2devname(int num);

diff --git a/mdmon.c b/mdmon.c
index bfad18a7e6c2a88440304fd736c945e3ec63fc66..cb4173a020dc51549478fdf1b0e1899b2ad7c2cf 100644 (file)
--- a/mdmon.c
+++ b/mdmon.c
@@ -241,7 +241,7 @@ static void wake_me(int sig)
 static int do_fork(void)
 {
        #ifdef DEBUG
-       if (env_no_mdmon())
+       if (check_env("MDADM_NO_MDMON"))
                return 0;
        #endif
 

diff --git a/super-intel.c b/super-intel.c
index c300503c30a1b2fb895adc5020ed32edccded03a..f5ce06bdacb055f5373369d076e800eb8e7b983b 100644 (file)
--- a/super-intel.c
+++ b/super-intel.c
@@ -213,17 +213,6 @@ struct imsm_update_add_disk {
        enum imsm_update_type type;
 };
 
-static int imsm_env_devname_as_serial(void)
-{
-       char *val = getenv("IMSM_DEVNAME_AS_SERIAL");
-
-       if (val && atoi(val) == 1)
-               return 1;
-
-       return 0;
-}
-
-
 static struct supertype *match_metadata_desc_imsm(char *arg)
 {
        struct supertype *st;
@@ -1017,7 +1006,7 @@ static int imsm_read_serial(int fd, char *devname,
 
        rv = scsi_get_serial(fd, scsi_serial, sizeof(scsi_serial));
 
-       if (rv && imsm_env_devname_as_serial()) {
+       if (rv && check_env("IMSM_DEVNAME_AS_SERIAL")) {
                memset(serial, 0, MAX_RAID_SERIAL_LEN);
                fd2devname(fd, (char *) serial);
                return 0;

diff --git a/util.c b/util.c
index f073bce0ad5ad2e1129e7bafef3947b6ce770363..1806e08f6978e071f1084cbfd0fe7318e47f9cee 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1209,7 +1209,7 @@ int start_mdmon(int devnum)
                NULL
        };
 
-       if (env_no_mdmon())
+       if (check_env("MDADM_NO_MDMON"))
                return 0;
 
        len = readlink("/proc/self/exe", pathbuf, sizeof(pathbuf));
@@ -1248,9 +1248,9 @@ int start_mdmon(int devnum)
        return 0;
 }
 
-int env_no_mdmon(void)
+int check_env(char *name)
 {
-       char *val = getenv("MDADM_NO_MDMON");
+       char *val = getenv(name);
 
        if (val && atoi(val) == 1)
                return 1;