Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp797257ybz; Wed, 22 Apr 2020 08:10:43 -0700 (PDT) X-Google-Smtp-Source: APiQypIZ7+ideCetdF1zp1H52Py1qN9PRP2f36MOex0w7fqJ7Nl7aVD+aeudVkdZ/QyWdV4kKGSY X-Received: by 2002:a05:6402:b17:: with SMTP id bm23mr24507127edb.137.1587568243449; Wed, 22 Apr 2020 08:10:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587568243; cv=none; d=google.com; s=arc-20160816; b=QgYajHMyiHGhFoXCGrDqq4nd24qAa9a2TQefi1pB0RX5WLWVNU6gls85BBpdMosFmd GBtqq2KbrRCiNYHCsj5c5sVbqupCUb8y3riEC8cIUX576FOhOEOzFv2WGf4DRnFh9S/4 W/+mjaUkUGfNz/IeePOjM5PLPzJlAqtikCM8Vy9aWslCn7FGWHSsxouHAJTezMHvUmNC s73Z14Hf958UYGTQYQXi0oc8RcNju7cFjqPjZXrIv78zmIT/5BUFs+lJpV+FXxV8MwV4 Dixk7fIJeGpG7Wj/KpycmF3iWTzo6nUKSzqlxybJ0MepcNRKQiyyupd8J+INpJXAutx1 PdtQ== 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=Ctt0GfNQ59oWnFEZB38kxHvxTIY7N9hZSTbyvrJZpZA=; b=TMNNP95LrUJlKMN9K27rL2M5zXDwqK75yjKippTqjQEakOfMSaIiFYzJ87WBVaAjM0 rWgRL95o4t0wfdy3wt9RNMfUVq8vFhFdDPZtup7vRq7tO6Ydc+KHQUmtesp7gcLPMmH+ qbddBAPPjsupy/ce7HtVbKmI9VQh5OhBH5ot6zkpB8sYxixRg68MttVFZ0e3XEWg2uR8 aNTzK2Z5WsDpeANngS87qx9h7anacsOxRsoRupaSuqqqqm9n0At8i4wb5DVNe3nnEyPw 2n4gKr5zIejoCSPgXu51A2VNR98hMSrfC8q6y+Z/k24q/zrWr/nPH+rQRqzOuFYGZpWM lH/g== 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 f3si3545654ejb.192.2020.04.22.08.10.08; Wed, 22 Apr 2020 08:10:43 -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 S1726361AbgDVPFp (ORCPT + 99 others); Wed, 22 Apr 2020 11:05:45 -0400 Received: from mx2.suse.de ([195.135.220.15]:58110 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728070AbgDVPDH (ORCPT ); Wed, 22 Apr 2020 11:03:07 -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 57C6AAD17; Wed, 22 Apr 2020 15:03:03 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 69F8C1E0E81; Wed, 22 Apr 2020 17:03:03 +0200 (CEST) From: Jan Kara To: Matthew Wilcox Cc: , LKML , Jan Kara Subject: [PATCH 05/23] xarray: Use xas_erase() in __xa_erase() Date: Wed, 22 Apr 2020 17:02:38 +0200 Message-Id: <20200422150256.23473-6-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 In this case we want to erase element from the array. Use xas_erase() for it. Signed-off-by: Jan Kara --- lib/xarray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/xarray.c b/lib/xarray.c index 49fafcee1c8e..96be029412b2 100644 --- a/lib/xarray.c +++ b/lib/xarray.c @@ -1358,7 +1358,7 @@ EXPORT_SYMBOL(xas_erase); void *__xa_erase(struct xarray *xa, unsigned long index) { XA_STATE(xas, xa, index); - return xas_result(&xas, xas_store(&xas, NULL)); + return xas_result(&xas, xas_erase(&xas)); } EXPORT_SYMBOL(__xa_erase); -- 2.16.4