Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] One line missing from previous commit
  [CIFS] mtime bounces from local to remote when cifs nocmtime i_flags overwritten
  [CIFS] fix &&/& typo in cifs_setattr()

1 files changed, 3 insertions, 2 deletions

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 07ff9351e9ee..a1265c9bfec0 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1014,8 +1014,9 @@ static ssize_t cifs_write(struct file *file, const char *write_data,
         /* since the write may have blocked check these pointers again */
         if (file->f_path.dentry) {
                 if (file->f_path.dentry->d_inode) {
-                        file->f_path.dentry->d_inode->i_ctime =
-                        file->f_path.dentry->d_inode->i_mtime = CURRENT_TIME;
+/*BB We could make this contingent on superblock ATIME flag too */
+/*                      file->f_path.dentry->d_inode->i_ctime =
+                        file->f_path.dentry->d_inode->i_mtime = CURRENT_TIME;*/
                         if (total_written > 0) {
                                 if (*poffset > file->f_path.dentry->d_inode->i_size)
                                         i_size_write(file->f_path.dentry->d_inode,