Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 2591
b: refs/heads/master
c: ab7a30c
h: refs/heads/master
i:
  2589: 1604cca
  2587: 0cb9c25
  2583: 11e0271
  2575: 3db3459
  2559: 6ce3c72
v: v3
  • Loading branch information
NeilBrown authored and Linus Torvalds committed Jun 22, 2005
1 parent 35333b1 commit e030b18
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 191ea9b2c7cc3ebbe0678834ab710d7d95ad3f9a
refs/heads/master: ab7a30c7051ee32d0d72415fe0a16d60eba38a0d
17 changes: 10 additions & 7 deletions trunk/drivers/md/raid1.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down

0 comments on commit e030b18

Please sign in to comment.