Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp800121ybz; Wed, 22 Apr 2020 08:13:27 -0700 (PDT) X-Google-Smtp-Source: APiQypL6vP+7WP8TqErwYsgC+0FLEF1HsFJKyvDUOcfuqCW1TXUOme4oNu7CvNJnc6aLXNN3SMCR X-Received: by 2002:a05:6402:206f:: with SMTP id bd15mr14312131edb.24.1587568407139; Wed, 22 Apr 2020 08:13:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587568407; cv=none; d=google.com; s=arc-20160816; b=TWrLKG3qIJ3DhyXGxLFbzR9HTumSDRNuWjF+mfFsV0mK/EGPIB4CLerCN2L2i34RXR ZB9/oBSMtI03jLFp4Mdqfq35XT8vACd+fMVLyJSeNKeR1WSbA4dWGCSGNRVS1SaYCdKb NFAIydrDBquql7emptGldB8OiwQcSAozrZ8mgzY5KOoPshDpW+U3cgaCO9SPGBBF+p7z c0qjh639IAxOAWFoJCKmB31mgY82+wSfheGfFDccQTZd/dkri0eNweZDb4WE7c7rfwWC iqn6bMNTh2HN6hM5E8W+TmD7GUnVu6w2EbYCo55kLluFNnrGnZaiCRX7TNlGzkCDCWEH uKvg== 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=Q3Bf7e4VHnw+2VElJtgkKROtWaYvGE4A0dzUWaGzu28=; b=zxy7AE45Yb6z0dSBArqAhLimh3BQUINMdlboruW1obJ+6gsQLcO7+D88jO436iWrlC yj6UTMOF81e/vJm21V5FSzKIzf1z+cxvbl4sfqtC8Jb88nBVGqArWQci6rDdxsD0mX82 yrXwLGUbxT05KLy1slz7MhHNQ35BpZhsmXndQx1JlB/wJjZEUsj1Yx5IBQgVRXFoKCXF LX5n8QnOe6ivAtpjkLtX2YajBlzvutBj+hwTQvcgAz++QKpMBRrYEae/nP3EKix72eVD rc7XViwZm/61tZ2etodNoLD9j8fn/iq3lul++m7Ydz/GuFE3uxGzG9Sr9VmZ+BGOe7eD +LmQ== 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 q24si3630638ejz.458.2020.04.22.08.12.46; Wed, 22 Apr 2020 08:13:27 -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 S1726078AbgDVPF7 (ORCPT + 99 others); Wed, 22 Apr 2020 11:05:59 -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 S1728071AbgDVPDH (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 5BC37ADCE; Wed, 22 Apr 2020 15:03:03 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 77A9F1E0E86; Wed, 22 Apr 2020 17:03:03 +0200 (CEST) From: Jan Kara To: Matthew Wilcox Cc: , LKML , Jan Kara Subject: [PATCH 08/23] dax: Use xas_erase() in __dax_invalidate_entry() Date: Wed, 22 Apr 2020 17:02:41 +0200 Message-Id: <20200422150256.23473-9-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 truncating DAX entry, we need to clear all the outstanding marks for the entry. Use dax_erase() instead of dax_store(). Signed-off-by: Jan Kara --- fs/dax.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/dax.c b/fs/dax.c index 11b16729b86f..f8358928549c 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -643,7 +643,7 @@ static int __dax_invalidate_entry(struct address_space *mapping, xas_get_mark(&xas, PAGECACHE_TAG_TOWRITE))) goto out; dax_disassociate_entry(entry, mapping, trunc); - xas_store(&xas, NULL); + xas_erase(&xas); mapping->nrexceptional--; ret = 1; out: -- 2.16.4