Commit 18dd1c36 authored by Namjae Jeon's avatar Namjae Jeon Committed by Steve French
Browse files

ksmbd: set v2 lease capability 



Set SMB2_GLOBAL_CAP_DIRECTORY_LEASING to ->capabilities to inform server
support directory lease to client.

Signed-off-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent d045850b

fs/smb/server/oplock.c

+0 −4
Original line number Diff line number Diff line
@@ -1105,10 +1105,6 @@ int smb_grant_oplock(struct ksmbd_work *work, int req_op_level, u64 pid, 
	bool prev_op_has_lease;

	__le32 prev_op_state = 0;



	/* not support directory lease */

	if (S_ISDIR(file_inode(fp->filp)->i_mode))

		return 0;



	opinfo = alloc_opinfo(work, pid, tid);

	if (!opinfo)

		return -ENOMEM;

fs/smb/server/smb2ops.c

+6 −3
Original line number Diff line number Diff line
@@ -221,7 +221,8 @@ void init_smb3_0_server(struct ksmbd_conn *conn) 
	conn->signing_algorithm = SIGNING_ALG_AES_CMAC_LE;



	if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_LEASES)

		conn->vals->capabilities |= SMB2_GLOBAL_CAP_LEASING;

		conn->vals->capabilities |= SMB2_GLOBAL_CAP_LEASING |

			SMB2_GLOBAL_CAP_DIRECTORY_LEASING;



	if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_ENCRYPTION &&

	    conn->cli_cap & SMB2_GLOBAL_CAP_ENCRYPTION)
@@ -245,7 +246,8 @@ void init_smb3_02_server(struct ksmbd_conn *conn) 
	conn->signing_algorithm = SIGNING_ALG_AES_CMAC_LE;



	if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_LEASES)

		conn->vals->capabilities |= SMB2_GLOBAL_CAP_LEASING;

		conn->vals->capabilities |= SMB2_GLOBAL_CAP_LEASING |

			SMB2_GLOBAL_CAP_DIRECTORY_LEASING;



	if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_ENCRYPTION ||

	    (!(server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_ENCRYPTION_OFF) &&
@@ -270,7 +272,8 @@ int init_smb3_11_server(struct ksmbd_conn *conn) 
	conn->signing_algorithm = SIGNING_ALG_AES_CMAC_LE;



	if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_LEASES)

		conn->vals->capabilities |= SMB2_GLOBAL_CAP_LEASING;

		conn->vals->capabilities |= SMB2_GLOBAL_CAP_LEASING |

			SMB2_GLOBAL_CAP_DIRECTORY_LEASING;



	if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_ENCRYPTION ||

	    (!(server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_ENCRYPTION_OFF) &&