Cosmetic changes. This is taken from Jens' zero-length barrier patch. Signed-off-by: Tejun Heo <htejun@xxxxxxxxx> Cc: Jens Axboe <jes.axboe@xxxxxxxxxx> --- block/ll_rw_blk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Index: work/block/ll_rw_blk.c =================================================================== --- work.orig/block/ll_rw_blk.c +++ work/block/ll_rw_blk.c @@ -443,7 +443,8 @@ static inline struct request *start_orde rq_init(q, rq); if (bio_data_dir(q->orig_bar_rq->bio) == WRITE) rq->cmd_flags |= REQ_RW; - rq->cmd_flags |= q->ordered & QUEUE_ORDERED_FUA ? REQ_FUA : 0; + if (q->ordered & QUEUE_ORDERED_FUA) + rq->cmd_flags |= REQ_FUA; rq->elevator_private = NULL; rq->elevator_private2 = NULL; init_request_from_bio(rq, q->orig_bar_rq->bio); @@ -3167,7 +3168,7 @@ end_io: break; } - if (unlikely(bio_sectors(bio) > q->max_hw_sectors)) { + if (unlikely(nr_sectors > q->max_hw_sectors)) { printk("bio too big device %s (%u > %u)\n", bdevname(bio->bi_bdev, b), bio_sectors(bio), - 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