md: Use REQ_FAILFAST_* on metadata writes where appropriate

[karo-tx-linux.git] / drivers / md / bitmap.c

diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index cf77cbf9ed22b8a38104eff941ab4c53c15e3cf1..c4621571b718e8ddccb96df475c29164a91af7d1 100644 (file)
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -209,11 +209,13 @@ static struct md_rdev *next_active_rdev(struct md_rdev *rdev, struct mddev *mdde
 
 static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait)
 {
-       struct md_rdev *rdev = NULL;
+       struct md_rdev *rdev;
        struct block_device *bdev;
        struct mddev *mddev = bitmap->mddev;
        struct bitmap_storage *store = &bitmap->storage;
 
+restart:
+       rdev = NULL;
        while ((rdev = next_active_rdev(rdev, mddev)) != NULL) {
                int size = PAGE_SIZE;
                loff_t offset = mddev->bitmap_info.offset;
@@ -269,8 +271,8 @@ static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait)
                               page);
        }
 
-       if (wait)
-               md_super_wait(mddev);
+       if (wait && md_super_wait(mddev) < 0)
+               goto restart;
        return 0;
 
  bad_alignment:
@@ -428,6 +430,13 @@ static void bitmap_wait_writes(struct bitmap *bitmap)
                wait_event(bitmap->write_wait,
                           atomic_read(&bitmap->pending_writes)==0);
        else
+               /* Note that we ignore the return value.  The writes
+                * might have failed, but that would just mean that
+                * some bits which should be cleared haven't been,
+                * which is safe.  The relevant bitmap blocks will
+                * probably get written again, but there is no great
+                * loss if they aren't.
+                */
                md_super_wait(bitmap->mddev);
 }