diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2008-08-15 10:15:19 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2008-10-09 08:56:03 +0200 |
| commit | b8b3e16cfe6435d961f6aaebcfd52a1ff2a988c5 (patch) | |
| tree | 5832535c112c0504590256cb8a0bcabc6e282be3 /fs | |
| parent | 6a421c1dc94b12923294a359822346f12492de5e (diff) | |
| download | linux-stable-b8b3e16cfe6435d961f6aaebcfd52a1ff2a988c5.tar.gz linux-stable-b8b3e16cfe6435d961f6aaebcfd52a1ff2a988c5.tar.bz2 linux-stable-b8b3e16cfe6435d961f6aaebcfd52a1ff2a988c5.zip | |
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')
| -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 */ while (bio->bi_phys_segments >= q->max_phys_segments - || bio->bi_hw_segments >= q->max_hw_segments - || BIOVEC_VIRT_OVERSIZE(bio->bi_size)) { + || bio->bi_hw_segments >= q->max_hw_segments) { if (retried_segments) return 0; @@ -395,8 +394,7 @@ static int __bio_add_page(struct request_queue *q, struct bio *bio, struct page } /* If we may be able to merge these biovecs, force a recount */ - if (bio->bi_vcnt && (BIOVEC_PHYS_MERGEABLE(bvec-1, bvec) || - BIOVEC_VIRT_MERGEABLE(bvec-1, bvec))) + if (bio->bi_vcnt && (BIOVEC_PHYS_MERGEABLE(bvec-1, bvec))) bio->bi_flags &= ~(1 << BIO_SEG_VALID); bio->bi_vcnt++; |