From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794048715; b=Ag3YMroN705m859WlJ+55iyH5iMNPy8afFnExszfyzrs5qA9AAi9gfAYzVK259vkDvwC uT7Jm7PmXO61XVQJdX1GyBpwnBLAyudgAFS7wa4dMqVphBvMNpZ5/Sko3gTcjDiiS0cbA mUk3fy5hCPam2Jl/VcwuzjFsAm50da6KgiSav7d4rwc9CrZksHe3oKsEixJCl1IBi69DE 5CX5BfGMdJs1QWPq90tczGltbOy+K5Y+Aarv8/dVfvQ9uRt9XbLfn5umX/1+k1sM78APk KXyNQkfInADD4JXxDz8hQL2mWm3xp4tQiTojNMT1bIUgcefByfS5zn/gSNGZJ7ZQ73w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794048715; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=hToPQ3s1qifRIelVXH75OqdojspBU9+B9buxVmpOK/Y=; b=aa8GavACW0hR3Oum7HfWJ6LCsiag+3KeKETxl0yGm6/BN9/PEA+bLuA2Pj1Z7uK7FUgW VsxYd8Lc//AbApjP/84G4+RDVd7YpZysuW7YFxSBaNU1LnBSP5ooIJrBOEKeTD4QUgVii jdTfSYTT0tpRLxl9PW9K+S/1lGDbMQ0DIA8nY5oTK/uGksdcx3ZGClXDJs1ntamCeV/qF q524Bb56C0Y9GK+EoP6x3Kei3WHqrZqjaWBzvaN1p/3Oa+RJz0dTY9sPfBoelDXLgN8Mx ZJ4eabHXnCEw28837EaBXWwErdcBMQIMiZ7QC8HgEgV1oxhuHV1vU+5yddgXinYBUqw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=IoUhEEo2; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C328B606A336 for ; Sat, 7 Nov 2026 10:51:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=IoUhEEo2 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 163831F0089F; Sat, 7 Nov 2026 10:51:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794048714; bh=hToPQ3s1qifRIelVXH75OqdojspBU9+B9buxVmpOK/Y=; h=From:To:Cc:Subject:Date; b=IoUhEEo2NWq6j8JPDn7oold7zyHCf2kSgUDIUFj2S61V0o8tEiTy6WVU54bieI1lI 8eaWb4unBukcFXeO85MM3JA3JWZpt6L5zyTyZnDTHoU+CmWBgxYlV9EOTSYssugwnZ yOzKLPFNCnLn5NBhq9VhmKLOyFy0ame+0YUoLNQhrTBDSqX9MtqqLzzsMJ0G58RNBE Kly3dCgCLJ1VtfK7/L0WzEkcnUizQBCj1T7MFQSmhLTbmz/CdbFTbOJP8jUY3G6wC3 TqRPkoc/T+z2lilD8LQ/bo2o66e0kTWUuUb08ly53HkzRLwdIQkqnVsTVKo1frrh3o pjClFx0Eo9wUw== From: Sasha Levin To: zenghongling@kylinos.cn, liubaolin@kylinos.cn, hyc.lee@gmail.com, linkinjeon@kernel.org Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] ntfs: do not clear the volume dirty bit during sync" failed to apply to 6.1-stable tree Date: Sat, 7 Nov 2026 05:51:52 -0500 Message-ID: <20261107055152-failed-6.1-4a1bb54f571c@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 4a1bb54f571cbef67a7c470a3139ffec1a15a8e4 # git commit -s git send-email --to '' --in-reply-to '20261107055152-failed-6.1-4a1bb54f571c@kernel.org' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 4a1bb54f571cbef67a7c470a3139ffec1a15a8e4 Mon Sep 17 00:00:00 2001 From: Hongling Zeng Date: Tue, 15 Sep 2026 16:32:50 +0800 Subject: [PATCH] ntfs: do not clear the volume dirty bit during sync ntfs_sync_fs() clears VOLUME_IS_DIRTY while the volume is still mounted read-write, so a sync running concurrently with an in-flight metadata modification can clear and persist a bit that was just set: the modification then lands on a volume that is clean on disk, and a crash does not run chkdsk. Stop clearing the bit in ntfs_sync_fs() and leave the clearing to the remount-to-read-only path, which the VFS reaches only after sb_prepare_remount_readonly() has drained in-flight writers, and to ntfs_put_super(), which runs after evict_inodes() on a quiesced filesystem. A mounted read-write volume now keeps the dirty bit until it is dismounted cleanly, which matches the NTFS semantics; the cost is a needless chkdsk if the machine crashes between a sync and the unmount. A recorded error state is still persisted right away when the filesystem is synced: with NVolErrors() set, ntfs_sync_volume_dirty_state() can only set the bit, never clear it, so it cannot lose a modification the way the old unconditional call did. This keeps the error report from being lost to a crash on a volume that has seen no modification; an error recorded after the last sync is still only persisted at the next quiescent transition. sync_blockdev() and blkdev_issue_flush() are both called and the first error is returned, so a writeback failure neither hides a flush failure nor skips it. A RWF_NOWAIT write still blocks in the marking when the volume looks clean, as it already did on the base; a non-blocking marking is follow-up work. Reported-by: Baolin Liu Cc: stable@vger.kernel.org Signed-off-by: Hongling Zeng Reviewed-by: Hyunchul Lee Reviewed-by: Baolin Liu Signed-off-by: Namjae Jeon --- fs/ntfs/file.c | 7 ++++--- fs/ntfs/super.c | 31 ++++++++++++++++++++++++------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c index e8b056c3e4ccd..bb8641103d268 100644 --- a/fs/ntfs/file.c +++ b/fs/ntfs/file.c @@ -637,9 +637,10 @@ static ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) /* * The volume must be marked dirty before the modification is made, - * without an unlocked check of the in-memory flag: ntfs_sync_fs() - * can clear the bit concurrently and the modification would then - * land on a volume that is clean on disk. + * without an unlocked check of the in-memory flag: the dirty bit + * is only cleared at the quiescent transitions, under the same + * $Volume mrec_lock this call takes, so an unlocked skip could + * lose the set to one of them. */ ntfs_set_volume_flags(vol, VOLUME_IS_DIRTY); diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c index 42d895776f326..a08523457fe01 100644 --- a/fs/ntfs/super.c +++ b/fs/ntfs/super.c @@ -493,8 +493,9 @@ int ntfs_set_volume_flags(struct ntfs_volume *vol, __le16 flags) * This is the single point that persists the in-memory error state to disk. * The runtime error paths only record NVolErrors() because they run under a * variety of ntfs locks the dirty-bit write cannot be taken under (runlist - * locks, vol->lcnbmp_lock, vol->mftbmp_lock, mrec_locks); the first - * ntfs_sync_fs(), a remount, or the unmount then persists the flag here. + * locks, vol->lcnbmp_lock, vol->mftbmp_lock, mrec_locks); a sync of a + * volume with recorded errors, a remount to read-only, or the unmount, + * then persists the flag here. * * A hibernated volume is not written from these persistence paths: * resuming Windows from a modified image corrupts it, so the dirty bit @@ -2023,7 +2024,7 @@ static void ntfs_shutdown(struct super_block *sb) static int ntfs_sync_fs(struct super_block *sb, int wait) { struct ntfs_volume *vol = NTFS_SB(sb); - int err = 0; + int ret, err = 0; if (NVolShutdown(vol)) return -EIO; @@ -2031,14 +2032,30 @@ static int ntfs_sync_fs(struct super_block *sb, int wait) if (!wait) return 0; - /* If there are some dirty buffers in the bdev inode */ - if (ntfs_sync_volume_dirty_state(vol)) { + /* + * The volume dirty bit is deliberately not cleared here: a sync + * running concurrently with an in-flight modification could clear + * and persist a bit that was just set, leaving the modification + * on a volume that is clean on disk. The bit is only cleared at + * the quiescent state transitions, remounting read-only and clean + * unmount. A recorded error state, however, is persisted right + * away so that it is not lost to a crash on a volume that has + * seen no modification; with NVolErrors() set this can only set + * the bit, never clear it. + */ + if (NVolErrors(vol) && + ntfs_sync_volume_dirty_state(vol)) { ntfs_warning(sb, "Failed to sync dirty bit in volume information flags. Run chkdsk."); err = -EIO; } sync_inodes_sb(sb); - sync_blockdev(sb->s_bdev); - blkdev_issue_flush(sb->s_bdev); + ret = sync_blockdev(sb->s_bdev); + if (ret && !err) + err = ret; + + ret = blkdev_issue_flush(sb->s_bdev); + if (ret && !err) + err = ret; return err; } -- 2.53.0