diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-21 13:02:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-21 13:02:17 -0800 |
| commit | 9654640d0af8f2de40ff3807d3695109d3463f54 (patch) | |
| tree | ab279cb78248152fe19d3d2a977f33f883abed40 /fs/cifs/readdir.c | |
| parent | b5bf28cde894b3bb3bd25c13a7647020562f9ea0 (diff) | |
| parent | 004c46b9e588edf549a39c5db54e37ebd0b3b3ad (diff) | |
| download | kernel-crypto-9654640d0af8f2de40ff3807d3695109d3463f54.tar.gz kernel-crypto-9654640d0af8f2de40ff3807d3695109d3463f54.tar.xz kernel-crypto-9654640d0af8f2de40ff3807d3695109d3463f54.zip | |
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()
Diffstat (limited to 'fs/cifs/readdir.c')
| -rw-r--r-- | fs/cifs/readdir.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index c6220bd2716..c444798f074 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c @@ -83,6 +83,8 @@ static int construct_dentry(struct qstr *qstring, struct file *file, return rc; rc = 1; } + if(file->f_path.dentry->d_sb->s_flags & MS_NOATIME) + (*ptmp_inode)->i_flags |= S_NOATIME | S_NOCMTIME; } else { tmp_dentry = d_alloc(file->f_path.dentry, qstring); if(tmp_dentry == NULL) { @@ -98,6 +100,8 @@ static int construct_dentry(struct qstr *qstring, struct file *file, tmp_dentry->d_op = &cifs_dentry_ops; if(*ptmp_inode == NULL) return rc; + if(file->f_path.dentry->d_sb->s_flags & MS_NOATIME) + (*ptmp_inode)->i_flags |= S_NOATIME | S_NOCMTIME; rc = 2; } |