block: convert merge/insert code to check for REQ_OPs.
authorMike Christie <mchristi@redhat.com>
Sun, 5 Jun 2016 19:32:15 +0000 (14:32 -0500)
committerJens Axboe <axboe@fb.com>
Tue, 7 Jun 2016 19:41:38 +0000 (13:41 -0600)
commit8fe0d473f5477e9916d3ac581a226acfe83142be
treea433795d1ad57cd0b2fdf64e6d3b7ae579abfd78
parent63a4cc24867de73626e16767ce616c50dc5438d3
block: convert merge/insert code to check for REQ_OPs.

This patch converts the block layer merging code to use separate variables
for the operation and flags, and to check req_op for the REQ_OP.

Signed-off-by: Mike Christie <mchristi@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
block/blk-core.c
block/blk-merge.c
include/linux/blkdev.h