From patchwork Wed Apr 22 15:02:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 11504093 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 33663913 for ; Wed, 22 Apr 2020 15:03:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 24C372168B for ; Wed, 22 Apr 2020 15:03:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728310AbgDVPDy (ORCPT ); Wed, 22 Apr 2020 11:03:54 -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-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@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; }