diff options
author | Mikulas Patocka <mpatocka@redhat.com> | 2008-08-15 04:15:19 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2008-10-09 02:56:03 -0400 |
commit | b8b3e16cfe6435d961f6aaebcfd52a1ff2a988c5 (patch) | |
tree | 5832535c112c0504590256cb8a0bcabc6e282be3 /fs/bio.c | |
parent | 6a421c1dc94b12923294a359822346f12492de5e (diff) |
block: drop virtual merging accounting
Remove virtual merge accounting.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs/bio.c')
-rw-r--r-- | fs/bio.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -350,8 +350,7 @@ static int __bio_add_page(struct request_queue *q, struct bio *bio, struct page | |||
350 | */ | 350 | */ |
351 | 351 | ||
352 | while (bio->bi_phys_segments >= q->max_phys_segments | 352 | while (bio->bi_phys_segments >= q->max_phys_segments |
353 | || bio->bi_hw_segments >= q->max_hw_segments | 353 | || bio->bi_hw_segments >= q->max_hw_segments) { |
354 | || BIOVEC_VIRT_OVERSIZE(bio->bi_size)) { | ||
355 | 354 | ||
356 | if (retried_segments) | 355 | if (retried_segments) |
357 | return 0; | 356 | return 0; |
@@ -395,8 +394,7 @@ static int __bio_add_page(struct request_queue *q, struct bio *bio, struct page | |||
395 | } | 394 | } |
396 | 395 | ||
397 | /* If we may be able to merge these biovecs, force a recount */ | 396 | /* If we may be able to merge these biovecs, force a recount */ |
398 | if (bio->bi_vcnt && (BIOVEC_PHYS_MERGEABLE(bvec-1, bvec) || | 397 | if (bio->bi_vcnt && (BIOVEC_PHYS_MERGEABLE(bvec-1, bvec))) |
399 | BIOVEC_VIRT_MERGEABLE(bvec-1, bvec))) | ||
400 | bio->bi_flags &= ~(1 << BIO_SEG_VALID); | 398 | bio->bi_flags &= ~(1 << BIO_SEG_VALID); |
401 | 399 | ||
402 | bio->bi_vcnt++; | 400 | bio->bi_vcnt++; |