Merge whitespace changes over

[thirdparty/xfsprogs-dev.git] / libdisk / md.c

diff --git a/libdisk/md.c b/libdisk/md.c
index 85dd3efa9e2ae3d2ce2befcecdf494ab1095a6db..64009bf90902b9f4c44b7f6c19257874daaaa09c 100644 (file)
--- a/libdisk/md.c
+++ b/libdisk/md.c
@@ -1,32 +1,32 @@
 /*
  * Copyright (c) 2000-2001 Silicon Graphics, Inc.  All Rights Reserved.
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
  * published by the Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it would be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
+ *
  * Further, this software is distributed without any warranty that it is
  * free of the rightful claim of any third person regarding infringement
  * or the like.  Any license provided herein, whether implied or
  * otherwise, applies only to this software file.  Patent licenses, if
  * any, provided herein do not apply to combinations of this program with
  * other software, or any other product whatsoever.
- * 
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write the Free Software Foundation, Inc., 59
  * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
+ *
  * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
  * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
+ *
+ * http://www.sgi.com
+ *
+ * For further information regarding this notice, see:
+ *
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 
@@ -70,8 +70,14 @@ md_get_subvol_stripe(
                close(fd);
 
                /* Check state */
-               if (md.state) {
-                       fprintf(stderr, _("MD array %s not in clean state\n"),
+               if (!(md.state & (1 << MD_SB_CLEAN))) {
+                       fprintf(stderr,
+                               _("warning - MD array %s not in clean state\n"),
+                               dfile);
+               }
+               if (md.state & (1 << MD_SB_ERRORS)) {
+                       fprintf(stderr,
+                               _("warning - MD array %s in error state\n"),
                                dfile);
                        exit(1);
                }