summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--block/bsg-lib.c3
-rw-r--r--drivers/scsi/scsi_transport_fc.c15
-rw-r--r--include/linux/bsg-lib.h1
3 files changed, 5 insertions, 14 deletions
diff --git a/block/bsg-lib.c b/block/bsg-lib.c
index 9f1e8fde924a..6661f823db4c 100644
--- a/block/bsg-lib.c
+++ b/block/bsg-lib.c
@@ -85,12 +85,13 @@ EXPORT_SYMBOL_GPL(bsg_job_done);
* bsg_softirq_done - softirq done routine for destroying the bsg requests
* @rq: BSG request that holds the job to be destroyed
*/
-static void bsg_softirq_done(struct request *rq)
+void bsg_softirq_done(struct request *rq)
{
struct bsg_job *job = rq->special;
kref_put(&job->kref, bsg_destroy_job);
}
+EXPORT_SYMBOL_GPL(bsg_softirq_done);
static int bsg_map_buffer(struct bsg_buffer *buf, struct request *req)
{
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 616c7e1cbab2..1d959ae7d0c8 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -3591,17 +3591,6 @@ void fc_bsg_jobdone(struct bsg_job *job, int result,
EXPORT_SYMBOL_GPL(fc_bsg_jobdone);
/**
- * fc_bsg_softirq_done - softirq done routine for destroying the bsg requests
- * @rq: BSG request that holds the job to be destroyed
- */
-static void fc_bsg_softirq_done(struct request *rq)
-{
- struct bsg_job *job = rq->special;
-
- kref_put(&job->kref, bsg_destroy_job);
-}
-
-/**
* fc_bsg_job_timeout - handler for when a bsg request timesout
* @req: request that timed out
*/
@@ -4033,7 +4022,7 @@ fc_bsg_hostadd(struct Scsi_Host *shost, struct fc_host_attrs *fc_host)
q->queuedata = shost;
queue_flag_set_unlocked(QUEUE_FLAG_BIDI, q);
- blk_queue_softirq_done(q, fc_bsg_softirq_done);
+ blk_queue_softirq_done(q, bsg_softirq_done);
blk_queue_rq_timed_out(q, fc_bsg_job_timeout);
blk_queue_rq_timeout(q, FC_DEFAULT_BSG_TIMEOUT);
@@ -4079,7 +4068,7 @@ fc_bsg_rportadd(struct Scsi_Host *shost, struct fc_rport *rport)
q->queuedata = rport;
queue_flag_set_unlocked(QUEUE_FLAG_BIDI, q);
- blk_queue_softirq_done(q, fc_bsg_softirq_done);
+ blk_queue_softirq_done(q, bsg_softirq_done);
blk_queue_rq_timed_out(q, fc_bsg_job_timeout);
blk_queue_rq_timeout(q, BLK_DEFAULT_SG_TIMEOUT);
diff --git a/include/linux/bsg-lib.h b/include/linux/bsg-lib.h
index 67f7de6146c9..09f304437cd6 100644
--- a/include/linux/bsg-lib.h
+++ b/include/linux/bsg-lib.h
@@ -70,5 +70,6 @@ int bsg_setup_queue(struct device *dev, struct request_queue *q, char *name,
bsg_job_fn *job_fn, int dd_job_size);
void bsg_request_fn(struct request_queue *q);
void bsg_destroy_job(struct kref *kref);
+void bsg_softirq_done(struct request *rq);
#endif