aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo2009-04-22 21:05:17 -0500
committerJens Axboe2009-04-28 00:37:33 -0500
commite4025f6c21f1389696c069be2dc647f364925c45 (patch)
tree4d7ee21062293c9a9d398063c22339b47f581283 /block/blk-exec.c
parenta7f557923441186a3cdbabc54f1bcacf42b63bf5 (diff)
downloadkernel-common-e4025f6c21f1389696c069be2dc647f364925c45.tar.gz
kernel-common-e4025f6c21f1389696c069be2dc647f364925c45.tar.xz
kernel-common-e4025f6c21f1389696c069be2dc647f364925c45.zip
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>
Diffstat (limited to 'block/blk-exec.c')
-rw-r--r--block/blk-exec.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/block/blk-exec.c b/block/blk-exec.c
index 6af716d1e54..49557e91f0d 100644
--- a/block/blk-exec.c
+++ b/block/blk-exec.c
@@ -51,7 +51,6 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
51 int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK; 51 int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;
52 52
53 rq->rq_disk = bd_disk; 53 rq->rq_disk = bd_disk;
54 rq->cmd_flags |= REQ_NOMERGE;
55 rq->end_io = done; 54 rq->end_io = done;
56 WARN_ON(irqs_disabled()); 55 WARN_ON(irqs_disabled());
57 spin_lock_irq(q->queue_lock); 56 spin_lock_irq(q->queue_lock);