8 files changed, 41 insertions, 24 deletions

diff --git a/fs/inode.c b/fs/inode.c
index e08767fd57b0..e177769f3b41 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1204,16 +1204,20 @@ void update_atime(struct inode *inode)
 EXPORT_SYMBOL(update_atime);
 
 /**
- *      inode_update_time       -       update mtime and ctime time
- *      @inode: inode accessed
- *      @ctime_too: update ctime too
+ *      file_update_time        -       update mtime and ctime time
+ *      @file: file accessed
  *
- *      Update the mtime time on an inode and mark it for writeback.
- *      When ctime_too is specified update the ctime too.
+ *      Update the mtime and ctime members of an inode and mark the inode
+ *      for writeback.  Note that this function is meant exclusively for
+ *      usage in the file write path of filesystems, and filesystems may
+ *      choose to explicitly ignore update via this function with the
+ *      S_NOCTIME inode flag, e.g. for network filesystem where these
+ *      timestamps are handled by the server.
  */
 
-void inode_update_time(struct inode *inode, int ctime_too)
+void file_update_time(struct file *file)
 {
+        struct inode *inode = file->f_dentry->d_inode;
         struct timespec now;
         int sync_it = 0;
 
@@ -1227,16 +1231,15 @@ void inode_update_time(struct inode *inode, int ctime_too)
                 sync_it = 1;
         inode->i_mtime = now;
 
-        if (ctime_too) {
-                if (!timespec_equal(&inode->i_ctime, &now))
-                        sync_it = 1;
-                inode->i_ctime = now;
-        }
+        if (!timespec_equal(&inode->i_ctime, &now))
+                sync_it = 1;
+        inode->i_ctime = now;
+
         if (sync_it)
                 mark_inode_dirty_sync(inode);
 }
 
-EXPORT_SYMBOL(inode_update_time);
+EXPORT_SYMBOL(file_update_time);
 
 int inode_needs_sync(struct inode *inode)
 {
diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c
index 4947d9b11fc1..973b444d6914 100644
--- a/fs/ncpfs/file.c
+++ b/fs/ncpfs/file.c
@@ -262,7 +262,7 @@ ncp_file_write(struct file *file, const char __user *buf, size_t count, loff_t *
         }
         vfree(bouncebuffer);
 
-        inode_update_time(inode, 1);
+        file_update_time(file);
 
         *ppos = pos;
 
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.");
diff --git a/fs/ocfs2/mmap.c b/fs/ocfs2/mmap.c
index afdeec4b0eef..843cf9ddefe8 100644
--- a/fs/ocfs2/mmap.c
+++ b/fs/ocfs2/mmap.c
@@ -80,12 +80,8 @@ static struct vm_operations_struct ocfs2_file_vm_ops = {
         .nopage = ocfs2_nopage,
 };
 
-int ocfs2_mmap(struct file *file,
-               struct vm_area_struct *vma)
+int ocfs2_mmap(struct file *file, struct vm_area_struct *vma)
 {
-        struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
-        struct inode *inode = mapping->host;
-
         /* We don't want to support shared writable mappings yet. */
         if (((vma->vm_flags & VM_SHARED) || (vma->vm_flags & VM_MAYSHARE))
             && ((vma->vm_flags & VM_WRITE) || (vma->vm_flags & VM_MAYWRITE))) {
@@ -95,7 +91,7 @@ int ocfs2_mmap(struct file *file,
                 return -EINVAL;
         }
 
-        update_atime(inode);
+        file_accessed(file);
         vma->vm_ops = &ocfs2_file_vm_ops;
         return 0;
 }
diff --git a/fs/pipe.c b/fs/pipe.c
index acb030b61fb0..eef0f29e86ef 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -347,7 +347,7 @@ out:
                 kill_fasync(PIPE_FASYNC_READERS(*inode), SIGIO, POLL_IN);
         }
         if (ret > 0)
-                inode_update_time(inode, 1);    /* mtime and ctime */
+                file_update_time(filp);
         return ret;
 }
 
diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index 127e7d2cabdd..ad6fa964b0e7 100644
--- a/fs/reiserfs/file.c
+++ b/fs/reiserfs/file.c
@@ -1360,7 +1360,7 @@ static ssize_t reiserfs_file_write(struct file *file,	/* the file we are going t
         if (res)
                 goto out;
 
-        inode_update_time(inode, 1);    /* Both mtime and ctime */
+        file_update_time(file);
 
         // Ok, we are done with all the checks.
 
diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c
index 5675117ef227..885dfafeabee 100644
--- a/fs/xfs/linux-2.6/xfs_lrw.c
+++ b/fs/xfs/linux-2.6/xfs_lrw.c
@@ -713,7 +713,7 @@ start:
         }
 
         if (likely(!(ioflags & IO_INVIS))) {
-                inode_update_time(inode, 1);
+                file_update_time(file);
                 xfs_ichgtime_fast(xip, inode,
                                   XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
         }