[PATCH] md: fix bug when raid1 attempts a partial reconstruct.

The logic here is wrong.  if fullsync is 0, it WILL BUG.

Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 10 insertions, 7 deletions

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 0fd4c3bfc851..9d9acc3e51a7 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1237,13 +1237,16 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
                         len = (max_sector - sector_nr) << 9;
                 if (len == 0)
                         break;
-                if (!conf->fullsync && sync_blocks == 0)
-                        if (!bitmap_start_sync(mddev->bitmap,
-                                               sector_nr, &sync_blocks))
-                                break;
-                if (sync_blocks < (PAGE_SIZE>>9))
-                        BUG();
-                if (len > (sync_blocks<<9)) len = sync_blocks<<9;
+                if (!conf->fullsync) {
+                        if (sync_blocks == 0) {
+                                if (!bitmap_start_sync(mddev->bitmap,
+                                                       sector_nr, &sync_blocks))
+                                        break;
+                                if (sync_blocks < (PAGE_SIZE>>9))
+                                        BUG();
+                                if (len > (sync_blocks<<9)) len = sync_blocks<<9;
+                        }
+                }
 
                 for (i=0 ; i < conf->raid_disks; i++) {
                         bio = r1_bio->bios[i];