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 <fujita.tomonori@lab.ntt.co.jp> Cc: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
committed by
Bartlomiej Zolnierkiewicz
parent
d79c5a670d
commit
52a93ba815
@@ -1042,15 +1042,9 @@ void blk_put_request(struct request *req)
|
|||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
struct request_queue *q = req->q;
|
struct request_queue *q = req->q;
|
||||||
|
|
||||||
/*
|
spin_lock_irqsave(q->queue_lock, flags);
|
||||||
* Gee, IDE calls in w/ NULL q. Fix IDE and remove the
|
__blk_put_request(q, req);
|
||||||
* following if (q) test.
|
spin_unlock_irqrestore(q->queue_lock, flags);
|
||||||
*/
|
|
||||||
if (q) {
|
|
||||||
spin_lock_irqsave(q->queue_lock, flags);
|
|
||||||
__blk_put_request(q, req);
|
|
||||||
spin_unlock_irqrestore(q->queue_lock, flags);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(blk_put_request);
|
EXPORT_SYMBOL(blk_put_request);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user