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 1/5] SCSI: sd: simplify ida usage
Date: Fri, 02 Oct 2015 12:15:04 +0200 [thread overview]
Message-ID: <mqd4mi98tlj.fsf@c203.arch.suse.de> (raw)
In-Reply-To: <c832f76821c18fa953ff539b6e852bfd2cdc24b8.1443723136.git.lduncan@suse.com> (Lee Duncan's message of "Thu, 1 Oct 2015 11:59:05 -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/scsi/sd.c | 22 +++++-----------------
> 1 file changed, 5 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
> index 3b2fcb4fada0..3d77ac8f0d4c 100644
> --- a/drivers/scsi/sd.c
> +++ b/drivers/scsi/sd.c
> @@ -118,7 +118,6 @@ static void scsi_disk_release(struct device *cdev);
> static void sd_print_sense_hdr(struct scsi_disk *, struct scsi_sense_hdr *);
> static void sd_print_result(const struct scsi_disk *, const char *, int);
>
> -static DEFINE_SPINLOCK(sd_index_lock);
> static DEFINE_IDA(sd_index_ida);
>
> /* This semaphore is used to mediate the 0->1 reference get in the
> @@ -2948,19 +2947,12 @@ static int sd_probe(struct device *dev)
> if (!gd)
> goto out_free;
>
> - do {
> - if (!ida_pre_get(&sd_index_ida, GFP_KERNEL))
> - goto out_put;
> -
> - spin_lock(&sd_index_lock);
> - error = ida_get_new(&sd_index_ida, &index);
> - spin_unlock(&sd_index_lock);
> - } while (error == -EAGAIN);
> -
> - if (error) {
> + error = ida_simple_get(&sd_index_ida, 0, 0, GFP_KERNEL);
> + if (error < 0) {
> sdev_printk(KERN_WARNING, sdp, "sd_probe: memory exhausted.\n");
> goto out_put;
> }
> + index = error;
>
> error = sd_format_disk_name("sd", index, gd->disk_name, DISK_NAME_LEN);
> if (error) {
> @@ -3001,9 +2993,7 @@ static int sd_probe(struct device *dev)
> return 0;
>
> out_free_index:
> - spin_lock(&sd_index_lock);
> - ida_remove(&sd_index_ida, index);
> - spin_unlock(&sd_index_lock);
> + ida_simple_remove(&sd_index_ida, index);
> out_put:
> put_disk(gd);
> out_free:
> @@ -3064,9 +3054,7 @@ static void scsi_disk_release(struct device *dev)
> struct scsi_disk *sdkp = to_scsi_disk(dev);
> struct gendisk *disk = sdkp->disk;
>
> - spin_lock(&sd_index_lock);
> - ida_remove(&sd_index_ida, sdkp->index);
> - spin_unlock(&sd_index_lock);
> + ida_simple_remove(&sd_index_ida, sdkp->index);
>
> blk_integrity_unregister(disk);
> disk->private_data = NULL;
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:15 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 [this message]
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
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=mqd4mi98tlj.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).