diff options
author | Steve French <sfrench@us.ibm.com> | 2007-07-18 23:21:09 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2007-07-18 23:21:09 +0000 |
commit | c18c842b1fdf527717303a4e173cbece7ab2deb8 (patch) | |
tree | b400ad6d711b8474a0516220c98d390d56c508de /fs/cifs/readdir.c | |
parent | 63135e088a604b955746c51964c195c8d3ebac11 (diff) | |
download | linux-c18c842b1fdf527717303a4e173cbece7ab2deb8.tar.gz linux-c18c842b1fdf527717303a4e173cbece7ab2deb8.tar.bz2 linux-c18c842b1fdf527717303a4e173cbece7ab2deb8.zip |
[CIFS] Allow disabling CIFS Unix Extensions as mount option
Previously the only way to do this was to umount all mounts to that server,
turn off a proc setting (/proc/fs/cifs/LinuxExtensionsEnabled).
Fixes Samba bugzilla bug number: 4582 (and also 2008)
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/readdir.c')
-rw-r--r-- | fs/cifs/readdir.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index 07f92531f74f..916df9431336 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c @@ -463,7 +463,9 @@ static int initiate_cifs_search(const int xid, struct file *file) ffirst_retry: /* test for Unix extensions */ - if (pTcon->ses->capabilities & CAP_UNIX) { + /* but now check for them on the share/mount not on the SMB session */ +/* if (pTcon->ses->capabilities & CAP_UNIX) { */ + if (pTcon->unix_ext) { cifsFile->srch_inf.info_level = SMB_FIND_FILE_UNIX; } else if ((pTcon->ses->capabilities & (CAP_NT_SMBS | CAP_NT_FIND)) == 0) { |