Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp797208ybz; Wed, 22 Apr 2020 08:10:40 -0700 (PDT) X-Google-Smtp-Source: APiQypI4B+7gNGr2g65g0jPkPa9773Sw+fH5lU0mAQUo0v1pHBeHbyHMuPQKIi52OUwTyvGpfCTJ X-Received: by 2002:a17:907:9481:: with SMTP id dm1mr27330837ejc.9.1587568240391; Wed, 22 Apr 2020 08:10:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587568240; cv=none; d=google.com; s=arc-20160816; b=qIaQhZUBEIMNb2I/zEF9EGbwBlScbNIhWEoyQWtqRIp/L0j4q9ukMAUT5SG/hJBkAu IjhfI4ADfw0iqSrH8yl+n+DehcVF1uLvpom5UQvuJO4cSLaly8ZdB9/YduYEJcmbxiGe exKXR0pqap7XLoKs7vR/VW6kbr9ijNuYO1HCBA60cFCR+zxH3ozA2z9IyiOCbc9+4ySN ccCu0w1JyX9MVsBGYutw/lTPqULC7obxqHvQpf9SgYXtAzc42Fxf4j+0LXtAAzC2ML5F ylr6L7KKrJpGJB0SuQuVF/3QRkGRq2I9XfNF8qpHOzhgRzECw/oEY8jzEXZHO8Nnu2zE EuQA== 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=nUgC9LrVE2xgvm7gfgC91DQJyMbrU+MY5Gej8dDqDvk=; b=q8IknKYJUy5w6qWQofDZhoLL+E8YtGWME+JOVzUIhJ+KihXpY/IPkYMlUcxgoVpPoa AxRPNzypdYlnP8GOe3ktfx7bRMk5He0mSWaHcR9lrFKxeIDCkaBMmX5+T5jktGky6MfG iwoeSPJS24gD0guUhUYXTSCm46z4GFdhSdBa+FgpOWj/iru0PtRecg8eGrwgcb82MldV CH1DPLwKj9HI866Eh31KmwTQMgspf3hRTpdqpBCR6PJtPiykpqs6ajA790SLKKgQxfne 82Obn79UYOvWBNfxpkUAsExtuUkaAqPUa4AREK2V3cYuYA8jW3xTX+9Gw0Mgh4FkpRmE wWQg== 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 l13si3988474edi.509.2020.04.22.08.09.51; Wed, 22 Apr 2020 08:10:40 -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 S1728315AbgDVPDz (ORCPT + 99 others); Wed, 22 Apr 2020 11:03:55 -0400 Received: from mx2.suse.de ([195.135.220.15]:58116 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726853AbgDVPDI (ORCPT ); Wed, 22 Apr 2020 11:03:08 -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 86AFBAE68; Wed, 22 Apr 2020 15:03:03 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 89B5F1E0E61; Wed, 22 Apr 2020 17:03:03 +0200 (CEST) From: Jan Kara To: Matthew Wilcox Cc: , LKML , Jan Kara Subject: [PATCH 12/23] mm: Use xas_erase() in collapse_file() Date: Wed, 22 Apr 2020 17:02:45 +0200 Message-Id: <20200422150256.23473-13-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 When undoing failed collapse of ordinary pages into a huge page, use xas_erase() to explicitly clear any xarray marks that may have been added to entries. Signed-off-by: Jan Kara --- mm/khugepaged.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 99d77ffb79c2..8da820c02de7 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1819,7 +1819,7 @@ static void collapse_file(struct mm_struct *mm, break; nr_none--; /* Put holes back where they were */ - xas_store(&xas, NULL); + xas_erase(&xas); continue; } -- 2.16.4