Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

block/blk-core.c

+0 −9
Original line number Diff line number Diff line
@@ -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);

block/blk-merge.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/scsi/osd/osd_initiator.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/scsi/osst.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/scsi/scsi_error.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}



/**