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... > + > + /* > * different data direction or already started, don't merge > */ > if (bio_data_dir(bio) != rq_data_dir(rq)) -- OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx> -- 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
