Merge tag 'md-3.8' of git://neil.brown.name/md

[~shefty/rdma-dev.git] / drivers / md / md.h

diff --git a/drivers/md/md.h b/drivers/md/md.h
index 1e2fc3d9c74c5665b7910f76f4e3c86780c0768e..eca59c3074ef65bee75301f92411d9968adbaf9d 100644 (file)
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -307,6 +307,7 @@ struct mddev {
         * REQUEST:  user-space has requested a sync (used with SYNC)
         * CHECK:    user-space request for check-only, no repair
         * RESHAPE:  A reshape is happening
         * REQUEST:  user-space has requested a sync (used with SYNC)
         * CHECK:    user-space request for check-only, no repair
         * RESHAPE:  A reshape is happening

+        * ERROR:    sync-action interrupted because io-error

         *
         * If neither SYNC or RESHAPE are set, then it is a recovery.
         */
         *
         * If neither SYNC or RESHAPE are set, then it is a recovery.
         */


@@ -320,6 +321,7 @@ struct mddev {
 #define        MD_RECOVERY_CHECK       7
 #define MD_RECOVERY_RESHAPE    8
 #define        MD_RECOVERY_FROZEN      9
 #define        MD_RECOVERY_CHECK       7
 #define MD_RECOVERY_RESHAPE    8
 #define        MD_RECOVERY_FROZEN      9

+#define        MD_RECOVERY_ERROR       10

 
        unsigned long                   recovery;
        /* If a RAID personality determines that recovery (of a particular
 
        unsigned long                   recovery;
        /* If a RAID personality determines that recovery (of a particular