tree 4d7ee21062293c9a9d398063c22339b47f581283
parent a7f557923441186a3cdbabc54f1bcacf42b63bf5
author Tejun Heo <tj@kernel.org> 1240452317 +0900
committer Jens Axboe <jens.axboe@oracle.com> 1240897053 +0200

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>