[CIFS] One line missing from previous commit

Signed-off-by: Steve French <sfrench@us.ibm.com>

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 887c89b..bc2c0ac 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -287,6 +287,7 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)
 
        if (cifs_sb) {
                if (cifs_sb->tcon) {
 
        if (cifs_sb) {
                if (cifs_sb->tcon) {

+/* BB add prepath to mount options displayed */

                        seq_printf(s, ",unc=%s", cifs_sb->tcon->treeName);
                        if (cifs_sb->tcon->ses) {
                                if (cifs_sb->tcon->ses->userName)
                        seq_printf(s, ",unc=%s", cifs_sb->tcon->treeName);
                        if (cifs_sb->tcon->ses) {
                                if (cifs_sb->tcon->ses->userName)

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 07ff935..a1265c9 100644 (file)
--- 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) {
        /* 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,
                        if (total_written > 0) {
                                if (*poffset > file->f_path.dentry->d_inode->i_size)
                                        i_size_write(file->f_path.dentry->d_inode,