scsi: fc: use bsg_softirq_done

bsg_softirq_done() and fc_bsg_softirq_done() are copies of each other, so
ditch the fc specific one.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/block/bsg-lib.c b/block/bsg-lib.c
index 9f1e8fde924aeda47072c8f621fd0dcf504a4cdc..6661f823db4c465ca13b78bc3b54fc3dbcbe2de0 100644 (file)
--- 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 616c7e1cbab2255408c1ca3424e26330f2fb1743..1d959ae7d0c89c0b24e2b8d3715d5a81f1103505 100644 (file)
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -3590,17 +3590,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 67f7de6146c9c212b000e8196dc749e0f57234e9..09f304437cd69e5df65071c361216d317a4203fc 100644 (file)
--- 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