Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit e4025f6c21f1389696c069be2dc647f364925c45

Authored by Tejun Heo
Committed by Jens Axboe
1 parent a7f5579234
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 2 changed files with 1 additions and 5 deletions Side-by-side Diff

... ... @@ -1082,16 +1082,13 @@
1082 1082 if (bio_failfast_driver(bio))
1083 1083 req->cmd_flags |= REQ_FAILFAST_DRIVER;
1084 1084  
1085   - /*
1086   - * REQ_BARRIER implies no merging, but lets make it explicit
1087   - */
1088 1085 if (unlikely(bio_discard(bio))) {
1089 1086 req->cmd_flags |= REQ_DISCARD;
1090 1087 if (bio_barrier(bio))
1091 1088 req->cmd_flags |= REQ_SOFTBARRIER;
1092 1089 req->q->prepare_discard_fn(req->q, req);
1093 1090 } else if (unlikely(bio_barrier(bio)))
1094   - req->cmd_flags |= (REQ_HARDBARRIER | REQ_NOMERGE);
  1091 + req->cmd_flags |= REQ_HARDBARRIER;
1095 1092  
1096 1093 if (bio_sync(bio))
1097 1094 req->cmd_flags |= REQ_RW_SYNC;
... ... @@ -51,7 +51,6 @@
51 51 int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;
52 52  
53 53 rq->rq_disk = bd_disk;
54   - rq->cmd_flags |= REQ_NOMERGE;
55 54 rq->end_io = done;
56 55 WARN_ON(irqs_disabled());
57 56 spin_lock_irq(q->queue_lock);