Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | Date | Sat, 1 Nov 2003 13:31:27 +1100 | Subject | [BLOCK] phys_contig implies hw_contig | From | Herbert Xu <> |
| |
Hi:
In ll_merge_requests_fn, it is checking blk_hw_contig_segments even if blk_phys_contig_segments succeeds. This means that it may cause two physically contiguous segments to be separated because the hw check fails.
This patch fixes that.
Cheers, -- Debian GNU/Linux 3.0 is out! ( http://www.debian.org/ ) Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt Index: kernel-source-2.5/drivers/block/ll_rw_blk.c =================================================================== RCS file: /home/gondolin/herbert/src/CVS/debian/kernel-source-2.5/drivers/block/ll_rw_blk.c,v retrieving revision 1.9 diff -u -r1.9 ll_rw_blk.c --- kernel-source-2.5/drivers/block/ll_rw_blk.c 11 Oct 2003 06:29:20 -0000 1.9 +++ kernel-source-2.5/drivers/block/ll_rw_blk.c 1 Nov 2003 02:24:52 -0000 @@ -1046,16 +1046,16 @@ return 0; total_phys_segments = req->nr_phys_segments + next->nr_phys_segments; - if (blk_phys_contig_segment(q, req->biotail, next->bio)) + total_hw_segments = req->nr_hw_segments + next->nr_hw_segments; + + if (blk_phys_contig_segment(q, req->biotail, next->bio)) { total_phys_segments--; + total_hw_segments--; + } else if (blk_hw_contig_segment(q, req->biotail, next->bio)) + total_hw_segments--; if (total_phys_segments > q->max_phys_segments) return 0; - - total_hw_segments = req->nr_hw_segments + next->nr_hw_segments; - if (blk_hw_contig_segment(q, req->biotail, next->bio)) - total_hw_segments--; - if (total_hw_segments > q->max_hw_segments) return 0; | ![\](/images/icornerr.gif) |