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

bsg: provide bsg_remove_queue() helper

Browse Source 
All drivers do unregister + cleanup, provide a helper for that.

Cc: linux-scsi@vger.kernel.org
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Tested-by: Benjamin Block <bblock@linux.vnet.ibm.com>
Tested-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2018-10-26 11:27:02 -06:00
parent aae3b069d5
commit 5e28b8d8a1
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
block/bsg-lib.c
View File

@ -296,6 +296,15 @@ static void bsg_exit_rq(struct request_queue *q, struct request *req)
kfree(job->reply); kfree(job->reply);
} }
void bsg_remove_queue(struct request_queue *q)
{
if (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 * bsg_setup_queue - Create and add the bsg hooks so we can receive requests
* @dev: device to attach bsg device to * @dev: device to attach bsg device to

5
drivers/scsi/scsi_transport_fc.c
View File

@ -3851,10 +3851,7 @@ fc_bsg_rportadd(struct Scsi_Host *shost, struct fc_rport *rport)
static void static void
fc_bsg_remove(struct request_queue *q) fc_bsg_remove(struct request_queue *q)
{ {
if (q) { bsg_remove_queue(q);
bsg_unregister_queue(q);
blk_cleanup_queue(q);
}
} }

5
drivers/scsi/scsi_transport_iscsi.c
View File

@ -1576,10 +1576,7 @@ static int iscsi_remove_host(struct transport_container *tc,
struct Scsi_Host *shost = dev_to_shost(dev); struct Scsi_Host *shost = dev_to_shost(dev);
struct iscsi_cls_host *ihost = shost->shost_data; struct iscsi_cls_host *ihost = shost->shost_data;
if (ihost->bsg_q) { bsg_remove_queue(ihost->bsg_q);
bsg_unregister_queue(ihost->bsg_q);
blk_cleanup_queue(ihost->bsg_q);
}
return 0; return 0;
} }

6
drivers/scsi/scsi_transport_sas.c
View File

@ -246,11 +246,7 @@ static int sas_host_remove(struct transport_container *tc, struct device *dev,
struct Scsi_Host *shost = dev_to_shost(dev); struct Scsi_Host *shost = dev_to_shost(dev);
struct request_queue *q = to_sas_host_attrs(shost)->q; struct request_queue *q = to_sas_host_attrs(shost)->q;
if (q) { bsg_remove_queue(q);
bsg_unregister_queue(q);
blk_cleanup_queue(q);
}
return 0; return 0;
} }

2
drivers/scsi/ufs/ufs_bsg.c
View File

@ -157,7 +157,7 @@ void ufs_bsg_remove(struct ufs_hba *hba)
if (!hba->bsg_queue) if (!hba->bsg_queue)
return; return;
bsg_unregister_queue(hba->bsg_queue); bsg_remove_queue(hba->bsg_queue);
device_del(bsg_dev); device_del(bsg_dev);
put_device(bsg_dev); put_device(bsg_dev);

1
include/linux/bsg-lib.h
View File

@ -73,6 +73,7 @@ void bsg_job_done(struct bsg_job *job, int result,
unsigned int reply_payload_rcv_len); unsigned int reply_payload_rcv_len);
struct request_queue *bsg_setup_queue(struct device *dev, const char *name, struct request_queue *bsg_setup_queue(struct device *dev, const char *name,
bsg_job_fn *job_fn, rq_timed_out_fn *timeout, int dd_job_size); bsg_job_fn *job_fn, rq_timed_out_fn *timeout, int dd_job_size);
void bsg_remove_queue(struct request_queue *q);
void bsg_job_put(struct bsg_job *job); void bsg_job_put(struct bsg_job *job);
int __must_check bsg_job_get(struct bsg_job *job); int __must_check bsg_job_get(struct bsg_job *job);