aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/cifs/cifsfs.c1
-rw-r--r--fs/cifs/file.c5
2 files changed, 4 insertions, 2 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 887c89b43bd8..bc2c0ac27169 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -287,6 +287,7 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)
287 287
288 if (cifs_sb) { 288 if (cifs_sb) {
289 if (cifs_sb->tcon) { 289 if (cifs_sb->tcon) {
290/* BB add prepath to mount options displayed */
290 seq_printf(s, ",unc=%s", cifs_sb->tcon->treeName); 291 seq_printf(s, ",unc=%s", cifs_sb->tcon->treeName);
291 if (cifs_sb->tcon->ses) { 292 if (cifs_sb->tcon->ses) {
292 if (cifs_sb->tcon->ses->userName) 293 if (cifs_sb->tcon->ses->userName)
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,
1014 /* since the write may have blocked check these pointers again */ 1014 /* since the write may have blocked check these pointers again */
1015 if (file->f_path.dentry) { 1015 if (file->f_path.dentry) {
1016 if (file->f_path.dentry->d_inode) { 1016 if (file->f_path.dentry->d_inode) {
1017 file->f_path.dentry->d_inode->i_ctime = 1017/*BB We could make this contingent on superblock ATIME flag too */
1018 file->f_path.dentry->d_inode->i_mtime = CURRENT_TIME; 1018/* file->f_path.dentry->d_inode->i_ctime =
1019 file->f_path.dentry->d_inode->i_mtime = CURRENT_TIME;*/
1019 if (total_written > 0) { 1020 if (total_written > 0) {
1020 if (*poffset > file->f_path.dentry->d_inode->i_size) 1021 if (*poffset > file->f_path.dentry->d_inode->i_size)
1021 i_size_write(file->f_path.dentry->d_inode, 1022 i_size_write(file->f_path.dentry->d_inode,