From: DaeMyung Kang <charsyam@gmail.com>
Date: Thu, 30 Apr 2026 17:20:55 +0000 (+0900)
Subject: ntfs: capture mft mirror sync errors in ntfs_write_mft_block()
X-Git-Tag: v7.1-rc5~50^2~15
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=618c991cdf031925b09cbb1117f613abdb068680;p=thirdparty%2Flinux.git

ntfs: capture mft mirror sync errors in ntfs_write_mft_block()

After ntfs_sync_mft_mirror() became able to return real I/O errors,
ntfs_write_mft_block() still discards its return value at the call
site inside the per-record loop.  A failed $MFTMirr write therefore
leaves the volume looking clean from the writeback path even though
the on-disk mirror is now stale.

Capture the return value and feed it into the function's existing
@err variable using the same "first error wins" pattern already used
on other failure paths.  The error is propagated to the caller and,
via the existing tail of the function, sets NVolErrors so umount and
chkdsk see the volume as inconsistent.

Fixes: 115380f9a2f9 ("ntfs: update mft operations")
Signed-off-by: DaeMyung Kang <charsyam@gmail.com>
Reviewed-by: Hyunchul Lee <hyc.lee@gmail.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
---

diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c
index f5017f337068a..f5186a19dffcb 100644
--- a/fs/ntfs/mft.c
+++ b/fs/ntfs/mft.c
@@ -2843,9 +2843,13 @@ flush_bio:
 			}
 			prev_mft_ofs = mft_ofs;
 
-			if (mft_no < vol->mftmirr_size)
-				ntfs_sync_mft_mirror(vol, mft_no,
+			if (mft_no < vol->mftmirr_size) {
+				int sub_err = ntfs_sync_mft_mirror(vol, mft_no,
 						(struct mft_record *)(kaddr + mft_ofs));
+
+				if (unlikely(sub_err) && !err)
+					err = sub_err;
+			}
 		} else if (ref_inos[nr_ref_inos])
 			nr_ref_inos++;
 	}