Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp798439ybz; Wed, 22 Apr 2020 08:11:42 -0700 (PDT) X-Google-Smtp-Source: APiQypJOc8EpvQtQ0ZgFwM7yp9fKaPOtR9wJGZVrn0iN+qD+zh+t9JW54+tfLNOp/aaopLXfpCPj X-Received: by 2002:a05:6402:b47:: with SMTP id bx7mr22731301edb.374.1587568302703; Wed, 22 Apr 2020 08:11:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587568302; cv=none; d=google.com; s=arc-20160816; b=YF8OuMadeGi22w1ckXRzgxJQsARsXp8Ig/LTXv5AyRMlcbV9JeB1XIx7FpL41KnLrk TwTr9tuq2QyR4QN17hbAR8gB8b4JSYMiMiQssU5oNlxmACQ5oECl0yDAVrbsQrJlD8qX 02SghlZ/Pp4/q7zppsNYJ7n2guOwRmU/G5cUbvuYClnMJlES6hPB04A1etYqp0sQH4Yn 0FlE2aDVbsRXm1yR/MbQvGNUNRdmBTVVJNTwqEZHigb+Rd65ufle0OlialiLvxqro0+R pPNzh4KVCJ80ojpOjk0fzNhTYAK2wxkbyn9kvJ6ECBU/wEBFRGhI5OE54f1SPWJKePXJ OXVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=gQeBcBdpOVp4ZyKOqoz3hB7o8E+2qSiLBcSMFARDtHg=; b=xqRkAU8AalSTlnCn4qKzvPo1PI0Tu4ApSmJhnmy2ee/X+C7VMj4hVQdYgIMn4fm0Bm WT1aSnkxsJwfT3EdRy1jFgIHLe5hbHhpyo8YQYigOGGBIqawbuKBBOYRwixR3knwV8+t xQL/zya1jarAV7r8hNyg21xOLhTtr/kuPAB6vS/R2+3hSnOkX0PeBYMlj8ow1N1d94nV dS358v/DF51pYAwbS2TRnWaZOrhBPui4XoKB85qRiIYdvLthgj96kULeM6hvSdTEYvDy XaF4tB8GJ5HGyxBmO6fIxtMuGMBvsrDNXehay6jyTifDZ8d2Ymc1t2qkk4cUwdsLgH9Z BQfw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q14si3693366edi.65.2020.04.22.08.11.02; Wed, 22 Apr 2020 08:11:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728084AbgDVPDG (ORCPT + 99 others); Wed, 22 Apr 2020 11:03:06 -0400 Received: from mx2.suse.de ([195.135.220.15]:57982 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725980AbgDVPDF (ORCPT ); Wed, 22 Apr 2020 11:03:05 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 225EEAD7C; Wed, 22 Apr 2020 15:03:03 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 5F6931E0E72; Wed, 22 Apr 2020 17:03:03 +0200 (CEST) From: Jan Kara To: Matthew Wilcox Cc: , LKML , Jan Kara Subject: [PATCH 03/23] xarray: Use xas_store_noinit() in __xa_store, __xa_insert, __xa_alloc Date: Wed, 22 Apr 2020 17:02:36 +0200 Message-Id: <20200422150256.23473-4-jack@suse.cz> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20200422150256.23473-1-jack@suse.cz> References: <20200422150256.23473-1-jack@suse.cz> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These three functions never store NULL in the array so xas_store() is equivalent to xas_store_noinit(). Replace it. Signed-off-by: Jan Kara --- lib/xarray.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/xarray.c b/lib/xarray.c index ed98fc152b17..2eb634e8bf15 100644 --- a/lib/xarray.c +++ b/lib/xarray.c @@ -1079,7 +1079,7 @@ EXPORT_SYMBOL_GPL(__xas_next); * * If no entry is found and the array is smaller than @max, the iterator * is set to the smallest index not yet in the array. This allows @xas - * to be immediately passed to xas_store(). + * to be immediately passed to xas_store_noinit(). * * Return: The entry, if found, otherwise %NULL. */ @@ -1145,7 +1145,7 @@ EXPORT_SYMBOL_GPL(xas_find); * If no marked entry is found and the array is smaller than @max, @xas is * set to the bounds state and xas->xa_index is set to the smallest index * not yet in the array. This allows @xas to be immediately passed to - * xas_store(). + * xas_store_noinit(). * * If no entry is found before @max is reached, @xas is set to the restart * state. @@ -1412,7 +1412,7 @@ void *__xa_store(struct xarray *xa, unsigned long index, void *entry, gfp_t gfp) entry = XA_ZERO_ENTRY; do { - curr = xas_store(&xas, entry); + curr = xas_store_noinit(&xas, entry); if (xa_track_free(xa)) xas_clear_mark(&xas, XA_FREE_MARK); } while (__xas_nomem(&xas, gfp)); @@ -1517,7 +1517,7 @@ int __xa_insert(struct xarray *xa, unsigned long index, void *entry, gfp_t gfp) do { curr = xas_load(&xas); if (!curr) { - xas_store(&xas, entry); + xas_store_noinit(&xas, entry); if (xa_track_free(xa)) xas_clear_mark(&xas, XA_FREE_MARK); } else { @@ -1653,7 +1653,7 @@ int __xa_alloc(struct xarray *xa, u32 *id, void *entry, xas_set_err(&xas, -EBUSY); else *id = xas.xa_index; - xas_store(&xas, entry); + xas_store_noinit(&xas, entry); xas_clear_mark(&xas, XA_FREE_MARK); } while (__xas_nomem(&xas, gfp)); -- 2.16.4