CIFS: Make CAP_* checks protocol independent

Since both CIFS and SMB2 use ses->capabilities (server->capabilities)
field but flags are different we should make such checks protocol
independent.

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index da30d96a7495..d87f82678bc7 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -228,7 +228,7 @@ static int initiate_cifs_search(const unsigned int xid, struct file *file)
         struct cifsFileInfo *cifsFile;
         struct cifs_sb_info *cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
         struct tcon_link *tlink = NULL;
-        struct cifs_tcon *pTcon;
+        struct cifs_tcon *tcon;
 
         if (file->private_data == NULL) {
                 tlink = cifs_sb_tlink(cifs_sb);
@@ -242,10 +242,10 @@ static int initiate_cifs_search(const unsigned int xid, struct file *file)
                 }
                 file->private_data = cifsFile;
                 cifsFile->tlink = cifs_get_tlink(tlink);
-                pTcon = tlink_tcon(tlink);
+                tcon = tlink_tcon(tlink);
         } else {
                 cifsFile = file->private_data;
-                pTcon = tlink_tcon(cifsFile->tlink);
+                tcon = tlink_tcon(cifsFile->tlink);
         }
 
         cifsFile->invalidHandle = true;
@@ -262,11 +262,11 @@ static int initiate_cifs_search(const unsigned int xid, struct file *file)
 ffirst_retry:
         /* test for Unix extensions */
         /* but now check for them on the share/mount not on the SMB session */
-/*      if (pTcon->ses->capabilities & CAP_UNIX) { */
-        if (pTcon->unix_ext)
+        /* if (cap_unix(tcon->ses) { */
+        if (tcon->unix_ext)
                 cifsFile->srch_inf.info_level = SMB_FIND_FILE_UNIX;
-        else if ((pTcon->ses->capabilities &
-                        (CAP_NT_SMBS | CAP_NT_FIND)) == 0) {
+        else if ((tcon->ses->capabilities &
+                  tcon->ses->server->vals->cap_nt_find) == 0) {
                 cifsFile->srch_inf.info_level = SMB_FIND_FILE_INFO_STANDARD;
         } else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) {
                 cifsFile->srch_inf.info_level = SMB_FIND_FILE_ID_FULL_DIR_INFO;
@@ -278,7 +278,7 @@ ffirst_retry:
         if (backup_cred(cifs_sb))
                 search_flags |= CIFS_SEARCH_BACKUP_SEARCH;
 
-        rc = CIFSFindFirst(xid, pTcon, full_path, cifs_sb->local_nls,
+        rc = CIFSFindFirst(xid, tcon, full_path, cifs_sb->local_nls,
                 &cifsFile->netfid, search_flags, &cifsFile->srch_inf,
                 cifs_sb->mnt_cifs_flags &
                         CIFS_MOUNT_MAP_SPECIAL_CHR, CIFS_DIR_SEP(cifs_sb));