![]() | ||||||||||
Messages in this thread Patch in this message |
Hello Jens,
The following patch removes gotos from blk_rq_map_sg, making
it more readable and five lines shorter. I think the compiler should
generate the same code. I have not tested this other than to
verify that it compiles.
If it works and looks good to you, I would appreciate it if
you would forward it to Linus for integration. (I am also cc'ing this to
linux-kernel in case anyone spots a mistake on my part.)
Also, if there is some other way by which you would like
me to submit future bio patches (if any), please let me know.
--
Adam J. Richter __ ______________ 4880 Stevens Creek Blvd, Suite 104
adam@yggdrasil.com \ / San Jose, California 95129-1034
+1 408 261-6630 | g g d r a s i l United States of America
fax +1 408 261-6631 "Free Software For The Rest Of Us."--- linux-2.5.2-pre8/drivers/block/ll_rw_blk.c Sat Jan 5 15:33:53 2002
+++ linux/drivers/block/ll_rw_blk.c Mon Jan 7 00:28:17 2002
@@ -474,18 +474,13 @@
bio_for_each_segment(bvec, bio, i) {
int nbytes = bvec->bv_len;
- if (bvprv && cluster) {
- if (sg[nsegs - 1].length + nbytes > q->max_segment_size)
- goto new_segment;
-
- if (!BIOVEC_PHYS_MERGEABLE(bvprv, bvec))
- goto new_segment;
- if (!BIOVEC_SEG_BOUNDARY(q, bvprv, bvec))
- goto new_segment;
-
+ if (bvprv && cluster &&
+ (sg[nsegs - 1].length + nbytes <=
+ q->max_segment_size) &&
+ BIOVEC_PHYS_MERGEABLE(bvprv, bvec) &&
+ BIOVEC_SEG_BOUNDARY(q, bvprv, bvec)) {
sg[nsegs - 1].length += nbytes;
} else {
-new_segment:
memset(&sg[nsegs],0,sizeof(struct scatterlist));
sg[nsegs].page = bvec->bv_page;
sg[nsegs].length = nbytes; | |||||||||
| Last update: 2005-03-22 11:15 [W:0.441 / U:0.690 seconds] ©2003-2008 Jasper Spaans | ||||||||||