Commit f6e88838 authored by Henrique Carvalho's avatar Henrique Carvalho Committed by Steve French
Browse files

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: default avatarHenrique Carvalho <henrique.carvalho@suse.com>
Reviewed-by: default avatarPaulo Alcantara (Red Hat) <pc@manguebit.com>
Reviewed-by: default avatarEnzo Matsumiya <ematsumiya@suse.de>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 228a1157

fs/smb/client/cached_dir.c

+6 −4
Original line number Diff line number Diff line
@@ -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 */