block: remove __blk_put_request()

axboe · axboe · commit 92bc5a24844a · 2018-11-07T13:42:32.000-07:00
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: Hannes Reinecke &lt;hare@suse.com&gt;
Tested-by: Ming Lei &lt;ming.lei@redhat.com&gt;
Reviewed-by: Omar Sandoval &lt;osandov@fb.com&gt;
Signed-off-by: Jens Axboe &lt;axboe@kernel.dk&gt;
diff --git a/block/blk-core.c b/block/blk-core.c
@@ -803,15 +803,6 @@ void part_round_stats(struct request_queue *q, int cpu, struct hd_struct *part)
 }
 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)
 {
 	blk_mq_free_request(req);
diff --git a/block/blk-merge.c b/block/blk-merge.c
@@ -866,7 +866,7 @@ int blk_attempt_req_merge(struct request_queue *q, struct request *rq,
 
 	free = attempt_merge(q, rq, next);
 	if (free) {
-		__blk_put_request(q, free);
+		blk_put_request(free);
 		return 1;
 	}
 
diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
@@ -506,11 +506,11 @@ static void osd_request_async_done(struct request *req, blk_status_t error)
 
 	_set_error_resid(or, req, error);
 	if (req->next_rq) {
-		__blk_put_request(req->q, req->next_rq);
+		blk_put_request(req->next_rq);
 		req->next_rq = NULL;
 	}
 
-	__blk_put_request(req->q, req);
+	blk_put_request(req);
 	or->request = NULL;
 	or->in.req = NULL;
 	or->out.req = NULL;
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
@@ -341,7 +341,7 @@ static void osst_end_async(struct request *req, blk_status_t status)
 		blk_rq_unmap_user(SRpnt->bio);
 	}
 
-	__blk_put_request(req->q, req);
+	blk_put_request(req);
 }
 
 /* osst_request memory management */
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
@@ -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)
 {
-	__blk_put_request(req->q, req);
+	blk_put_request(req);
 }
 
 /**
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
@@ -1390,7 +1390,7 @@ sg_rq_end_io(struct request *rq, blk_status_t status)
 	 */
 	srp->rq = NULL;
 	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);
 	if (unlikely(srp->orphan)) {
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
@@ -530,7 +530,7 @@ static void st_scsi_execute_end(struct request *req, blk_status_t status)
 		complete(SRpnt->waiting);
 
 	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,
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
@@ -1094,7 +1094,7 @@ static void pscsi_req_done(struct request *req, blk_status_t status)
 		break;
 	}
 
-	__blk_put_request(req->q, req);
+	blk_put_request(req);
 	kfree(pt);
 }
 
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
@@ -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_init_request_from_bio(struct request *req, struct bio *bio);
 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,
 				       blk_mq_req_flags_t flags);
 extern int blk_lld_busy(struct request_queue *q);

Original file line number	Diff line number	Diff line change
`@@ -866,7 +866,7 @@ int blk_attempt_req_merge(struct request_queue q, struct request rq,`
`866`	`866`
`867`	`867`	`free = attempt_merge(q, rq, next);`
`868`	`868`	`if (free) {`
`869`		`- __blk_put_request(q, free);`
	`869`	`+ blk_put_request(free);`
`870`	`870`	`return 1;`
`871`	`871`	`}`
`872`	`872`
Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ static void osst_end_async(struct request *req, blk_status_t status)`
`341`	`341`	`blk_rq_unmap_user(SRpnt->bio);`
`342`	`342`	`}`
`343`	`343`
`344`		`- __blk_put_request(req->q, req);`
	`344`	`+ blk_put_request(req);`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`/* osst_request memory management */`
Original file line number	Diff line number	Diff line change
`@@ -1932,7 +1932,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)`
`1932`	`1932`
`1933`	`1933`	`static void eh_lock_door_done(struct request *req, blk_status_t status)`
`1934`	`1934`	`{`
`1935`		`- __blk_put_request(req->q, req);`
	`1935`	`+ blk_put_request(req);`
`1936`	`1936`	`}`
`1937`	`1937`
`1938`	`1938`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -530,7 +530,7 @@ static void st_scsi_execute_end(struct request *req, blk_status_t status)`
`530`	`530`	`complete(SRpnt->waiting);`
`531`	`531`
`532`	`532`	`blk_rq_unmap_user(tmp);`
`533`		`- __blk_put_request(req->q, req);`
	`533`	`+ blk_put_request(req);`
`534`	`534`	`}`
`535`	`535`
`536`	`536`	`static int st_scsi_execute(struct st_request SRpnt, const unsigned char cmd,`
Original file line number	Diff line number	Diff line change
`@@ -1094,7 +1094,7 @@ static void pscsi_req_done(struct request *req, blk_status_t status)`
`1094`	`1094`	`break;`
`1095`	`1095`	`}`
`1096`	`1096`
`1097`		`- __blk_put_request(req->q, req);`
	`1097`	`+ blk_put_request(req);`
`1098`	`1098`	`kfree(pt);`
`1099`	`1099`	`}`
`1100`	`1100`