smb: client: remove unnecessary checks in open_cached_dir()

Checks inside open_cached_dir() can be removed because if dir caching is
disabled then tcon->cfids is necessarily NULL. Therefore, all other checks
are redundant.

Signed-off-by: Henrique Carvalho <henrique.carvalho@suse.com>
Reviewed-by: Paulo Alcantara (Red Hat) <pc@manguebit.com>
Reviewed-by: Enzo Matsumiya <ematsumiya@suse.de>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/smb/client/cached_dir.c b/fs/smb/client/cached_dir.c
index 06eb19d..414c591 100644 (file)
--- a/fs/smb/client/cached_dir.c
+++ b/fs/smb/client/cached_dir.c
@@ -157,15 +157,17 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,
        const char *npath;
        int retries = 0, cur_sleep = 1;
 
-       if (tcon == NULL || tcon->cfids == NULL || tcon->nohandlecache ||
-           is_smb1_server(tcon->ses->server) || (dir_cache_timeout == 0))
+       if (cifs_sb->root == NULL)
+               return -ENOENT;
+
+       if (tcon == NULL)
                return -EOPNOTSUPP;
 
        ses = tcon->ses;
        cfids = tcon->cfids;
 
-       if (cifs_sb->root == NULL)
-               return -ENOENT;
+       if (cfids == NULL)
+               return -EOPNOTSUPP;
 
 replay_again:
        /* reinitialize for possible replay */