From: Johannes Thumshirn <jthumshirn@suse.de> To: "Martin K . Petersen" <martin.petersen@oracle.com> Cc: Christoph Hellwig <hch@infradead.org>, Hannes Reinecke <hare@suse.de>, Linux Kernel Mailinglist <linux-kernel@vger.kernel.org>, Linux SCSI Mailinglist <linux-scsi@vger.kernel.org>, Johannes Thumshirn <jthumshirn@suse.de>, Jens Axboe <axboe@kernel.dk>, "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>, linux-block@vger.kernel.org (open list:BLOCK LAYER) Subject: [PATCH v2 14/16] block: add bsg_job_put() and bsg_job_get() Date: Wed, 12 Oct 2016 15:06:40 +0200 [thread overview] Message-ID: <18a915378ba11b84faa85341beb57df3f5976b64.1476276823.git.jthumshirn@suse.de> (raw) In-Reply-To: <cover.1476276823.git.jthumshirn@suse.de> In-Reply-To: <cover.1476276823.git.jthumshirn@suse.de> Add bsg_job_put() and bsg_job_get() so don't need to export bsg_destroy_job() any more. Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> --- block/bsg-lib.c | 17 ++++++++++++++--- drivers/scsi/scsi_transport_fc.c | 4 ++-- include/linux/bsg-lib.h | 3 ++- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/block/bsg-lib.c b/block/bsg-lib.c index 5d24d25..46a4fee 100644 --- a/block/bsg-lib.c +++ b/block/bsg-lib.c @@ -32,7 +32,7 @@ * bsg_destroy_job - routine to teardown/delete a bsg job * @job: bsg_job that is to be torn down */ -void bsg_destroy_job(struct kref *kref) +static void bsg_destroy_job(struct kref *kref) { struct bsg_job *job = container_of(kref, struct bsg_job, kref); @@ -42,7 +42,18 @@ void bsg_destroy_job(struct kref *kref) kfree(job->reply_payload.sg_list); kfree(job); } -EXPORT_SYMBOL_GPL(bsg_destroy_job); + +void bsg_job_put(struct bsg_job *job) +{ + kref_put(&job->kref, bsg_destroy_job); +} +EXPORT_SYMBOL_GPL(bsg_job_put); + +int bsg_job_get(struct bsg_job *job) +{ + return kref_get_unless_zero(&job->kref); +} +EXPORT_SYMBOL_GPL(bsg_job_get); /** * bsg_job_done - completion routine for bsg requests @@ -87,7 +98,7 @@ void bsg_softirq_done(struct request *rq) struct bsg_job *job = rq->special; blk_end_request_all(rq, rq->errors); - kref_put(&job->kref, bsg_destroy_job); + bsg_job_put(job); } EXPORT_SYMBOL_GPL(bsg_softirq_done); diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c index 720ddc9..7fae045 100644 --- a/drivers/scsi/scsi_transport_fc.c +++ b/drivers/scsi/scsi_transport_fc.c @@ -3571,13 +3571,13 @@ fc_bsg_job_timeout(struct request *req) if (rport && rport->port_state == FC_PORTSTATE_BLOCKED) return BLK_EH_RESET_TIMER; - inflight = kref_get_unless_zero(&job->kref); + inflight = bsg_job_get(job); if (inflight && i->f->bsg_timeout) { /* call LLDD to abort the i/o as it has timed out */ err = i->f->bsg_timeout(job); if (err == -EAGAIN) { - kref_put(&job->kref, bsg_destroy_job); + bsg_job_put(job); return BLK_EH_RESET_TIMER; } else if (err) printk(KERN_ERR "ERROR: FC BSG request timeout - LLD " diff --git a/include/linux/bsg-lib.h b/include/linux/bsg-lib.h index 09f3044..b708db9 100644 --- a/include/linux/bsg-lib.h +++ b/include/linux/bsg-lib.h @@ -69,7 +69,8 @@ void bsg_job_done(struct bsg_job *job, int result, 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); +void bsg_job_put(struct bsg_job *job); +int __must_check bsg_job_get(struct bsg_job *job); #endif -- 1.8.5.6
WARNING: multiple messages have this Message-ID (diff)
From: Johannes Thumshirn <jthumshirn@suse.de> To: "Martin K . Petersen" <martin.petersen@oracle.com> Cc: Christoph Hellwig <hch@infradead.org>, Hannes Reinecke <hare@suse.de>, Linux Kernel Mailinglist <linux-kernel@vger.kernel.org>, Linux SCSI Mailinglist <linux-scsi@vger.kernel.org>, Johannes Thumshirn <jthumshirn@suse.de>, Jens Axboe <axboe@kernel.dk>, "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>, "open list:BLOCK LAYER" <linux-block@vger.kernel.org> Subject: [PATCH v2 14/16] block: add bsg_job_put() and bsg_job_get() Date: Wed, 12 Oct 2016 15:06:40 +0200 [thread overview] Message-ID: <18a915378ba11b84faa85341beb57df3f5976b64.1476276823.git.jthumshirn@suse.de> (raw) In-Reply-To: <cover.1476276823.git.jthumshirn@suse.de> In-Reply-To: <cover.1476276823.git.jthumshirn@suse.de> Add bsg_job_put() and bsg_job_get() so don't need to export bsg_destroy_job() any more. Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> --- block/bsg-lib.c | 17 ++++++++++++++--- drivers/scsi/scsi_transport_fc.c | 4 ++-- include/linux/bsg-lib.h | 3 ++- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/block/bsg-lib.c b/block/bsg-lib.c index 5d24d25..46a4fee 100644 --- a/block/bsg-lib.c +++ b/block/bsg-lib.c @@ -32,7 +32,7 @@ * bsg_destroy_job - routine to teardown/delete a bsg job * @job: bsg_job that is to be torn down */ -void bsg_destroy_job(struct kref *kref) +static void bsg_destroy_job(struct kref *kref) { struct bsg_job *job = container_of(kref, struct bsg_job, kref); @@ -42,7 +42,18 @@ void bsg_destroy_job(struct kref *kref) kfree(job->reply_payload.sg_list); kfree(job); } -EXPORT_SYMBOL_GPL(bsg_destroy_job); + +void bsg_job_put(struct bsg_job *job) +{ + kref_put(&job->kref, bsg_destroy_job); +} +EXPORT_SYMBOL_GPL(bsg_job_put); + +int bsg_job_get(struct bsg_job *job) +{ + return kref_get_unless_zero(&job->kref); +} +EXPORT_SYMBOL_GPL(bsg_job_get); /** * bsg_job_done - completion routine for bsg requests @@ -87,7 +98,7 @@ void bsg_softirq_done(struct request *rq) struct bsg_job *job = rq->special; blk_end_request_all(rq, rq->errors); - kref_put(&job->kref, bsg_destroy_job); + bsg_job_put(job); } EXPORT_SYMBOL_GPL(bsg_softirq_done); diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c index 720ddc9..7fae045 100644 --- a/drivers/scsi/scsi_transport_fc.c +++ b/drivers/scsi/scsi_transport_fc.c @@ -3571,13 +3571,13 @@ fc_bsg_job_timeout(struct request *req) if (rport && rport->port_state == FC_PORTSTATE_BLOCKED) return BLK_EH_RESET_TIMER; - inflight = kref_get_unless_zero(&job->kref); + inflight = bsg_job_get(job); if (inflight && i->f->bsg_timeout) { /* call LLDD to abort the i/o as it has timed out */ err = i->f->bsg_timeout(job); if (err == -EAGAIN) { - kref_put(&job->kref, bsg_destroy_job); + bsg_job_put(job); return BLK_EH_RESET_TIMER; } else if (err) printk(KERN_ERR "ERROR: FC BSG request timeout - LLD " diff --git a/include/linux/bsg-lib.h b/include/linux/bsg-lib.h index 09f3044..b708db9 100644 --- a/include/linux/bsg-lib.h +++ b/include/linux/bsg-lib.h @@ -69,7 +69,8 @@ void bsg_job_done(struct bsg_job *job, int result, 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); +void bsg_job_put(struct bsg_job *job); +int __must_check bsg_job_get(struct bsg_job *job); #endif -- 1.8.5.6
next prev parent reply other threads:[~2016-10-12 13:06 UTC|newest] Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-10-12 13:06 [PATCH v2 00/16] Convert FibreChannel bsg code to use bsg-lib Johannes Thumshirn 2016-10-12 13:06 ` [PATCH v2 01/16] scsi: Get rid of struct fc_bsg_buffer Johannes Thumshirn 2016-10-13 9:01 ` Hannes Reinecke 2016-10-12 13:06 ` [PATCH v2 02/16] scsi: don't use fc_bsg_job::request and fc_bsg_job::reply directly Johannes Thumshirn 2016-10-12 13:06 ` Johannes Thumshirn 2016-10-13 11:25 ` Hannes Reinecke 2016-10-13 11:25 ` Hannes Reinecke 2016-10-13 11:25 ` Hannes Reinecke 2016-10-13 15:15 ` Steffen Maier 2016-10-13 15:15 ` Steffen Maier 2016-10-13 15:15 ` Steffen Maier 2016-10-13 16:24 ` Johannes Thumshirn 2016-10-13 16:24 ` Johannes Thumshirn 2016-10-13 16:24 ` Johannes Thumshirn 2016-10-28 9:53 ` Steffen Maier 2016-10-28 9:53 ` Steffen Maier 2016-10-28 9:53 ` Steffen Maier 2016-10-28 11:31 ` Hannes Reinecke 2016-10-28 11:31 ` Hannes Reinecke 2016-10-28 11:31 ` Hannes Reinecke 2016-10-28 13:53 ` Steffen Maier 2016-10-28 13:53 ` Steffen Maier 2016-10-28 13:53 ` Steffen Maier 2016-10-28 16:29 ` Andreas Krebbel1 2016-10-28 16:29 ` Andreas Krebbel1 2016-10-28 16:29 ` Andreas Krebbel1 2016-10-30 17:56 ` Johannes Thumshirn 2016-10-30 17:56 ` Johannes Thumshirn 2016-10-30 17:56 ` Johannes Thumshirn 2016-10-12 13:06 ` [PATCH v2 03/16] scsi: fc: Export fc_bsg_jobdone and use it in FC drivers Johannes Thumshirn 2016-10-12 13:06 ` Johannes Thumshirn 2016-10-13 11:27 ` Hannes Reinecke 2016-10-13 11:27 ` Hannes Reinecke 2016-10-13 11:27 ` Hannes Reinecke 2016-10-12 13:06 ` [PATCH v2 04/16] scsi: Unify interfaces of fc_bsg_jobdone and bsg_job_done Johannes Thumshirn 2016-10-12 13:06 ` Johannes Thumshirn 2016-10-13 11:33 ` Hannes Reinecke 2016-10-13 11:33 ` Hannes Reinecke 2016-10-13 11:33 ` Hannes Reinecke 2016-10-12 13:06 ` [PATCH v2 05/16] scsi: fc: provide fc_bsg_to_shost() helper Johannes Thumshirn 2016-10-12 13:06 ` Johannes Thumshirn 2016-10-13 11:34 ` Hannes Reinecke 2016-10-13 11:34 ` Hannes Reinecke 2016-10-13 11:34 ` Hannes Reinecke 2016-10-12 13:06 ` [PATCH v2 06/16] scsi: fc: provide fc_bsg_to_rport() helper Johannes Thumshirn 2016-10-12 13:06 ` Johannes Thumshirn 2016-10-13 11:34 ` Hannes Reinecke 2016-10-13 11:34 ` Hannes Reinecke 2016-10-13 11:34 ` Hannes Reinecke 2016-10-12 13:06 ` [PATCH v2 07/16] scsi: libfc: don't set FC_RQST_STATE_DONE before calling fc_bsg_jobdone() Johannes Thumshirn 2016-10-12 13:06 ` Johannes Thumshirn 2016-10-13 11:38 ` Hannes Reinecke 2016-10-13 11:38 ` Hannes Reinecke 2016-10-12 13:06 ` [PATCH v2 08/16] scsi: fc: implement kref backed reference counting Johannes Thumshirn 2016-10-13 11:42 ` Hannes Reinecke 2016-10-13 14:40 ` Johannes Thumshirn 2016-10-12 13:06 ` [PATCH v2 09/16] block: add reference counting for struct bsg_job Johannes Thumshirn 2016-10-12 13:06 ` Johannes Thumshirn 2016-10-13 11:43 ` Hannes Reinecke 2016-10-13 11:43 ` Hannes Reinecke 2016-10-12 13:06 ` [PATCH v2 10/16] scsi: change FC drivers to use 'struct bsg_job' Johannes Thumshirn 2016-10-12 13:06 ` Johannes Thumshirn 2016-10-13 11:44 ` Hannes Reinecke 2016-10-13 11:44 ` Hannes Reinecke 2016-10-13 11:44 ` Hannes Reinecke 2016-10-12 13:06 ` [PATCH v2 11/16] scsi: fc: Use bsg_destroy_job Johannes Thumshirn 2016-10-12 13:06 ` Johannes Thumshirn 2016-10-13 11:45 ` Hannes Reinecke 2016-10-13 11:45 ` Hannes Reinecke 2016-10-12 13:06 ` [PATCH v2 12/16] scsi: fc: use bsg_softirq_done Johannes Thumshirn 2016-10-12 13:06 ` Johannes Thumshirn 2016-10-13 11:45 ` Hannes Reinecke 2016-10-13 11:45 ` Hannes Reinecke 2016-10-12 13:06 ` [PATCH v2 13/16] scsi: fc: use bsg_job_done Johannes Thumshirn 2016-10-12 13:06 ` Johannes Thumshirn 2016-10-13 11:46 ` Hannes Reinecke 2016-10-13 11:46 ` Hannes Reinecke 2016-10-13 11:46 ` Hannes Reinecke 2016-10-12 13:06 ` Johannes Thumshirn [this message] 2016-10-12 13:06 ` [PATCH v2 14/16] block: add bsg_job_put() and bsg_job_get() Johannes Thumshirn 2016-10-13 11:47 ` Hannes Reinecke 2016-10-13 11:47 ` Hannes Reinecke 2016-10-12 13:06 ` [PATCH v2 15/16] scsi: fc: move FC transport's bsg code to bsg-lib Johannes Thumshirn 2016-10-13 11:49 ` Hannes Reinecke 2016-10-12 13:06 ` [PATCH v2 16/16] block: unexport bsg_softirq_done() again Johannes Thumshirn 2016-10-12 13:06 ` Johannes Thumshirn 2016-10-13 11:50 ` Hannes Reinecke 2016-10-13 11:50 ` Hannes Reinecke 2016-10-12 15:54 ` [PATCH v2 00/16] Convert FibreChannel bsg code to use bsg-lib Steffen Maier 2016-10-13 7:39 ` Johannes Thumshirn
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=18a915378ba11b84faa85341beb57df3f5976b64.1476276823.git.jthumshirn@suse.de \ --to=jthumshirn@suse.de \ --cc=axboe@kernel.dk \ --cc=hare@suse.de \ --cc=hch@infradead.org \ --cc=jejb@linux.vnet.ibm.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-scsi@vger.kernel.org \ --cc=martin.petersen@oracle.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.