block: don't set REQ_NOMERGE unnecessarily
authorTejun Heo <tj@kernel.org>
Thu, 23 Apr 2009 02:05:17 +0000 (11:05 +0900)
committerJens Axboe <jens.axboe@oracle.com>
Tue, 28 Apr 2009 05:37:33 +0000 (07:37 +0200)
commite4025f6c21f1389696c069be2dc647f364925c45
tree4d7ee21062293c9a9d398063c22339b47f581283
parenta7f557923441186a3cdbabc54f1bcacf42b63bf5
block: don't set REQ_NOMERGE unnecessarily

RQ_NOMERGE_FLAGS already clears defines which REQ flags aren't
mergeable.  There is no reason to specify it superflously.  It only
adds to confusion.  Don't set REQ_NOMERGE for barriers and requests
with specific queueing directive.  REQ_NOMERGE is now exclusively used
by the merging code.

[ Impact: cleanup ]

Signed-off-by: Tejun Heo <tj@kernel.org>
block/blk-core.c
block/blk-exec.c