mdadm: load default sysfs attributes after assemblation

[thirdparty/mdadm.git] / Examine.c

diff --git a/Examine.c b/Examine.c
index b939843f595f10369d6d2e7d466c16539e7aa523..7013480d6dd80846cc2f464d3ba23c9e8e21284d 100644 (file)
--- a/Examine.c
+++ b/Examine.c
@@ -1,7 +1,7 @@
 /*
  * mdadm - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2001-2009 Neil Brown <neilb@suse.de>
+ * Copyright (C) 2001-2013 Neil Brown <neilb@suse.de>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -47,12 +47,12 @@ int Examine(struct mddev_dev *devlist,
         *
         *   utime, state etc
         *
-        * If (brief) gather devices for same array and just print a mdadm.conf line including devices=
+        * If (brief) gather devices for same array and just print a mdadm.conf
+        * line including devices=
         * if devlist==NULL, use conf_get_devs()
         */
        int fd;
        int rv = 0;
-       int err = 0;
 
        struct array {
                struct supertype *st;
@@ -62,9 +62,11 @@ int Examine(struct mddev_dev *devlist,
                int spares;
        } *arrays = NULL;
 
-       for (; devlist ; devlist=devlist->next) {
+       for (; devlist ; devlist = devlist->next) {
                struct supertype *st;
                int have_container = 0;
+               int err = 0;
+               int container = 0;
 
                fd = dev_open(devlist->devname, O_RDONLY);
                if (fd < 0) {
@@ -73,44 +75,46 @@ int Examine(struct mddev_dev *devlist,
                                       devlist->devname, strerror(errno));
                                rv = 1;
                        }
-                       err = 1;
+                       continue;
                }
-               else {
-                       int container = 0;
-                       if (forcest)
-                               st = dup_super(forcest);
-                       else if (must_be_container(fd)) {
-                               /* might be a container */
-                               st = super_by_fd(fd, NULL);
-                               container = 1;
-                       } else
-                               st = guess_super(fd);
-                       if (st) {
-                               err = 1;
-                               st->ignore_hw_compat = 1;
-                               if (!container)
-                                       err = st->ss->load_super(st, fd,
-                                                                (c->brief||c->scan) ? NULL
-                                                                :devlist->devname);
-                               if (err && st->ss->load_container) {
-                                       err = st->ss->load_container(st, fd,
-                                                                (c->brief||c->scan) ? NULL
-                                                                :devlist->devname);
-                                       if (!err)
-                                               have_container = 1;
-                               }
-                               st->ignore_hw_compat = 0;
-                       } else {
-                               if (!c->brief) {
-                                       pr_err("No md superblock detected on %s.\n", devlist->devname);
-                                       rv = 1;
-                               }
-                               err = 1;
+
+               if (forcest)
+                       st = dup_super(forcest);
+               else if (must_be_container(fd)) {
+                       /* might be a container */
+                       st = super_by_fd(fd, NULL);
+                       container = 1;
+               } else
+                       st = guess_super(fd);
+               if (st) {
+                       err = 1;
+                       st->ignore_hw_compat = 1;
+                       if (!container)
+                               err = st->ss->load_super(st, fd,
+                                                        (c->brief||c->scan) ? NULL
+                                                        :devlist->devname);
+                       if (err && st->ss->load_container) {
+                               err = st->ss->load_container(st, fd,
+                                                            (c->brief||c->scan) ? NULL
+                                                            :devlist->devname);
+                               if (!err)
+                                       have_container = 1;
                        }
-                       close(fd);
+                       st->ignore_hw_compat = 0;
+               } else {
+                       if (!c->brief) {
+                               pr_err("No md superblock detected on %s.\n", devlist->devname);
+                               rv = 1;
+                       }
+                       err = 1;
                }
-               if (err)
+               close(fd);
+
+               if (err) {
+                       if (st)
+                               st->ss->free_super(st);
                        continue;
+               }
 
                if (c->SparcAdjust)
                        st->ss->update_super(st, NULL, "sparc2.2",
@@ -120,13 +124,13 @@ int Examine(struct mddev_dev *devlist,
                if (c->brief && st->ss->brief_examine_super == NULL) {
                        if (!c->scan)
                                pr_err("No brief listing for %s on %s\n",
-                                       st->ss->name, devlist->devname);
+                                      st->ss->name, devlist->devname);
                } else if (c->brief) {
                        struct array *ap;
                        char *d;
-                       for (ap=arrays; ap; ap=ap->next) {
+                       for (ap = arrays; ap; ap = ap->next) {
                                if (st->ss == ap->st->ss &&
-                                   st->ss->compare_super(ap->st, st)==0)
+                                   st->ss->compare_super(ap->st, st) == 0)
                                        break;
                        }
                        if (!ap) {
@@ -156,7 +160,7 @@ int Examine(struct mddev_dev *devlist,
        }
        if (c->brief) {
                struct array *ap;
-               for (ap=arrays; ap; ap=ap->next) {
+               for (ap = arrays; ap; ap = ap->next) {
                        char sep='=';
                        char *d;
                        int newline = 0;
@@ -166,7 +170,9 @@ int Examine(struct mddev_dev *devlist,
                                newline += printf("   spares=%d", ap->spares);
                        if (c->verbose > 0) {
                                newline += printf("   devices");
-                               for (d=dl_next(ap->devs); d!= ap->devs; d=dl_next(d)) {
+                               for (d = dl_next(ap->devs);
+                                    d != ap->devs;
+                                    d=dl_next(d)) {
                                        printf("%c%s", sep, d);
                                        sep=',';
                                }
@@ -184,3 +190,39 @@ int Examine(struct mddev_dev *devlist,
        }
        return rv;
 }
+
+int ExamineBadblocks(char *devname, int brief, struct supertype *forcest)
+{
+       int fd = dev_open(devname, O_RDONLY);
+       struct supertype *st = forcest;
+       int err = 1;
+
+       if (fd < 0) {
+               pr_err("cannot open %s: %s\n", devname, strerror(errno));
+               return 1;
+       }
+       if (!st)
+               st = guess_super(fd);
+       if (!st) {
+               if (!brief)
+                       pr_err("No md superblock detected on %s\n", devname);
+               goto out;
+       }
+       if (!st->ss->examine_badblocks) {
+               pr_err("%s metadata does not support badblocks\n", st->ss->name);
+               goto out;
+       }
+       err = st->ss->load_super(st, fd, brief ? NULL : devname);
+       if (err)
+               goto out;
+       err = st->ss->examine_badblocks(st, fd, devname);
+
+out:
+       if (fd >= 0)
+               close(fd);
+       if (st) {
+               st->ss->free_super(st);
+               free(st);
+       }
+       return err;
+}