|
@@ -216,23 +216,26 @@ static void gfs2_meta_read_endio(struct bio *bio)
|
|
|
static void gfs2_submit_bhs(int op, int op_flags, struct buffer_head *bhs[],
|
|
|
int num)
|
|
|
{
|
|
|
- struct buffer_head *bh = bhs[0];
|
|
|
- struct bio *bio;
|
|
|
- int i;
|
|
|
-
|
|
|
- if (!num)
|
|
|
- return;
|
|
|
-
|
|
|
- bio = bio_alloc(GFP_NOIO, num);
|
|
|
- bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9);
|
|
|
- bio->bi_bdev = bh->b_bdev;
|
|
|
- for (i = 0; i < num; i++) {
|
|
|
- bh = bhs[i];
|
|
|
- bio_add_page(bio, bh->b_page, bh->b_size, bh_offset(bh));
|
|
|
+ while (num > 0) {
|
|
|
+ struct buffer_head *bh = *bhs;
|
|
|
+ struct bio *bio;
|
|
|
+
|
|
|
+ bio = bio_alloc(GFP_NOIO, num);
|
|
|
+ bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9);
|
|
|
+ bio->bi_bdev = bh->b_bdev;
|
|
|
+ while (num > 0) {
|
|
|
+ bh = *bhs;
|
|
|
+ if (!bio_add_page(bio, bh->b_page, bh->b_size, bh_offset(bh))) {
|
|
|
+ BUG_ON(bio->bi_iter.bi_size == 0);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ bhs++;
|
|
|
+ num--;
|
|
|
+ }
|
|
|
+ bio->bi_end_io = gfs2_meta_read_endio;
|
|
|
+ bio_set_op_attrs(bio, op, op_flags);
|
|
|
+ submit_bio(bio);
|
|
|
}
|
|
|
- bio->bi_end_io = gfs2_meta_read_endio;
|
|
|
- bio_set_op_attrs(bio, op, op_flags);
|
|
|
- submit_bio(bio);
|
|
|
}
|
|
|
|
|
|
/**
|