Commit 92bc5a24 authored by Jens Axboe's avatar Jens Axboe

block: remove __blk_put_request()

Now there's no difference between blk_put_request() and
__blk_put_request() anymore, get rid of the underscore version and
convert the few callers.
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Tested-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f9cd4bfe
...@@ -803,15 +803,6 @@ void part_round_stats(struct request_queue *q, int cpu, struct hd_struct *part) ...@@ -803,15 +803,6 @@ void part_round_stats(struct request_queue *q, int cpu, struct hd_struct *part)
} }
EXPORT_SYMBOL_GPL(part_round_stats); EXPORT_SYMBOL_GPL(part_round_stats);
void __blk_put_request(struct request_queue *q, struct request *req)
{
if (unlikely(!q))
return;
blk_mq_free_request(req);
}
EXPORT_SYMBOL_GPL(__blk_put_request);
void blk_put_request(struct request *req) void blk_put_request(struct request *req)
{ {
blk_mq_free_request(req); blk_mq_free_request(req);
......
...@@ -866,7 +866,7 @@ int blk_attempt_req_merge(struct request_queue *q, struct request *rq, ...@@ -866,7 +866,7 @@ int blk_attempt_req_merge(struct request_queue *q, struct request *rq,
free = attempt_merge(q, rq, next); free = attempt_merge(q, rq, next);
if (free) { if (free) {
__blk_put_request(q, free); blk_put_request(free);
return 1; return 1;
} }
......
...@@ -506,11 +506,11 @@ static void osd_request_async_done(struct request *req, blk_status_t error) ...@@ -506,11 +506,11 @@ static void osd_request_async_done(struct request *req, blk_status_t error)
_set_error_resid(or, req, error); _set_error_resid(or, req, error);
if (req->next_rq) { if (req->next_rq) {
__blk_put_request(req->q, req->next_rq); blk_put_request(req->next_rq);
req->next_rq = NULL; req->next_rq = NULL;
} }
__blk_put_request(req->q, req); blk_put_request(req);
or->request = NULL; or->request = NULL;
or->in.req = NULL; or->in.req = NULL;
or->out.req = NULL; or->out.req = NULL;
......
...@@ -341,7 +341,7 @@ static void osst_end_async(struct request *req, blk_status_t status) ...@@ -341,7 +341,7 @@ static void osst_end_async(struct request *req, blk_status_t status)
blk_rq_unmap_user(SRpnt->bio); blk_rq_unmap_user(SRpnt->bio);
} }
__blk_put_request(req->q, req); blk_put_request(req);
} }
/* osst_request memory management */ /* osst_request memory management */
......
...@@ -1932,7 +1932,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd) ...@@ -1932,7 +1932,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
static void eh_lock_door_done(struct request *req, blk_status_t status) static void eh_lock_door_done(struct request *req, blk_status_t status)
{ {
__blk_put_request(req->q, req); blk_put_request(req);
} }
/** /**
......
...@@ -1390,7 +1390,7 @@ sg_rq_end_io(struct request *rq, blk_status_t status) ...@@ -1390,7 +1390,7 @@ sg_rq_end_io(struct request *rq, blk_status_t status)
*/ */
srp->rq = NULL; srp->rq = NULL;
scsi_req_free_cmd(scsi_req(rq)); scsi_req_free_cmd(scsi_req(rq));
__blk_put_request(rq->q, rq); blk_put_request(rq);
write_lock_irqsave(&sfp->rq_list_lock, iflags); write_lock_irqsave(&sfp->rq_list_lock, iflags);
if (unlikely(srp->orphan)) { if (unlikely(srp->orphan)) {
......
...@@ -530,7 +530,7 @@ static void st_scsi_execute_end(struct request *req, blk_status_t status) ...@@ -530,7 +530,7 @@ static void st_scsi_execute_end(struct request *req, blk_status_t status)
complete(SRpnt->waiting); complete(SRpnt->waiting);
blk_rq_unmap_user(tmp); blk_rq_unmap_user(tmp);
__blk_put_request(req->q, req); blk_put_request(req);
} }
static int st_scsi_execute(struct st_request *SRpnt, const unsigned char *cmd, static int st_scsi_execute(struct st_request *SRpnt, const unsigned char *cmd,
......
...@@ -1094,7 +1094,7 @@ static void pscsi_req_done(struct request *req, blk_status_t status) ...@@ -1094,7 +1094,7 @@ static void pscsi_req_done(struct request *req, blk_status_t status)
break; break;
} }
__blk_put_request(req->q, req); blk_put_request(req);
kfree(pt); kfree(pt);
} }
......
...@@ -906,7 +906,6 @@ extern blk_qc_t direct_make_request(struct bio *bio); ...@@ -906,7 +906,6 @@ extern blk_qc_t direct_make_request(struct bio *bio);
extern void blk_rq_init(struct request_queue *q, struct request *rq); extern void blk_rq_init(struct request_queue *q, struct request *rq);
extern void blk_init_request_from_bio(struct request *req, struct bio *bio); extern void blk_init_request_from_bio(struct request *req, struct bio *bio);
extern void blk_put_request(struct request *); extern void blk_put_request(struct request *);
extern void __blk_put_request(struct request_queue *, struct request *);
extern struct request *blk_get_request(struct request_queue *, unsigned int op, extern struct request *blk_get_request(struct request_queue *, unsigned int op,
blk_mq_req_flags_t flags); blk_mq_req_flags_t flags);
extern int blk_lld_busy(struct request_queue *q); extern int blk_lld_busy(struct request_queue *q);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment