From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 769CA1426A for ; Sun, 29 Oct 2023 22:59:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EmICwIJW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BADA7C43391; Sun, 29 Oct 2023 22:59:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620362; bh=iHIi9yANOPOdDTkCE9logiPI8h4/g9n7zlZm00+kVvM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EmICwIJWAlFO7moIfvniSxuaFt5XgkjFx+kpYwXjQmlP6RC5dpcoiS7Eaj09aMBUV qOaE/lMIfUYM8NSeZtm56LQZIgxd7cue1cHNSS0i3eroD09zNMIA/WS/so5jsCXUUQ 5i/wc/v6xeKVfPVzqW+6lgmllbgR4aTwm897W38NO0tkTKXua+tQeQwRDWwkUGJTlA VTF3SZit5ZJAAZQRUmmx72UkHt0BFOJGqsCmk9+23UvbRIbytlt1AkPv/7JTU60K99 2g2+6Msf0kkZh2uCfOBi8RydpV7kYZMzM/7lIDtO9nT00Xv/q/s/1ZjX2xCWjd3bOh p7F3Iz51r75tA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Konstantin Komarov , Sasha Levin , ntfs3@lists.linux.dev Subject: [PATCH AUTOSEL 5.15 03/28] fs/ntfs3: Write immediately updated ntfs state Date: Sun, 29 Oct 2023 18:58:38 -0400 Message-ID: <20231029225916.791798-3-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231029225916.791798-1-sashal@kernel.org> References: <20231029225916.791798-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: ntfs3@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.137 Content-Transfer-Encoding: 8bit From: Konstantin Komarov [ Upstream commit 06ccfb00645990a9fcc14249e6d1c25921ecb836 ] Signed-off-by: Konstantin Komarov Signed-off-by: Sasha Levin --- fs/ntfs3/fsntfs.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/fs/ntfs3/fsntfs.c b/fs/ntfs3/fsntfs.c index 0ae70010b01d3..e32a678861ffe 100644 --- a/fs/ntfs3/fsntfs.c +++ b/fs/ntfs3/fsntfs.c @@ -958,18 +958,11 @@ int ntfs_set_state(struct ntfs_sb_info *sbi, enum NTFS_DIRTY_FLAGS dirty) if (err) return err; - mark_inode_dirty(&ni->vfs_inode); + mark_inode_dirty_sync(&ni->vfs_inode); /* verify(!ntfs_update_mftmirr()); */ - /* - * If we used wait=1, sync_inode_metadata waits for the io for the - * inode to finish. It hangs when media is removed. - * So wait=0 is sent down to sync_inode_metadata - * and filemap_fdatawrite is used for the data blocks. - */ - err = sync_inode_metadata(&ni->vfs_inode, 0); - if (!err) - err = filemap_fdatawrite(ni->vfs_inode.i_mapping); + /* write mft record on disk. */ + err = _ni_write_inode(&ni->vfs_inode, 1); return err; } -- 2.42.0