On 25/10/18 23:10, Jens Axboe wrote:
> All drivers do unregister + cleanup, provide a helper for that.
>
> Cc: Johannes Thumshirn <jthumshirn@xxxxxxx>
> Cc: Benjamin Block <bblock@xxxxxxxxxxxxxxxxxx>
> Cc: linux-scsi@xxxxxxxxxxxxxxx
> Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
> ---
> block/bsg-lib.c | 7 +++++++
> drivers/scsi/scsi_transport_fc.c | 6 ++----
> drivers/scsi/scsi_transport_iscsi.c | 7 +++----
> drivers/scsi/scsi_transport_sas.c | 6 ++----
> include/linux/bsg-lib.h | 1 +
> 5 files changed, 15 insertions(+), 12 deletions(-)
>
> diff --git a/block/bsg-lib.c b/block/bsg-lib.c
> index 1da011ec04e6..267f965af77a 100644
> --- a/block/bsg-lib.c
> +++ b/block/bsg-lib.c
> @@ -296,6 +296,13 @@ static void bsg_exit_rq(struct request_queue *q, struct request *req)
> kfree(job->reply);
> }
>
> +void bsg_remove_queue(struct request_queue *q)
> +{
> + bsg_unregister_queue(q);
> + blk_cleanup_queue(q);
> +}
> +EXPORT_SYMBOL_GPL(bsg_remove_queue);
> +
> /**
> * bsg_setup_queue - Create and add the bsg hooks so we can receive requests
> * @dev: device to attach bsg device to
> diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
> index 98aaffb4c715..4d64956bb5d3 100644
> --- a/drivers/scsi/scsi_transport_fc.c
> +++ b/drivers/scsi/scsi_transport_fc.c
> @@ -3851,10 +3851,8 @@ fc_bsg_rportadd(struct Scsi_Host *shost, struct fc_rport *rport)
> static void
> fc_bsg_remove(struct request_queue *q)
> {
> - if (q) {
> - bsg_unregister_queue(q);
> - blk_cleanup_queue(q);
> - }
> + if (q)
> + bsg_remove_queue(q);
> }
Not sure if I'm too late to the game, but as all callers do a
"if (q)" check, can't we just move it into bsg_remove_queue()?
Otherwise:
Reviewed-by: Johannes Thumshirn <jthumshirn@xxxxxxx>
--
Johannes Thumshirn SUSE Labs
jthumshirn@xxxxxxx +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
