]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - Query.c
Change name of 'c' variable in Detail
[thirdparty/mdadm.git] / Query.c
diff --git a/Query.c b/Query.c
index dc69eb8271ec171c35a418bf883b52cfacb04b6d..b9c209f7993a39513592fdbbc28eb5740504dec6 100644 (file)
--- a/Query.c
+++ b/Query.c
@@ -1,7 +1,7 @@
 /*
  * mdadm - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2002-2006 Neil Brown <neilb@suse.de>
+ * Copyright (C) 2002-2009 Neil Brown <neilb@suse.de>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *    Author: Neil Brown
- *    Email: <neilb@cse.unsw.edu.au>
- *    Paper: Neil Brown
- *           School of Computer Science and Engineering
- *           The University of New South Wales
- *           Sydney, 2052
- *           Australia
+ *    Email: <neilb@suse.de>
  */
 
 #include       "mdadm.h"
@@ -40,7 +35,7 @@ int Query(char *dev)
        int fd = open(dev, O_RDONLY);
        int vers;
        int ioctlerr;
-       int superror, superrno;
+       int superror;
        struct mdinfo info;
        mdu_array_info_t array;
        struct supertype *st = NULL;
@@ -52,7 +47,7 @@ int Query(char *dev)
        char *activity;
 
        if (fd < 0){
-               fprintf(stderr, Name ": cannot open %s: %s\n",
+               pr_err("cannot open %s: %s\n",
                        dev, strerror(errno));
                return 1;
        }
@@ -87,15 +82,14 @@ int Query(char *dev)
                       array.spare_disks, array.spare_disks==1?"":"s");
        }
        st = guess_super(fd);
-       if (st) {
+       if (st)
                superror = st->ss->load_super(st, fd, dev);
-               superrno = errno;
-       } else
+       else
                superror = -1;
        close(fd);
        if (superror == 0) {
                /* array might be active... */
-               st->ss->getinfo_super(st, &info);
+               st->ss->getinfo_super(st, &info, NULL);
                if (st->ss == &super0) {
                        mddev = get_md_name(info.array.md_minor);
                        disc.number = info.disk.number;