Commit 8fd6e1d6 authored by Kenneth D'souza's avatar Kenneth D'souza Committed by Steve French
Browse files

cifs: handle "nolease" option for vers=1.0 



The "nolease" mount option is only supported for SMB2+ mounts.
Fail with appropriate error message if vers=1.0 option is passed.

Signed-off-by: default avatarKenneth D'souza <kdsouza@redhat.com>
Reviewed-by: default avatarPavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 3d77e6a8

fs/cifs/connect.c

+10 −1
Original line number Diff line number Diff line
@@ -3580,6 +3580,16 @@ cifs_get_tcon(struct cifs_ses *ses, struct smb_vol *volume_info) 
			cifs_dbg(VFS, "cache=singleclient requested on mount but NO_CACHING flag set on share\n");

	}



	if (volume_info->no_lease) {

		if (ses->server->vals->protocol_id == 0) {

			cifs_dbg(VFS,

				"SMB2 or later required for nolease option\n");

			rc = -EOPNOTSUPP;

			goto out_fail;

		} else

			tcon->no_lease = volume_info->no_lease;

	}



	/*

	 * We can have only one retry value for a connection to a share so for

	 * resources mounted more than once to the same server share the last
@@ -3589,7 +3599,6 @@ cifs_get_tcon(struct cifs_ses *ses, struct smb_vol *volume_info) 
	tcon->nocase = volume_info->nocase;

	tcon->nohandlecache = volume_info->nohandlecache;

	tcon->local_lease = volume_info->local_lease;

	tcon->no_lease = volume_info->no_lease;

	INIT_LIST_HEAD(&tcon->pending_opens);



	spin_lock(&cifs_tcp_ses_lock);