Merge branch 'master' of git://github.com/djbw/mdadm

[thirdparty/mdadm.git] / Incremental.c

diff --git a/Incremental.c b/Incremental.c
index 4f107696b95f8e09d07ee4402fa5930494653797..96bfcec7fc586f38a1cec96c746cb188981b0bc7 100644 (file)
--- a/Incremental.c
+++ b/Incremental.c
@@ -385,6 +385,8 @@ int Incremental(char *devname, int verbose, int runstop,
                        }
                }
                sra = sysfs_read(mdfd, fd2devnum(mdfd), (GET_DEVS | GET_STATE));
+               if (!sra)
+                       return 2;
 
                if (sra->devs) {
                        sprintf(dn, "%d:%d", sra->devs->disk.major,
@@ -602,6 +604,9 @@ static int count_active(struct supertype *st, int mdfd, char **availp,
        struct mdinfo *sra = sysfs_read(mdfd, -1, GET_DEVS | GET_STATE);
        char *avail = NULL;
 
+       if (!sra)
+               return 0;
+
        for (d = sra->devs ; d ; d = d->next) {
                char dn[30];
                int dfd;