tree c23dd6540dc211e2b2583c3e950a7f6977e3f1df
parent d41570b7469724005eb78448a69289900f911963
author Martin K. Petersen <martin.petersen@oracle.com> 1347985165 -0400
committer Jens Axboe <axboe@kernel.dk> 1348144298 +0200

block: Clean up special command handling logic

Remove special-casing of non-rw fs style requests (discard). The nomerge
flags are consolidated in blk_types.h, and rq_mergeable() and
bio_mergeable() have been modified to use them.

bio_is_rw() is used in place of bio_has_data() a few places. This is
done to to distinguish true reads and writes from other fs type requests
that carry a payload (e.g. write same).

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Acked-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>