From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752656AbbIOQto (ORCPT ); Tue, 15 Sep 2015 12:49:44 -0400 Received: from mx2.suse.de ([195.135.220.15]:52889 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753114AbbIOQrv (ORCPT ); Tue, 15 Sep 2015 12:47:51 -0400 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" From: Lee Duncan To: , Cc: Hannes Reinecke , Johannes Thumshirn , Christoph Hellwig , Lee Duncan Subject: [PATCH 13/17] Update the SCSI disk driver to use ida helper functions. Date: Tue, 15 Sep 2015 09:46:13 -0700 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Lee Duncan --- drivers/scsi/sd.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 3b2fcb4fada0..60b2ad918208 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -2948,15 +2948,7 @@ 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); - + error = ida_get_index(&sd_index_ida, &sd_index_lock, &index); if (error) { sdev_printk(KERN_WARNING, sdp, "sd_probe: memory exhausted.\n"); goto out_put; @@ -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_put_index(&sd_index_ida, &sd_index_lock, index); out_put: put_disk(gd); out_free: @@ -3063,10 +3053,8 @@ 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_put_index(&sd_index_ida, &sd_index_lock, sdkp->index); blk_integrity_unregister(disk); disk->private_data = NULL; -- 2.1.4