Commit 198bf836 authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Steve French
Browse files

cifs: check for smb1 in open_cached_dir() 



Check protocol version in open_cached_dir() and return not supported
for SMB1.  This allows us to call open_cached_dir() from code that
is common to both smb1 and smb2/3 in future patches without having to
do this check in the call-site.
At the same time, add a check if tcon is valid or not for the same reason.

Reviewed-by: default avatarPaulo Alcantara (SUSE) <pc@cjr.nz>
Reviewed-by: default avatarEnzo Matsumiya <ematsumiya@suse.de>
Signed-off-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent f695b289

fs/cifs/smb2ops.c

+2 −1
Original line number Diff line number Diff line
@@ -776,7 +776,8 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon, 
	struct cifs_fid *pfid;

	struct dentry *dentry;



	if (tcon->nohandlecache)

	if (tcon == NULL || tcon->nohandlecache ||

	    is_smb1_server(tcon->ses->server))

		return -ENOTSUPP;



	if (cifs_sb->root == NULL)