Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1499671

[PATCH v2 09/16] block: add reference counting for struct bsg_job

Show all headers | View raw

Add reference counting to 'struct bsg_job' so we can implement a reuqest
timeout handler for bsg_jobs, which is needed for Fibre Channel.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
 block/bsg-lib.c         | 7 +++++--
 include/linux/bsg-lib.h | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/block/bsg-lib.c b/block/bsg-lib.c
index 650f427..632fb40 100644
--- a/block/bsg-lib.c
+++ b/block/bsg-lib.c
@@ -32,8 +32,10 @@
  * bsg_destroy_job - routine to teardown/delete a bsg job
  * @job: bsg_job that is to be torn down
  */
-static void bsg_destroy_job(struct bsg_job *job)
+static void bsg_destroy_job(struct kref *kref)
 {
+	struct bsg_job *job = container_of(kref, struct bsg_job, kref);
+
 	put_device(job->dev);	/* release reference for the request */
 
 	kfree(job->request_payload.sg_list);
@@ -84,7 +86,7 @@ static void bsg_softirq_done(struct request *rq)
 	struct bsg_job *job = rq->special;
 
 	blk_end_request_all(rq, rq->errors);
-	bsg_destroy_job(job);
+	kref_put(&job->kref, bsg_destroy_job);
 }
 
 static int bsg_map_buffer(struct bsg_buffer *buf, struct request *req)
@@ -142,6 +144,7 @@ static int bsg_create_job(struct device *dev, struct request *req)
 	job->dev = dev;
 	/* take a reference for the request */
 	get_device(job->dev);
+	kref_init(&job->kref);
 	return 0;
 
 failjob_rls_rqst_payload:
diff --git a/include/linux/bsg-lib.h b/include/linux/bsg-lib.h
index a226652..58e0717 100644
--- a/include/linux/bsg-lib.h
+++ b/include/linux/bsg-lib.h
@@ -40,6 +40,8 @@ struct bsg_job {
 	struct device *dev;
 	struct request *req;
 
+	struct kref kref;
+
 	/* Transport/driver specific request/reply structs */
 	void *request;
 	void *reply;
-- 
1.8.5.6

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 00/16] Convert FibreChannel bsg code to use bsg-lib Johannes Thumshirn <jthumshirn@suse.de> - 2016-10-12 15:10 +0200
  [PATCH v2 11/16] scsi: fc: Use bsg_destroy_job Johannes Thumshirn <jthumshirn@suse.de> - 2016-10-12 15:20 +0200
  [PATCH v2 03/16] scsi: fc: Export fc_bsg_jobdone and use it in FC drivers Johannes Thumshirn <jthumshirn@suse.de> - 2016-10-12 15:20 +0200
    Re: [PATCH v2 03/16] scsi: fc: Export fc_bsg_jobdone and use it in FC  drivers Hannes Reinecke <hare@suse.de> - 2016-10-13 13:30 +0200
  [PATCH v2 08/16] scsi: fc: implement kref backed reference counting Johannes Thumshirn <jthumshirn@suse.de> - 2016-10-12 15:20 +0200
    Re: [PATCH v2 08/16] scsi: fc: implement kref backed reference  counting Hannes Reinecke <hare@suse.de> - 2016-10-13 13:50 +0200
      Re: [PATCH v2 08/16] scsi: fc: implement kref backed reference  counting Johannes Thumshirn <jthumshirn@suse.de> - 2016-10-13 16:50 +0200
  [PATCH v2 04/16] scsi: Unify interfaces of fc_bsg_jobdone and bsg_job_done Johannes Thumshirn <jthumshirn@suse.de> - 2016-10-12 15:20 +0200
  [PATCH v2 06/16] scsi: fc: provide fc_bsg_to_rport() helper Johannes Thumshirn <jthumshirn@suse.de> - 2016-10-12 15:20 +0200
  [PATCH v2 09/16] block: add reference counting for struct bsg_job Johannes Thumshirn <jthumshirn@suse.de> - 2016-10-12 15:20 +0200
  [PATCH v2 07/16] scsi: libfc: don't set FC_RQST_STATE_DONE before calling fc_bsg_jobdone() Johannes Thumshirn <jthumshirn@suse.de> - 2016-10-12 15:20 +0200
  [PATCH v2 05/16] scsi: fc: provide fc_bsg_to_shost() helper Johannes Thumshirn <jthumshirn@suse.de> - 2016-10-12 15:20 +0200
  Re: [PATCH v2 00/16] Convert FibreChannel bsg code to use bsg-lib Steffen Maier <maier@linux.vnet.ibm.com> - 2016-10-12 21:50 +0200
    Re: [PATCH v2 00/16] Convert FibreChannel bsg code to use bsg-lib Johannes Thumshirn <jthumshirn@suse.de> - 2016-10-13 10:30 +0200
  Re: [PATCH v2 02/16] scsi: don't use fc_bsg_job::request and  fc_bsg_job::reply directly Hannes Reinecke <hare@suse.de> - 2016-10-13 13:30 +0200
  Re: [PATCH v2 02/16] scsi: don't use fc_bsg_job::request and  fc_bsg_job::reply directly Steffen Maier <maier@linux.vnet.ibm.com> - 2016-10-13 17:20 +0200
    Re: [PATCH v2 02/16] scsi: don't use fc_bsg_job::request and  fc_bsg_job::reply directly Johannes Thumshirn <jthumshirn@suse.de> - 2016-10-13 18:30 +0200

csiph-web