From: Johannes Thumshirn <jthumshirn@suse.de>
To: Lee Duncan <lduncan@suse.com>
Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
James Bottomley <James.Bottomley@HansenPartnership.com>,
Tejun Heo <tj@kernel.org>, Hannes Reinecke <hare@suse.com>,
Christoph Hellwig <hch@infradead.org>
Subject: Re: [PATCH 4/5] block: mtip32xx: simplify ida usage
Date: Fri, 02 Oct 2015 12:16:04 +0200 [thread overview]
Message-ID: <mqdlhbl7ezf.fsf@c203.arch.suse.de> (raw)
In-Reply-To: <64f964663b1a35ff2352dc3cea76baaae03a2d13.1443723136.git.lduncan@suse.com> (Lee Duncan's message of "Thu, 1 Oct 2015 11:59:08 -0700")
Lee Duncan <lduncan@suse.com> writes:
> Simplify ida index allocation and removal by
> using the ida_simple_* helper functions
>
> Signed-off-by: Lee Duncan <lduncan@suse.com>
> ---
> drivers/block/mtip32xx/mtip32xx.c | 26 ++++++--------------------
> 1 file changed, 6 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
> index 4a2ef09e6704..e62d170b0641 100644
> --- a/drivers/block/mtip32xx/mtip32xx.c
> +++ b/drivers/block/mtip32xx/mtip32xx.c
> @@ -118,7 +118,6 @@ static struct dentry *dfs_device_status;
>
> static u32 cpu_use[NR_CPUS];
>
> -static DEFINE_SPINLOCK(rssd_index_lock);
> static DEFINE_IDA(rssd_index_ida);
>
> static int mtip_block_initialize(struct driver_data *dd);
> @@ -3821,17 +3820,10 @@ static int mtip_block_initialize(struct driver_data *dd)
> }
>
> /* Generate the disk name, implemented same as in sd.c */
> - do {
> - if (!ida_pre_get(&rssd_index_ida, GFP_KERNEL))
> - goto ida_get_error;
> -
> - spin_lock(&rssd_index_lock);
> - rv = ida_get_new(&rssd_index_ida, &index);
> - spin_unlock(&rssd_index_lock);
> - } while (rv == -EAGAIN);
> -
> - if (rv)
> + rv = ida_simple_get(&rssd_index_ida, 0, 0, GFP_KERNEL);
> + if (rv < 0)
> goto ida_get_error;
> + index = rv;
>
> rv = rssd_disk_name_format("rssd",
> index,
> @@ -3981,9 +3973,7 @@ init_hw_cmds_error:
> block_queue_alloc_init_error:
> mtip_hw_debugfs_exit(dd);
> disk_index_error:
> - spin_lock(&rssd_index_lock);
> - ida_remove(&rssd_index_ida, index);
> - spin_unlock(&rssd_index_lock);
> + ida_simple_remove(&rssd_index_ida, index);
>
> ida_get_error:
> put_disk(dd->disk);
> @@ -4051,9 +4041,7 @@ static int mtip_block_remove(struct driver_data *dd)
> }
> dd->disk = NULL;
>
> - spin_lock(&rssd_index_lock);
> - ida_remove(&rssd_index_ida, dd->index);
> - spin_unlock(&rssd_index_lock);
> + ida_simple_remove(&rssd_index_ida, dd->index);
>
> /* De-initialize the protocol layer. */
> mtip_hw_exit(dd);
> @@ -4092,9 +4080,7 @@ static int mtip_block_shutdown(struct driver_data *dd)
> dd->queue = NULL;
> }
>
> - spin_lock(&rssd_index_lock);
> - ida_remove(&rssd_index_ida, dd->index);
> - spin_unlock(&rssd_index_lock);
> + ida_simple_remove(&rssd_index_ida, dd->index);
> return 0;
> }
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
--
Johannes Thumshirn Storage
jthumshirn@suse.de +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
next prev parent reply other threads:[~2015-10-02 10:16 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-01 18:59 [PATCH 0/5] Modify ida_* users to use ida_simple_* Lee Duncan
2015-10-01 18:59 ` [PATCH 1/5] SCSI: sd: simplify ida usage Lee Duncan
2015-10-02 10:15 ` Johannes Thumshirn
2015-10-01 18:59 ` [PATCH 2/5] block: rsxx: core: " Lee Duncan
2015-10-02 10:15 ` Johannes Thumshirn
2015-10-01 18:59 ` [PATCH 3/5] block: nvme-core: " Lee Duncan
2015-10-02 10:15 ` Johannes Thumshirn
2015-10-08 14:29 ` Keith Busch
2015-10-01 18:59 ` [PATCH 4/5] block: mtip32xx: " Lee Duncan
2015-10-02 10:16 ` Johannes Thumshirn [this message]
2015-10-01 18:59 ` [PATCH 5/5] base: soc: siplify " Lee Duncan
2015-10-02 10:16 ` Johannes Thumshirn
2015-10-05 17:44 ` [PATCH 0/5] Modify ida_* users to use ida_simple_* Tejun Heo
2015-10-05 17:52 ` James Bottomley
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=mqdlhbl7ezf.fsf@c203.arch.suse.de \
--to=jthumshirn@suse.de \
--cc=James.Bottomley@HansenPartnership.com \
--cc=hare@suse.com \
--cc=hch@infradead.org \
--cc=lduncan@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=tj@kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).