Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...

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

diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index de5c42df8d170fd3fb8fa0c13f2d57bc2cff4c7b..26ac8aad0b1993dab39cf91fc692f5dca534cdb5 100644 (file)
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -1566,6 +1566,12 @@ void bitmap_dirty_bits(struct bitmap *bitmap, unsigned long s, unsigned long e)
                sector_t sec = (sector_t)chunk << CHUNK_BLOCK_SHIFT(bitmap);
                bitmap_set_memory_bits(bitmap, sec, 1);
                bitmap_file_set_bit(bitmap, sec);
+               if (sec < bitmap->mddev->recovery_cp)
+                       /* We are asserting that the array is dirty,
+                        * so move the recovery_cp address back so
+                        * that it is obvious that it is dirty
+                        */
+                       bitmap->mddev->recovery_cp = sec;
        }
 }