1 files changed, 14 insertions, 1 deletions

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 34846856dbc6..32fc19c540d4 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5599,7 +5599,7 @@ static int get_array_info(struct mddev * mddev, void __user * arg)
         if (mddev->in_sync)
                 info.state = (1<<MD_SB_CLEAN);
         if (mddev->bitmap && mddev->bitmap_info.offset)
-                info.state = (1<<MD_SB_BITMAP_PRESENT);
+                info.state |= (1<<MD_SB_BITMAP_PRESENT);
         info.active_disks  = insync;
         info.working_disks = working;
         info.failed_disks  = failed;
@@ -7501,6 +7501,19 @@ void md_do_sync(struct md_thread *thread)
                             rdev->recovery_offset < j)
                                 j = rdev->recovery_offset;
                 rcu_read_unlock();
+
+                /* If there is a bitmap, we need to make sure all
+                 * writes that started before we added a spare
+                 * complete before we start doing a recovery.
+                 * Otherwise the write might complete and (via
+                 * bitmap_endwrite) set a bit in the bitmap after the
+                 * recovery has checked that bit and skipped that
+                 * region.
+                 */
+                if (mddev->bitmap) {
+                        mddev->pers->quiesce(mddev, 1);
+                        mddev->pers->quiesce(mddev, 0);
+                }
         }
 
         printk(KERN_INFO "md: %s of RAID array %s\n", desc, mdname(mddev));