[CIFS] Allow disabling CIFS Unix Extensions as mount option

[deliverable/linux.git] / fs / cifs / readdir.c

diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index 07f92531f74faf007b6d7735c2cfb166b2eafe9d..916df9431336734b8cab6495659ef4d345133498 100644 (file)
--- 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) {