From patchwork Tue Sep 15 16:46:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Duncan X-Patchwork-Id: 7188211 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0E29F9F444 for ; Tue, 15 Sep 2015 16:50:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 412112051A for ; Tue, 15 Sep 2015 16:50:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5764620544 for ; Tue, 15 Sep 2015 16:50:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753130AbbIOQrv (ORCPT ); Tue, 15 Sep 2015 12:47:51 -0400 Received: from mx2.suse.de ([195.135.220.15]:52865 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753064AbbIOQru (ORCPT ); Tue, 15 Sep 2015 12:47:50 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id AC757AD68; Tue, 15 Sep 2015 16:47:48 +0000 (UTC) Received: by worklaptop.gonzoleeman.net (Postfix, from userid 1000) id B59CA40C7C; Tue, 15 Sep 2015 09:47:36 -0700 (PDT) From: Lee Duncan To: , Cc: Hannes Reinecke , Johannes Thumshirn , Christoph Hellwig , Lee Duncan , Mike Snitzer Subject: [PATCH 05/17] Update the md driver to use idr helper functions. Date: Tue, 15 Sep 2015 09:46:05 -0700 Message-Id: <6798bc818d81b24058b9c0a70990149d96002646.1442263512.git.lduncan@suse.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Lee Duncan --- drivers/md/dm.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/md/dm.c b/drivers/md/dm.c index f331d888e7f5..53d6895eb13d 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2202,9 +2202,7 @@ static int dm_any_congested(void *congested_data, int bdi_bits) *---------------------------------------------------------------*/ static void free_minor(int minor) { - spin_lock(&_minor_lock); - idr_remove(&_minor_idr, minor); - spin_unlock(&_minor_lock); + idr_put_index(&_minor_idr, &_minor_lock, minor); } /* @@ -2217,13 +2215,8 @@ static int specific_minor(int minor) if (minor >= (1 << MINORBITS)) return -EINVAL; - idr_preload(GFP_KERNEL); - spin_lock(&_minor_lock); - - r = idr_alloc(&_minor_idr, MINOR_ALLOCED, minor, minor + 1, GFP_NOWAIT); - - spin_unlock(&_minor_lock); - idr_preload_end(); + r = idr_get_index_in_range(&_minor_idr, &_minor_lock, MINOR_ALLOCED, + minor, minor + 1); if (r < 0) return r == -ENOSPC ? -EBUSY : r; return 0; @@ -2233,13 +2226,8 @@ static int next_free_minor(int *minor) { int r; - idr_preload(GFP_KERNEL); - spin_lock(&_minor_lock); - - r = idr_alloc(&_minor_idr, MINOR_ALLOCED, 0, 1 << MINORBITS, GFP_NOWAIT); - - spin_unlock(&_minor_lock); - idr_preload_end(); + r = idr_get_index_in_range(&_minor_idr, &_minor_lock, MINOR_ALLOCED, + 0, 1 << MINORBITS); if (r < 0) return r; *minor = r;