Merge tag 'mm-nonmm-stable-2024-05-19-11-56' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-block.git] / fs / ocfs2 / namei.c

diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index 9221a33f917b81d8b305fd212758595d75f168fc..4d1ea8703fcdf3e63b9b84f466f15a689b7445b9 100644 (file)
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -566,7 +566,7 @@ static int __ocfs2_mknod_locked(struct inode *dir,
        fe->i_last_eb_blk = 0;
        strcpy(fe->i_signature, OCFS2_INODE_SIGNATURE);
        fe->i_flags |= cpu_to_le32(OCFS2_VALID_FL);
-       ktime_get_real_ts64(&ts);
+       ktime_get_coarse_real_ts64(&ts);
        fe->i_atime = fe->i_ctime = fe->i_mtime =
                cpu_to_le64(ts.tv_sec);
        fe->i_mtime_nsec = fe->i_ctime_nsec = fe->i_atime_nsec =
@@ -797,6 +797,7 @@ static int ocfs2_link(struct dentry *old_dentry,
        ocfs2_set_links_count(fe, inode->i_nlink);
        fe->i_ctime = cpu_to_le64(inode_get_ctime_sec(inode));
        fe->i_ctime_nsec = cpu_to_le32(inode_get_ctime_nsec(inode));
+       ocfs2_update_inode_fsync_trans(handle, inode, 0);
        ocfs2_journal_dirty(handle, fe_bh);
 
        err = ocfs2_add_entry(handle, dentry, inode,
@@ -993,6 +994,7 @@ static int ocfs2_unlink(struct inode *dir,
                drop_nlink(inode);
        drop_nlink(inode);
        ocfs2_set_links_count(fe, inode->i_nlink);
+       ocfs2_update_inode_fsync_trans(handle, inode, 0);
        ocfs2_journal_dirty(handle, fe_bh);
 
        inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));