From: FUJITA Tomonori Date: Tue, 15 Jul 2008 19:21:45 +0000 (+0200) Subject: block: remove the checking for NULL queue in blk_put_request X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=52a93ba815737e3877f85b46850cffe993a22429;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git block: remove the checking for NULL queue in blk_put_request Some uses blk_put_request asymmetrically, that is, they uses it with requests that not allocated by blk_get_request. As a result, blk_put_request has a hack to catch a NULL request_queue. Now such callers are fixed (they use blk_get_request properly). So we can safely remove the hack in blk_put_request. Signed-off-by: FUJITA Tomonori Cc: Borislav Petkov Signed-off-by: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz --- diff --git a/block/blk-core.c b/block/blk-core.c index 1905aaba49fb..ac83cf9a19ae 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1042,15 +1042,9 @@ void blk_put_request(struct request *req) unsigned long flags; struct request_queue *q = req->q; - /* - * Gee, IDE calls in w/ NULL q. Fix IDE and remove the - * following if (q) test. - */ - if (q) { - spin_lock_irqsave(q->queue_lock, flags); - __blk_put_request(q, req); - spin_unlock_irqrestore(q->queue_lock, flags); - } + spin_lock_irqsave(q->queue_lock, flags); + __blk_put_request(q, req); + spin_unlock_irqrestore(q->queue_lock, flags); } EXPORT_SYMBOL(blk_put_request);