Skip to content

L
linux-davinci-2.6.23
Commit 004c46b9 authored by Steve French's avatar Steve French
Browse files
Options

[CIFS] One line missing from previous commit 

Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 1b2b2126
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
fs/cifs/cifsfs.c
View file @ 004c46b9
...@@ -287,6 +287,7 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m) ...@@ -287,6 +287,7 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)
if (cifs_sb) { if (cifs_sb) {
if (cifs_sb->tcon) { if (cifs_sb->tcon) {
/* BB add prepath to mount options displayed */
seq_printf(s, ",unc=%s", cifs_sb->tcon->treeName); seq_printf(s, ",unc=%s", cifs_sb->tcon->treeName);
if (cifs_sb->tcon->ses) { if (cifs_sb->tcon->ses) {
if (cifs_sb->tcon->ses->userName) if (cifs_sb->tcon->ses->userName)
......
fs/cifs/file.c
View file @ 004c46b9
...@@ -1014,8 +1014,9 @@ static ssize_t cifs_write(struct file *file, const char *write_data, ...@@ -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 */ /* since the write may have blocked check these pointers again */
if (file->f_path.dentry) { if (file->f_path.dentry) {
if (file->f_path.dentry->d_inode) { if (file->f_path.dentry->d_inode) {
file->f_path.dentry->d_inode->i_ctime = /*BB We could make this contingent on superblock ATIME flag too */
file->f_path.dentry->d_inode->i_mtime = CURRENT_TIME; /* file->f_path.dentry->d_inode->i_ctime =
file->f_path.dentry->d_inode->i_mtime = CURRENT_TIME;*/
if (total_written > 0) { if (total_written > 0) {
if (*poffset > file->f_path.dentry->d_inode->i_size) if (*poffset > file->f_path.dentry->d_inode->i_size)
i_size_write(file->f_path.dentry->d_inode, i_size_write(file->f_path.dentry->d_inode,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment