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

Commit c00da4c9 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Martin K. Petersen
Browse files

scsi: fc: Use bsg_destroy_job 



fc_destroy_bsgjob() and bsg_destroy_job() are now 1:1 copies, so use the
latter. As bsg_destroy_job() comes from bsg-lib we need to select it in
Kconfig once CONFOG_SCSI_FC_ATTRS is active.

Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 75cc8cfc

block/bsg-lib.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -32,9 +32,12 @@ 
 * bsg_destroy_job - routine to teardown/delete a bsg job

 * bsg_destroy_job - routine to teardown/delete a bsg job

 * @job: bsg_job that is to be torn down

 * @job: bsg_job that is to be torn down

 */

 */

static void bsg_destroy_job(struct kref *kref)

void bsg_destroy_job(struct kref *kref)

{

{

	struct bsg_job *job = container_of(kref, struct bsg_job, kref);

	struct bsg_job *job = container_of(kref, struct bsg_job, kref);

	struct request *rq = job->req;



	blk_end_request_all(rq, rq->errors);





	put_device(job->dev);	/* release reference for the request */

	put_device(job->dev);	/* release reference for the request */
@@ -42,6 +45,7 @@ static void bsg_destroy_job(struct kref *kref) 
	kfree(job->reply_payload.sg_list);

	kfree(job->reply_payload.sg_list);

	kfree(job);

	kfree(job);

}

}

EXPORT_SYMBOL_GPL(bsg_destroy_job);





/**

/**

 * bsg_job_done - completion routine for bsg requests

 * bsg_job_done - completion routine for bsg requests
@@ -85,7 +89,6 @@ static void bsg_softirq_done(struct request *rq) 
{

{

	struct bsg_job *job = rq->special;

	struct bsg_job *job = rq->special;





	blk_end_request_all(rq, rq->errors);

	kref_put(&job->kref, bsg_destroy_job);

	kref_put(&job->kref, bsg_destroy_job);

}

}

drivers/scsi/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -263,6 +263,7 @@ config SCSI_SPI_ATTRS 
config SCSI_FC_ATTRS

config SCSI_FC_ATTRS

	tristate "FiberChannel Transport Attributes"

	tristate "FiberChannel Transport Attributes"

	depends on SCSI && NET

	depends on SCSI && NET

	select BLK_DEV_BSGLIB

	select SCSI_NETLINK

	select SCSI_NETLINK

	help

	help

	  If you wish to export transport-specific information about

	  If you wish to export transport-specific information about

drivers/scsi/scsi_transport_fc.c

+3 −22
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/bsg-lib.h>

#include <scsi/scsi_device.h>

#include <scsi/scsi_device.h>

#include <scsi/scsi_host.h>

#include <scsi/scsi_host.h>

#include <scsi/scsi_transport.h>

#include <scsi/scsi_transport.h>
@@ -3554,26 +3555,6 @@ fc_vport_sched_delete(struct work_struct *work) 
 * BSG support

 * BSG support

 */

 */







/**

 * fc_destroy_bsgjob - routine to teardown/delete a fc bsg job

 * @job:	fc_bsg_job that is to be torn down

 */

static void

fc_destroy_bsgjob(struct kref *kref)

{

	struct bsg_job *job = container_of(kref, struct bsg_job, kref);

	struct request *rq = job->req;



	blk_end_request_all(rq, rq->errors);



	put_device(job->dev);	/* release reference for the request */



	kfree(job->request_payload.sg_list);

	kfree(job->reply_payload.sg_list);

	kfree(job);

}



/**

/**

 * fc_bsg_jobdone - completion routine for bsg requests that the LLD has

 * fc_bsg_jobdone - completion routine for bsg requests that the LLD has

 *                  completed

 *                  completed
@@ -3617,7 +3598,7 @@ static void fc_bsg_softirq_done(struct request *rq) 
{

{

	struct bsg_job *job = rq->special;

	struct bsg_job *job = rq->special;





	kref_put(&job->kref, fc_destroy_bsgjob);

	kref_put(&job->kref, bsg_destroy_job);

}

}





/**

/**
@@ -3642,7 +3623,7 @@ fc_bsg_job_timeout(struct request *req) 
		/* call LLDD to abort the i/o as it has timed out */

		/* call LLDD to abort the i/o as it has timed out */

		err = i->f->bsg_timeout(job);

		err = i->f->bsg_timeout(job);

		if (err == -EAGAIN) {

		if (err == -EAGAIN) {

			kref_put(&job->kref, fc_destroy_bsgjob);

			kref_put(&job->kref, bsg_destroy_job);

			return BLK_EH_RESET_TIMER;

			return BLK_EH_RESET_TIMER;

		} else if (err)

		} else if (err)

			printk(KERN_ERR "ERROR: FC BSG request timeout - LLD "

			printk(KERN_ERR "ERROR: FC BSG request timeout - LLD "

include/linux/bsg-lib.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -69,5 +69,6 @@ void bsg_job_done(struct bsg_job *job, int result, 
int bsg_setup_queue(struct device *dev, struct request_queue *q, char *name,

int bsg_setup_queue(struct device *dev, struct request_queue *q, char *name,

		    bsg_job_fn *job_fn, int dd_job_size);

		    bsg_job_fn *job_fn, int dd_job_size);

void bsg_request_fn(struct request_queue *q);

void bsg_request_fn(struct request_queue *q);

void bsg_destroy_job(struct kref *kref);





#endif
 
#endif