hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://neil.brown.name/md 

* 'for-linus' of git://neil.brown.name/md:
  md: check return code of read_sb_page
  md/raid1: minor bio initialisation improvements.
  md/raid1:  avoid overflow in raid1 resync when bitmap is in use.
This commit is contained in:
Linus Torvalds 2010-10-07 13:50:48 -07:00
parent dda9cd9fb3 5c04f5512f
commit 74de82ed1e
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/md/bitmap.c
View File

@ -1000,10 +1000,11 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start)
page = bitmap->sb_page; page = bitmap->sb_page;
offset = sizeof(bitmap_super_t); offset = sizeof(bitmap_super_t);
if (!file) if (!file)
read_sb_page(bitmap->mddev, page = read_sb_page(
bitmap->mddev->bitmap_info.offset, bitmap->mddev,
page, bitmap->mddev->bitmap_info.offset,
index, count); page,
index, count);
} else if (file) { } else if (file) {
page = read_page(file, index, bitmap, count); page = read_page(file, index, bitmap, count);
offset = 0; offset = 0;

4
drivers/md/raid1.c
View File

@ -1839,7 +1839,9 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
/* take from bio_init */ /* take from bio_init */
bio->bi_next = NULL; bio->bi_next = NULL;
bio->bi_flags &= ~(BIO_POOL_MASK-1);
bio->bi_flags |= 1 << BIO_UPTODATE; bio->bi_flags |= 1 << BIO_UPTODATE;
bio->bi_comp_cpu = -1;
bio->bi_rw = READ; bio->bi_rw = READ;
bio->bi_vcnt = 0; bio->bi_vcnt = 0;
bio->bi_idx = 0; bio->bi_idx = 0;
@ -1912,7 +1914,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
!test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery))
break; break;
BUG_ON(sync_blocks < (PAGE_SIZE>>9)); BUG_ON(sync_blocks < (PAGE_SIZE>>9));
if (len > (sync_blocks<<9)) if ((len >> 9) > sync_blocks)
len = sync_blocks<<9; len = sync_blocks<<9;
} }