Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp799713ybz; Wed, 22 Apr 2020 08:13:02 -0700 (PDT) X-Google-Smtp-Source: APiQypKix4qNVj9n+oNvjtgjh277iZQnXttNueaixXy13p0uWdooiIZR+Uv/viRpQ4PUBtjbYAZ3 X-Received: by 2002:a17:906:a39a:: with SMTP id k26mr25345629ejz.172.1587568381875; Wed, 22 Apr 2020 08:13:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587568381; cv=none; d=google.com; s=arc-20160816; b=KbU2hmf7f/LSofoe65bhANSyutDzh+/q/Smxl8iW24aYutOOKwF7nqD96gmspNTB8A 8UXQDrPcxBqXfAkODFcANUp7knuJVW3DuJ/qAptks2uNd0LmOpegkGFU4n3MYYH56CTD 29XHX0GzpHFSzF+c7F/7/2KsnbnKx3+Y10W/YPQ3M8ROqZ692i5MLkn7A05+Orm7AEU9 wKuyOOQeve73OLDABTJkbPFWoI+ASVK7MmcmfATv4aOK6QXM8RudmGa8U1kz62Ksoi2C 0OqZeEqPQBu9cECkxOAefgmdXIMiij4DOzfeqLQAKhT8k0sV3P6uw99eDmM9umiIu1vP zYTg== 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=dyFNNHv+K1adN2ogf1USb2ZEbTHLcO+T/rTgBD/2r+4=; b=WFlyJ8Ymu6P6Xihy9LYY69hBr70En6NFjCF/k3hPpezmWQoV1cV3TQXh6X+eLEkA4e 6c5sLRzan07mTxG3QuGXdRwbCWl4JsahLkQ48GVge4rV6EVr/KHMGvW5XNsq+fHjoBbe uU10QyThFlJNwqcPIPTYXeD/TlDyxQ8m+1yT9CmRDvzrRQRyRHkk5TFU3n1k9rKm0i8p U1Zx+fi2jmSrDtsL+qC7yCJJKHof8m94o1pplM+DsTraj9dGfhce5IC8UVzQJL/ktl98 qKUeej/3QW8qAV26wPYf6DnylSF0r+ipjqztKXSNdcbQ3VOSeXYyjx26osfH4qECxd+R EWDw== 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 b4si3831180ejj.77.2020.04.22.08.12.23; Wed, 22 Apr 2020 08:13:01 -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 S1728348AbgDVPEC (ORCPT + 99 others); Wed, 22 Apr 2020 11:04:02 -0400 Received: from mx2.suse.de ([195.135.220.15]:58122 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728079AbgDVPDH (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 6212DADFE; Wed, 22 Apr 2020 15:03:03 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 975771E0E72; Wed, 22 Apr 2020 17:03:03 +0200 (CEST) From: Jan Kara To: Matthew Wilcox Cc: , LKML , Jan Kara Subject: [PATCH 15/23] swap: Use xas_erase() when removing page from swap cache Date: Wed, 22 Apr 2020 17:02:48 +0200 Message-Id: <20200422150256.23473-16-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 Use xas_erase() to explicitely clear xarray marks when removing swap cache pages from the i_mapping xarray. Signed-off-by: Jan Kara --- mm/swap_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/swap_state.c b/mm/swap_state.c index 1afbf68f1724..b5c8cbdcf8f0 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -167,7 +167,7 @@ void __delete_from_swap_cache(struct page *page, swp_entry_t entry) VM_BUG_ON_PAGE(PageWriteback(page), page); for (i = 0; i < nr; i++) { - void *entry = xas_store(&xas, NULL); + void *entry = xas_erase(&xas); VM_BUG_ON_PAGE(entry != page, entry); set_page_private(page + i, 0); xas_next(&xas); -- 2.16.4