raid6check: Fix build of raid6check

After recent git pull 'make raid6check' did not work anymore, as
sysfs_read() was called with a wrong argument and as check_env()
was used by use_udev(), but not defined.

Replace sysfs_read(..., -1, ...) by sysfs_read(..., NULL, ...)

Move check_env() from util.c to lib.c

Signed-off-by: Bernd Schubert <bernd.schubert@itwm.fraunhofer.de>
Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/lib.c b/lib.c
index 1958029625160aafe39a5310b7a4abbd44d6ffcc..2c3d9368967224c52a7cb6182ce87400f33c9d04 100644 (file)
--- a/lib.c
+++ b/lib.c
@@ -378,6 +378,16 @@ void print_escape(char *str)
        }
 }
 
+int check_env(char *name)
+{
+       char *val = getenv(name);
+
+       if (val && atoi(val) == 1)
+               return 1;
+
+       return 0;
+}
+
 int use_udev(void)
 {
        static int use = -1;

diff --git a/raid6check.c b/raid6check.c
index e9a17a7caa037bb60a53594bb3a7aee81bd9cc7e..f5aeee449f54df2249195adf919f53a3c901ec6c 100644 (file)
--- a/raid6check.c
+++ b/raid6check.c
@@ -386,7 +386,7 @@ int main(int argc, char *argv[])
                goto exitHere;
        }
 
-       info = sysfs_read(mdfd, -1,
+       info = sysfs_read(mdfd, NULL,
                          GET_LEVEL|
                          GET_LAYOUT|
                          GET_DISKS|

diff --git a/util.c b/util.c
index 3ac63e3a7ff2ae27d1d3c88a13631b92481dc5cf..7da69ac1c7569b30c826ba9ff3c82456ca641b08 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1798,16 +1798,6 @@ int start_mdmon(char *devnm)
        return 0;
 }
 
-int check_env(char *name)
-{
-       char *val = getenv(name);
-
-       if (val && atoi(val) == 1)
-               return 1;
-
-       return 0;
-}
-
 __u32 random32(void)
 {
        __u32 rv;