On Sun, 2008-08-10 at 05:39 +0900, OGAWA Hirofumi wrote: > David Woodhouse <dwmw2@xxxxxxxxxxxxx> writes: > > > + * Don't merge file system and non-file system requests > > + */ > > + if (bio_has_data(bio) != bio_has_data(rq->bio)) > > + return 0; > > Maybe, this is bio_discard(bio) != bio_discard(rq->bio)? Because it > seems to say bio_discard(bio) == blk_empty_barrier(rq) can merge, > rq_mergeable(rq) already checked barrier before this though... Yeah, either would actually do the job just fine, but I should probably change it to bio_discard(). Thanks. -- dwmw2 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html