leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: fold __blk_add_timer into blk_add_timer

Browse Source 
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Christoph Hellwig 2014-04-25 14:14:48 +02:00 committed by Jens Axboe
parent 3853520163
commit c4a634f432
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
block/blk-timeout.c
View File

@ -166,8 +166,15 @@ void blk_abort_request(struct request *req)
} }
EXPORT_SYMBOL_GPL(blk_abort_request); EXPORT_SYMBOL_GPL(blk_abort_request);
static void __blk_add_timer(struct request *req, /**
struct list_head *timeout_list) * blk_add_timer - Start timeout timer for a single request
* @req: request that is about to start running.
*
* Notes:
* Each request has its own timer, and as it is added to the queue, we
* set up the timer. When the request completes, we cancel the timer.
*/
void blk_add_timer(struct request *req)
{ {
struct request_queue *q = req->q; struct request_queue *q = req->q;
unsigned long expiry; unsigned long expiry;
@ -185,8 +192,8 @@ static void __blk_add_timer(struct request *req,
req->timeout = q->rq_timeout; req->timeout = q->rq_timeout;
req->deadline = jiffies + req->timeout; req->deadline = jiffies + req->timeout;
if (timeout_list) if (!q->mq_ops)
list_add_tail(&req->timeout_list, timeout_list); list_add_tail(&req->timeout_list, &req->q->timeout_list);
/* /*
* If the timer isn't already pending or this timeout is earlier * If the timer isn't already pending or this timeout is earlier
@ -211,22 +218,3 @@ static void __blk_add_timer(struct request *req,
} }
} }
/**
* blk_add_timer - Start timeout timer for a single request
* @req: request that is about to start running.
*
* Notes:
* Each request has its own timer, and as it is added to the queue, we
* set up the timer. When the request completes, we cancel the timer.
*/
void blk_add_timer(struct request *req)
{
struct request_queue *q = req->q;
if (q->mq_ops)
__blk_add_timer(req, NULL);
else
__blk_add_timer(req, &req->q->timeout_list);
}