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

ksmbd: add continuous availability share parameter 



If capabilities of the share is not SMB2_SHARE_CAP_CONTINUOUS_AVAILABILITY,
ksmbd should not grant a persistent handle to the client.
This patch add continuous availability share parameter to control it.

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

fs/smb/server/ksmbd_netlink.h

+18 −17
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ enum KSMBD_TREE_CONN_STATUS { 
#define KSMBD_SHARE_FLAG_ACL_XATTR			BIT(13)

#define KSMBD_SHARE_FLAG_UPDATE				BIT(14)

#define KSMBD_SHARE_FLAG_CROSSMNT			BIT(15)

#define KSMBD_SHARE_FLAG_CONTINUOUS_AVAILABILITY	BIT(16)



/*

 * Tree connect request flags.

fs/smb/server/smb2pdu.c

+9 −2
Original line number Diff line number Diff line
@@ -1988,6 +1988,11 @@ int smb2_tree_connect(struct ksmbd_work *work) 
	write_unlock(&sess->tree_conns_lock);

	rsp->StructureSize = cpu_to_le16(16);

out_err1:

	if (server_conf.flags & KSMBD_GLOBAL_FLAG_DURABLE_HANDLE &&

	    test_share_config_flag(share,

				   KSMBD_SHARE_FLAG_CONTINUOUS_AVAILABILITY))

		rsp->Capabilities = SMB2_SHARE_CAP_CONTINUOUS_AVAILABILITY;

	else

		rsp->Capabilities = 0;

	rsp->Reserved = 0;

	/* default manual caching */
@@ -3502,7 +3507,9 @@ int smb2_open(struct ksmbd_work *work) 
	memcpy(fp->client_guid, conn->ClientGUID, SMB2_CLIENT_GUID_SIZE);



	if (dh_info.type == DURABLE_REQ_V2 || dh_info.type == DURABLE_REQ) {

		if (dh_info.type == DURABLE_REQ_V2 && dh_info.persistent)

		if (dh_info.type == DURABLE_REQ_V2 && dh_info.persistent &&

		    test_share_config_flag(work->tcon->share_conf,

					   KSMBD_SHARE_FLAG_CONTINUOUS_AVAILABILITY))

			fp->is_persistent = true;

		else

			fp->is_durable = true;