[PATCH] smb: use macros instead of constants for leasekey size and default cifsattrs value

[PATCH] smb: use macros instead of constants for leasekey size and default cifsattrs value

[Bharath SM]

Replace default hardcoded value for cifsAttrs with ATTR_ARCHIVE macro
Use SMB2_LEASE_KEY_SIZE macro for leasekey size in smb2_lease_break

Signed-off-by: Bharath SM <bharathsm@microsoft.com>
---
 fs/smb/client/cifsfs.c  | 2 +-
 fs/smb/client/smb2pdu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c
index c9f9b6e97964..722be656f5dc 100644
--- a/fs/smb/client/cifsfs.c
+++ b/fs/smb/client/cifsfs.c
@@ -398,7 +398,7 @@ cifs_alloc_inode(struct super_block *sb)
 	cifs_inode = alloc_inode_sb(sb, cifs_inode_cachep, GFP_KERNEL);
 	if (!cifs_inode)
 		return NULL;
-	cifs_inode->cifsAttrs = 0x20;	/* default */
+	cifs_inode->cifsAttrs = ATTR_ARCHIVE;	/* default */
 	cifs_inode->time = 0;
 	/*
 	 * Until the file is open and we have gotten oplock info back from the
diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c
index 010eae9d6c47..c945b94318f8 100644
--- a/fs/smb/client/smb2pdu.c
+++ b/fs/smb/client/smb2pdu.c
@@ -6204,7 +6204,7 @@ SMB2_lease_break(const unsigned int xid, struct cifs_tcon *tcon,
 	req->StructureSize = cpu_to_le16(36);
 	total_len += 12;
 
-	memcpy(req->LeaseKey, lease_key, 16);
+	memcpy(req->LeaseKey, lease_key, SMB2_LEASE_KEY_SIZE);
 	req->LeaseState = lease_state;
 
 	flags |= CIFS_NO_RSP_BUF;
-- 
2.43.0

Re: [PATCH] smb: use macros instead of constants for leasekey size and default cifsattrs value

[Steve French]

merged into cifs-2.6.git for-next

On Mon, Dec 16, 2024 at 12:39 PM Bharath SM <bharathsm.hsk@gmail.com> wrote:
>
> Replace default hardcoded value for cifsAttrs with ATTR_ARCHIVE macro
> Use SMB2_LEASE_KEY_SIZE macro for leasekey size in smb2_lease_break
>
> Signed-off-by: Bharath SM <bharathsm@microsoft.com>
> ---
>  fs/smb/client/cifsfs.c  | 2 +-
>  fs/smb/client/smb2pdu.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c
> index c9f9b6e97964..722be656f5dc 100644
> --- a/fs/smb/client/cifsfs.c
> +++ b/fs/smb/client/cifsfs.c
> @@ -398,7 +398,7 @@ cifs_alloc_inode(struct super_block *sb)
>         cifs_inode = alloc_inode_sb(sb, cifs_inode_cachep, GFP_KERNEL);
>         if (!cifs_inode)
>                 return NULL;
> -       cifs_inode->cifsAttrs = 0x20;   /* default */
> +       cifs_inode->cifsAttrs = ATTR_ARCHIVE;   /* default */
>         cifs_inode->time = 0;
>         /*
>          * Until the file is open and we have gotten oplock info back from the
> diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c
> index 010eae9d6c47..c945b94318f8 100644
> --- a/fs/smb/client/smb2pdu.c
> +++ b/fs/smb/client/smb2pdu.c
> @@ -6204,7 +6204,7 @@ SMB2_lease_break(const unsigned int xid, struct cifs_tcon *tcon,
>         req->StructureSize = cpu_to_le16(36);
>         total_len += 12;
>
> -       memcpy(req->LeaseKey, lease_key, 16);
> +       memcpy(req->LeaseKey, lease_key, SMB2_LEASE_KEY_SIZE);
>         req->LeaseState = lease_state;
>
>         flags |= CIFS_NO_RSP_BUF;
> --
> 2.43.0
>
>


-- 
Thanks,

Steve