2 files changed, 20 insertions, 2 deletions

diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index 30f71acdc1cb..fb413d3d8618 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -2173,7 +2173,7 @@ static ssize_t ntfs_file_aio_write_nolock(struct kiocb *iocb,
         err = remove_suid(file->f_dentry);
         if (err)
                 goto out;
-        inode_update_time(inode, 1);
+        file_update_time(file);
         written = ntfs_file_buffered_write(iocb, iov, nr_segs, pos, ppos,
                         count);
 out:
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c
index bda7a08911a5..ea1bd3feea1b 100644
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -2767,7 +2767,25 @@ unm_done:
         up_write(&ni->runlist.lock);
 done:
         /* Update the mtime and ctime on the base inode. */
-        inode_update_time(VFS_I(base_ni), 1);
+        /* normally ->truncate shouldn't update ctime or mtime,
+         * but ntfs did before so it got a copy & paste version
+         * of file_update_time.  one day someone should fix this
+         * for real.
+         */
+        if (!IS_NOCMTIME(VFS_I(base_ni)) && !IS_RDONLY(VFS_I(base_ni))) {
+                struct timespec now = current_fs_time(VFS_I(base_ni)->i_sb);
+                int sync_it = 0;
+
+                if (!timespec_equal(&VFS_I(base_ni)->i_mtime, &now) ||
+                    !timespec_equal(&VFS_I(base_ni)->i_ctime, &now))
+                        sync_it = 1;
+                VFS_I(base_ni)->i_mtime = now;
+                VFS_I(base_ni)->i_ctime = now;
+
+                if (sync_it)
+                        mark_inode_dirty_sync(VFS_I(base_ni));
+        }
+
         if (likely(!err)) {
                 NInoClearTruncateFailed(ni);
                 ntfs_debug("Done.");