[PATCH] md: convert 'faulty' and 'in_sync' fields to bits in 'flags' field

This has the advantage of removing the confusion caused by 'rdev_t' and
'mddev_t' both having 'in_sync' fields.

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/include/linux/raid/md_k.h b/include/linux/raid/md_k.h
index 200c69e34fc..11629f92180 100644
--- a/include/linux/raid/md_k.h
+++ b/include/linux/raid/md_k.h
@@ -117,10 +117,10 @@ struct mdk_rdev_s
          * It can never have faulty==1, in_sync==1
          * This reduces the burden of testing multiple flags in many cases
          */
-        int faulty;                     /* if faulty do not issue IO requests */
-        int in_sync;                    /* device is a full member of the array */
 
-        unsigned long   flags;          /* Should include faulty and in_sync here. */
+        unsigned long   flags;
+#define Faulty          1               /* device is known to have a fault */
+#define In_sync         2               /* device is in_sync with rest of array */
 #define WriteMostly     4               /* Avoid reading if at all possible */
 
         int desc_nr;                    /* descriptor index in the superblock */
@@ -247,7 +247,7 @@ struct mddev_s
 
 static inline void rdev_dec_pending(mdk_rdev_t *rdev, mddev_t *mddev)
 {
-        int faulty = rdev->faulty;
+        int faulty = test_bit(Faulty, &rdev->flags);
         if (atomic_dec_and_test(&rdev->nr_pending) && faulty)
                 set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
 }