[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, 2 deletions

diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index e59694bc5758..c5fa4c2a5af1 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -271,7 +271,8 @@ static struct page *read_sb_page(mddev_t *mddev, long offset, unsigned long inde
                 return ERR_PTR(-ENOMEM);
 
         ITERATE_RDEV(mddev, rdev, tmp) {
-                if (! rdev->in_sync || rdev->faulty)
+                if (! test_bit(In_sync, &rdev->flags)
+                    || test_bit(Faulty, &rdev->flags))
                         continue;
 
                 target = (rdev->sb_offset << 1) + offset + index * (PAGE_SIZE/512);
@@ -291,7 +292,8 @@ static int write_sb_page(mddev_t *mddev, long offset, struct page *page, int wai
         struct list_head *tmp;
 
         ITERATE_RDEV(mddev, rdev, tmp)
-                if (rdev->in_sync && !rdev->faulty)
+                if (test_bit(In_sync, &rdev->flags)
+                    && !test_bit(Faulty, &rdev->flags))
                         md_super_write(mddev, rdev,
                                        (rdev->sb_offset<<1) + offset
                                        + page->index * (PAGE_SIZE/512),