Default to --auto=yes

[thirdparty/mdadm.git] / Query.c

diff --git a/Query.c b/Query.c
index 88df3214b835de0b90a6f1995d4da28367385524..46707edda1aff750487566bc5abcbeec0f59e527 100644 (file)
--- a/Query.c
+++ b/Query.c
@@ -1,7 +1,7 @@
 /*
  * mdadm - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2002 Neil Brown <neilb@cse.unsw.edu.au>
+ * Copyright (C) 2002-2006 Neil Brown <neilb@suse.de>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -44,7 +44,7 @@ int Query(char *dev)
        struct mdinfo info;
        mdu_array_info_t array;
        void *super;
-       struct superswitch *ss = NULL;
+       struct supertype *st = NULL;
 
        unsigned long long larray_size;
        unsigned long array_size;
@@ -95,36 +95,43 @@ int Query(char *dev)
                       array.raid_disks,
                       array.spare_disks, array.spare_disks==1?"":"s");
        }
-       ss = guess_super(fd, dev);
-       if (ss) {
-               superror = ss->load_super(fd, &super, dev);
+       st = guess_super(fd);
+       if (st) {
+               superror = st->ss->load_super(st, fd, &super, dev);
                superrno = errno;
        } else 
                superror = -1;
        close(fd);
        if (superror == 0) {
                /* array might be active... */
-               ss->getinfo_super(&info, super);
-               mddev = get_md_name(info.array.md_minor);
-               disc.number = info.disk.number;
-               activity = "undetected";
-               if (mddev && (fd = open(mddev, O_RDONLY))>=0) {
-                       if (md_get_version(fd) >= 9000 &&       
-                           ioctl(fd, GET_ARRAY_INFO, &array)>= 0) {
-                               if (ioctl(fd, GET_DISK_INFO, &disc) >= 0 &&
-                                   makedev((unsigned)disc.major,(unsigned)disc.minor) == stb.st_rdev)
-                                       activity = "active";
-                               else
-                                       activity = "mismatch";
+               st->ss->getinfo_super(&info, super);
+               if (st->ss->major == 0) {
+                       mddev = get_md_name(info.array.md_minor);
+                       disc.number = info.disk.number;
+                       activity = "undetected";
+                       if (mddev && (fd = open(mddev, O_RDONLY))>=0) {
+                               if (md_get_version(fd) >= 9000 &&       
+                                   ioctl(fd, GET_ARRAY_INFO, &array)>= 0) {
+                                       if (ioctl(fd, GET_DISK_INFO, &disc) >= 0 &&
+                                           makedev((unsigned)disc.major,(unsigned)disc.minor) == stb.st_rdev)
+                                               activity = "active";
+                                       else
+                                               activity = "mismatch";
+                               }
+                               close(fd);
                        }
-                       close(fd);
+               } else {
+                       activity = "unknown";
+                       mddev = "array";
                }
-               printf("%s: device %d in %d device %s %s md%d.  Use mdadm --examine for more detail.\n",
+               printf("%s: device %d in %d device %s %s %s.  Use mdadm --examine for more detail.\n",
                       dev, 
                       info.disk.number, info.array.raid_disks,
                       activity,
                       map_num(pers, info.array.level),
-                      info.array.md_minor);
+                      mddev);
+               if (st->ss->major == 0)
+                       put_md_name(mddev);
        }
        return 0;
 }