fs/ntfs3: fsync files by syncing parent inodes

[ Upstream commit dcd9d6a471 ]

Some xfstests expect fsync() on a file or directory to also persist
directory metadata up the parent chain. Using generic_file_fsync() is not
sufficient for ntfs, because parent directories are not explicitly
written out.

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Stable-dep-of: d7ea8495fd ("fs/ntfs3: fix missing run load for vcn0 in attr_data_get_block_locked()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Konstantin Komarov
2026-07-24 16:02:46 +02:00
committed by Greg Kroah-Hartman
parent 98d93c226b
commit caa36a91c9
4 changed files with 91 additions and 2 deletions
+1 -1
View File
@@ -623,7 +623,7 @@ const struct file_operations ntfs_dir_operations = {
.llseek = generic_file_llseek,
.read = generic_read_dir,
.iterate_shared = ntfs_readdir,
.fsync = generic_file_fsync,
.fsync = ntfs_file_fsync,
.open = ntfs_file_open,
};
// clang-format on
+37 -1
View File
@@ -1224,6 +1224,42 @@ int ntfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
return err;
}
/*
* ntfs_file_fsync - file_operations::fsync
*/
int ntfs_file_fsync(struct file *file, loff_t start, loff_t end, int datasync)
{
struct inode *inode = file_inode(file);
struct super_block *sb = inode->i_sb;
struct ntfs_sb_info *sbi = sb->s_fs_info;
int err, ret;
if (unlikely(ntfs3_forced_shutdown(sb)))
return -EIO;
ret = file_write_and_wait_range(file, start, end);
if (ret)
return ret;
ret = write_inode_now(inode, !datasync);
if (!ret) {
ret = ni_write_parents(ntfs_i(inode), !datasync);
}
if (!ret) {
ntfs_set_state(sbi, NTFS_DIRTY_CLEAR);
ntfs_update_mftmirr(sbi, false);
}
err = sync_blockdev(sb->s_bdev);
if (unlikely(err && !ret))
ret = err;
if (!ret)
ret = blkdev_issue_flush(sb->s_bdev);
return ret;
}
// clang-format off
const struct inode_operations ntfs_file_inode_operations = {
.getattr = ntfs_getattr,
@@ -1245,7 +1281,7 @@ const struct file_operations ntfs_file_operations = {
.splice_read = ntfs_file_splice_read,
.mmap = ntfs_file_mmap,
.open = ntfs_file_open,
.fsync = generic_file_fsync,
.fsync = ntfs_file_fsync,
.splice_write = iter_file_splice_write,
.fallocate = ntfs_fallocate,
.release = ntfs_file_release,
+51
View File
@@ -3145,6 +3145,57 @@ bool ni_is_dirty(struct inode *inode)
return false;
}
/*
* ni_write_parents
*
* Helper function for ntfs_file_fsync.
*/
int ni_write_parents(struct ntfs_inode *ni, int sync)
{
int err = 0;
struct ATTRIB *attr = NULL;
struct ATTR_LIST_ENTRY *le = NULL;
struct ntfs_sb_info *sbi = ni->mi.sbi;
struct super_block *sb = sbi->sb;
while ((attr = ni_find_attr(ni, attr, &le, ATTR_NAME, NULL, 0, NULL,
NULL))) {
struct inode *dir;
struct ATTR_FILE_NAME *fname;
fname = resident_data_ex(attr, SIZEOF_ATTRIBUTE_FILENAME);
if (!fname)
continue;
/* Check simple case when parent inode equals current inode. */
if (ino_get(&fname->home) == ni->vfs_inode.i_ino) {
if (MFT_REC_ROOT != ni->vfs_inode.i_ino) {
ntfs_set_state(sbi, NTFS_DIRTY_ERROR);
err = -EINVAL;
}
continue;
}
dir = ntfs_iget5(sb, &fname->home, NULL);
if (IS_ERR(dir)) {
ntfs_inode_warn(
&ni->vfs_inode,
"failed to open parent directory r=%lx to write",
(long)ino_get(&fname->home));
continue;
}
if (!is_bad_inode(dir)) {
int err2 = write_inode_now(dir, sync);
if (!err)
err = err2;
}
iput(dir);
}
return err;
}
/*
* ni_update_parent
*
+2
View File
@@ -503,6 +503,7 @@ int ntfs3_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
int ntfs_file_open(struct inode *inode, struct file *file);
int ntfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
__u64 start, __u64 len);
int ntfs_file_fsync(struct file *file, loff_t start, loff_t end, int datasync);
extern const struct inode_operations ntfs_special_inode_operations;
extern const struct inode_operations ntfs_file_inode_operations;
extern const struct file_operations ntfs_file_operations;
@@ -580,6 +581,7 @@ int ni_rename(struct ntfs_inode *dir_ni, struct ntfs_inode *new_dir_ni,
struct ntfs_inode *ni, struct NTFS_DE *de, struct NTFS_DE *new_de);
bool ni_is_dirty(struct inode *inode);
int ni_write_parents(struct ntfs_inode *ni, int sync);
/* Globals from fslog.c */
bool check_index_header(const struct INDEX_HDR *hdr, size_t bytes);