From patchwork Mon Jan 15 20:37:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 188335 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2614:b0:101:6a76:bbe3 with SMTP id mm20csp1934170dyc; Mon, 15 Jan 2024 12:38:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IEId66aqpjmKWh325mBaRtcv1xbrOBMtgbKDgZpROHna5k7zXsWV0QehiI5JwzdmF4z3c3J X-Received: by 2002:ac8:578b:0:b0:429:f8fb:1cb with SMTP id v11-20020ac8578b000000b00429f8fb01cbmr1690982qta.45.1705351112884; Mon, 15 Jan 2024 12:38:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705351112; cv=none; d=google.com; s=arc-20160816; b=g06Dd1L6rzhgvI14jUtMbE6l7Y4H9oH/IChzE/co9eA5X0VD8XICmqTNmTmFhOYatK ICv5ciJnTEL7IZxRIKNYV06DzDKyW7lS78wN1pvdBiOuIUYkwS5HDQysZmUh8CuOvXJk B2H6Op3cuVTo0HTvlAod3qNPcpIsdzEnKcqexH4gaAaCt2rjPbvUxOZlBaKhit5WAHE5 ttwjf7TZnVfHhGj1c/YQalZHo3iRJXA9JrM0Ci18oXnePcO2dC89EORMq5b07x9KgAwG b/KgIbetrKWFWxNv3qeTuyviX2UnHcOmUkmWWg5kdsj8zFfY07eP6rI83yNr87Kehasc w7NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=Xa4nvawba60HUR0P1FCCDS06tiKtKDZP0zKrGfgiTkY=; fh=MUkNt9jS2vNsfHP13NP8/Wa/zO1W4yhnre2gOm6DEhM=; b=YOZY+P+dhRNET+qOgOkCVx403gr5M4kUk8r7hwwuckXqFGICtv0+WjURyrV342ft94 XCbgXK2FgP8bYgGA6ZOSk3Rixukg1BOvhT7fkem0bIzpkt1oIq5dFwEjz2pyJ6sjRdlG 8UBQgQ5G+aMvNpefsyPxMi90hyenFYkRW/SayPnkcPjU5aF4km+E3h/Cu+9cXG1ZioXZ 9bXt0FLiUmfXi3twU6OVhwMGp69v7/VSs4DkIX3tnm71+a1ucD9EbVqYjW31VwIB8zJ3 +TPCvETYsHnFzPAyT8cvssXWjZ3Duag9zebyvxMfwOWfcFVRLFzy86X5LKw82mGwv/LQ NhyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=XgiFkJEo; spf=pass (google.com: domain of linux-kernel+bounces-26484-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-26484-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=wanadoo.fr Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id 2-20020ac85742000000b00429fe24b4d4si825823qtx.189.2024.01.15.12.38.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 12:38:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-26484-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=XgiFkJEo; spf=pass (google.com: domain of linux-kernel+bounces-26484-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-26484-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=wanadoo.fr Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id A96E11C221B8 for ; Mon, 15 Jan 2024 20:38:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 41DC61B584; Mon, 15 Jan 2024 20:38:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wanadoo.fr header.i=@wanadoo.fr header.b="XgiFkJEo" Received: from smtp.smtpout.orange.fr (smtp-26.smtpout.orange.fr [80.12.242.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5BA2C1A716 for ; Mon, 15 Jan 2024 20:38:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=wanadoo.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wanadoo.fr Received: from fedora.home ([92.140.202.140]) by smtp.orange.fr with ESMTPA id PTiQrb8lK37BnPTiQr8XQD; Mon, 15 Jan 2024 21:37:52 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1705351072; bh=Xa4nvawba60HUR0P1FCCDS06tiKtKDZP0zKrGfgiTkY=; h=From:To:Cc:Subject:Date; b=XgiFkJEo2ub61G5YlQpZarbASRDD86oA15wjrBLzTK4MOr5V+S3hz2DHJB+KtkHDg ChJQNMQDW/tfZTRvYSnJFscozPBSwuvjkannYzZI7z+8i/x9fTuYcIe155aJ/tT666 osCDiU9IG4jL6udoCDlQr98HvKrewzzgrqfhb1frhXRPJMN5/mlQ1cazHfywA3r1Qt 5fXIb2OMJekEpS5cMC4TDJkrJSmOl7Dvs+5BI/2pOqA+PzLFOkc8zKv4cQAZP0D7z0 RH46qmQIDlzjKVud8nv0p4UPsN805imMwPWoYl5Z6mGsZ53fx9pJzN9ScB3nI7jAjE NVJN0SeSikHpw== X-ME-Helo: fedora.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Mon, 15 Jan 2024 21:37:52 +0100 X-ME-IP: 92.140.202.140 From: Christophe JAILLET To: Ilya Dryomov , Dongsheng Yang , Jens Axboe Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , ceph-devel@vger.kernel.org, linux-block@vger.kernel.org Subject: [PATCH] rbd: Remove usage of the deprecated ida_simple_xx() API Date: Mon, 15 Jan 2024 21:37:47 +0100 Message-ID: <7d98d8d45a89fc2434dd71d573fe4c6986986513.1705351057.git.christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788190248412583003 X-GMAIL-MSGID: 1788190248412583003 ida_alloc() and ida_free() should be preferred to the deprecated ida_simple_get() and ida_simple_remove(). Note that the upper limit of ida_simple_get() is exclusive, buInputt the one of ida_alloc_max() is inclusive. So a -1 has been added when needed. Signed-off-by: Christophe JAILLET --- drivers/block/rbd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index a999b698b131..63897d0d6629 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -5326,7 +5326,7 @@ static void rbd_dev_release(struct device *dev) if (need_put) { destroy_workqueue(rbd_dev->task_wq); - ida_simple_remove(&rbd_dev_id_ida, rbd_dev->dev_id); + ida_free(&rbd_dev_id_ida, rbd_dev->dev_id); } rbd_dev_free(rbd_dev); @@ -5402,9 +5402,9 @@ static struct rbd_device *rbd_dev_create(struct rbd_client *rbdc, return NULL; /* get an id and fill in device name */ - rbd_dev->dev_id = ida_simple_get(&rbd_dev_id_ida, 0, - minor_to_rbd_dev_id(1 << MINORBITS), - GFP_KERNEL); + rbd_dev->dev_id = ida_alloc_max(&rbd_dev_id_ida, + minor_to_rbd_dev_id(1 << MINORBITS) - 1, + GFP_KERNEL); if (rbd_dev->dev_id < 0) goto fail_rbd_dev; @@ -5425,7 +5425,7 @@ static struct rbd_device *rbd_dev_create(struct rbd_client *rbdc, return rbd_dev; fail_dev_id: - ida_simple_remove(&rbd_dev_id_ida, rbd_dev->dev_id); + ida_free(&rbd_dev_id_ida, rbd_dev->dev_id); fail_rbd_dev: rbd_dev_free(rbd_dev); return NULL;