diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-09 20:40:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-09 20:40:58 -0700 |
| commit | c2cc49a2f8a479dde96a599646d30b6cc9dbed78 (patch) | |
| tree | 9dcd16bcb4ab3aeba1952d5fc12e9b0fdd2d62d6 /fs/cifs/file.c | |
| parent | e864561c12bc743789eab76242b8314d394daa52 (diff) | |
| parent | d0c280d26de9422c9c943f8f486b9830cd9bea70 (diff) | |
| download | linux-3.10-c2cc49a2f8a479dde96a599646d30b6cc9dbed78.tar.gz linux-3.10-c2cc49a2f8a479dde96a599646d30b6cc9dbed78.tar.bz2 linux-3.10-c2cc49a2f8a479dde96a599646d30b6cc9dbed78.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: when ATTR_READONLY is set, only clear write bits on non-directories
cifs: remove cifsInodeInfo->inUse counter
cifs: convert cifs_get_inode_info and non-posix readdir to use cifs_iget
[CIFS] update cifs version number
cifs: add and use CIFSSMBUnixSetFileInfo for setattr calls
cifs: make a separate function for filling out FILE_UNIX_BASIC_INFO
cifs: rename CIFSSMBUnixSetInfo to CIFSSMBUnixSetPathInfo
cifs: add pid of initiating process to spnego upcall info
cifs: fix regression with O_EXCL creates and optimize away lookup
cifs: add new cifs_iget function and convert unix codepath to use it
Diffstat (limited to 'fs/cifs/file.c')
| -rw-r--r-- | fs/cifs/file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 97ce4bf89d1..c34b7f8a217 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -448,9 +448,9 @@ int cifs_open(struct inode *inode, struct file *file) .mtime = NO_CHANGE_64, .device = 0, }; - CIFSSMBUnixSetInfo(xid, tcon, full_path, &args, - cifs_sb->local_nls, - cifs_sb->mnt_cifs_flags & + CIFSSMBUnixSetPathInfo(xid, tcon, full_path, &args, + cifs_sb->local_nls, + cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR); } } |