summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-06-12 14:20:58 +0200
committerJens Axboe <axboe@nelson.home.kernel.dk>2006-06-23 17:10:38 +0200
commitacf421755593f7d7bd9352d57eda796c6eb4fa43 (patch)
tree08fe234e5a28556ef32d29de1d3045cfe94a931c
parentfda151d9feafc0e8418f23c716587c44394fcdbf (diff)
downloadlinux-acf421755593f7d7bd9352d57eda796c6eb4fa43.tar.gz
linux-acf421755593f7d7bd9352d57eda796c6eb4fa43.tar.bz2
linux-acf421755593f7d7bd9352d57eda796c6eb4fa43.zip
[PATCH] remove dead code from elevator switching
We already drop the refcount in elevator_exit(), and as we're setting 'e' to NULL, we'll never take that branch anyway. Finally, as 'e' is a local var that isn't referenced afterwards, setting it to NULL is pointless. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Jens Axboe <axboe@suse.de>
-rw-r--r--block/elevator.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/block/elevator.c b/block/elevator.c
index a0afdd317cef..d00b283f31d2 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -850,12 +850,9 @@ fail_register:
* one again (along with re-adding the sysfs dir)
*/
elevator_exit(e);
- e = NULL;
q->elevator = old_elevator;
elv_register_queue(q);
clear_bit(QUEUE_FLAG_ELVSWITCH, &q->queue_flags);
- if (e)
- kobject_put(&e->kobj);
return 0;
}