aboutsummaryrefslogtreecommitdiffstats
path: root/block/blk-sysfs.c
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2011-09-28 08:07:01 -0600
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-03 11:41:13 -0700
commitc2b387f0295ffaeb5e96f0d6f745fde507abd651 (patch)
tree9d817f12f4ecfa480ac1cc3b471af31837b30c8c /block/blk-sysfs.c
parentf0e47138b26bd26d312aa63522a579acac5552c6 (diff)
downloadkernel_samsung_smdk4412-c2b387f0295ffaeb5e96f0d6f745fde507abd651.zip
kernel_samsung_smdk4412-c2b387f0295ffaeb5e96f0d6f745fde507abd651.tar.gz
kernel_samsung_smdk4412-c2b387f0295ffaeb5e96f0d6f745fde507abd651.tar.bz2
block: Free queue resources at blk_release_queue()
commit 777eb1bf15b8532c396821774bf6451e563438f5 upstream. A kernel crash is observed when a mounted ext3/ext4 filesystem is physically removed. The problem is that blk_cleanup_queue() frees up some resources eg by calling elevator_exit(), which are not checked for in normal operation. So we should rather move these calls to the destructor function blk_release_queue() as at that point all remaining references are gone. However, in doing so we have to ensure that any externally supplied queue_lock is disconnected as the driver might free up the lock after the call of blk_cleanup_queue(), Signed-off-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'block/blk-sysfs.c')
-rw-r--r--block/blk-sysfs.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index d935bd8..45c56d8 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -472,6 +472,11 @@ static void blk_release_queue(struct kobject *kobj)
blk_sync_queue(q);
+ if (q->elevator)
+ elevator_exit(q->elevator);
+
+ blk_throtl_exit(q);
+
if (rl->rq_pool)
mempool_destroy(rl->rq_pool);