summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2017-01-19 07:10:13 -0700
committerJens Axboe <axboe@fb.com>2017-01-19 07:43:05 -0700
commit610d886c0c22fa7504e817b6d03c402de64b0264 (patch)
tree0faf9b2eea4e7bfddb03861f6a42cefb17b92e5d /block
parent38dbb7dd4db184da4d2673f4bb963f7006465c37 (diff)
downloadlinux-0-day-610d886c0c22fa7504e817b6d03c402de64b0264.tar.gz
elevator: fix unnecessary put of elevator in failure case
We already checked that e is NULL, so no point in calling elevator_put() to free it. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Fixes: dc877dbd088f ("blk-mq-sched: add framework for MQ capable IO schedulers") Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
-rw-r--r--block/elevator.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/block/elevator.c b/block/elevator.c
index bcba2dd..ef7f594 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -230,10 +230,6 @@ int elevator_init(struct request_queue *q, char *name)
printk(KERN_ERR
"Default I/O scheduler not found. " \
"Using noop/none.\n");
- if (q->mq_ops) {
- elevator_put(e);
- return 0;
- }
e = elevator_get("noop", false);
}
}