diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2015-05-29 20:17:16 +0200 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2015-05-29 20:17:16 +0200 |
| commit | 183f7802e73e26206558864d1b67e64382257277 (patch) | |
| tree | b380d7a8db726e7839f50fa07d3f1a1e80589ec3 /block/blk-exec.c | |
| parent | dm: fix casting bug in dm_merge_bvec() (diff) | |
| parent | block: fix returnvar.cocci warnings (diff) | |
| download | linux-183f7802e73e26206558864d1b67e64382257277.tar.xz linux-183f7802e73e26206558864d1b67e64382257277.zip | |
Merge remote-tracking branch 'jens/for-4.2/core' into dm-4.2
Diffstat (limited to 'block/blk-exec.c')
| -rw-r--r-- | block/blk-exec.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/block/blk-exec.c b/block/blk-exec.c index 9924725fa50d..3fec8a29d0fa 100644 --- a/block/blk-exec.c +++ b/block/blk-exec.c @@ -53,7 +53,6 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, rq_end_io_fn *done) { int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK; - bool is_pm_resume; WARN_ON(irqs_disabled()); WARN_ON(rq->cmd_type == REQ_TYPE_FS); @@ -70,12 +69,6 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, return; } - /* - * need to check this before __blk_run_queue(), because rq can - * be freed before that returns. - */ - is_pm_resume = rq->cmd_type == REQ_TYPE_PM_RESUME; - spin_lock_irq(q->queue_lock); if (unlikely(blk_queue_dying(q))) { @@ -88,9 +81,6 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, __elv_add_request(q, rq, where); __blk_run_queue(q); - /* the queue is stopped so it won't be run */ - if (is_pm_resume) - __blk_run_queue_uncond(q); spin_unlock_irq(q->queue_lock); } EXPORT_SYMBOL_GPL(blk_execute_rq_nowait); |