From nobody Sun Feb 8 11:26:14 2026 Received: from out-181.mta0.migadu.com (out-181.mta0.migadu.com [91.218.175.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5B1F42D23B6 for ; Thu, 13 Nov 2025 09:27:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763026040; cv=none; b=caaekXbA/VMb5WHd9m9EsWVXpn07pZkOkgfn4VxtKkk09+rVZnUoAZyJBzTAdYCyDZGDj7vSlBXTXd/y2C5L9wgagYFTfpGIIFhOva6sPDqRugp03AyQ+p0GpRGQiqxzMwY3/t/YmfmDVCXbAVhGyLWFYtb01paiPokFAKtYJRY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763026040; c=relaxed/simple; bh=QDXRB2ff6+kUMzKvs1zlho1XpysqI6Bc9Yq5aocDng4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mKMouuGPSgnvx2IpQakMjSdsvpKMVRmyfPYYPYMgeto5iQkgCdmxVHM0ZOyoRsdPcrjCRTeubK/4CLLmd3cmo3a0BGFjfD/IXM03cRAPurJd6JDeOLk1njGYTcRtx3vsKMClM6hY48gaNOdUgnfsDfOp5zRdyCM4mfuXdhsmA1g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=syNL3O+c; arc=none smtp.client-ip=91.218.175.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="syNL3O+c" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1763026034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VeCGFU5DwaZxXclQMZVj6wcWtauhyxy0IKP+39RJOc0=; b=syNL3O+cRFOjJTasqG/S3soUBGfkF+aDReSA75To8nFmtVwte/6ua9yk385NpodeaH3hi5 QMyIMYjqsmeagR/zCLUBiVp4j5a5DWJ4eUD5Gy43caoSJLmBlePD2ZnBntyVLxPhw3qmgb 8cYxmUxw7Aybf17oxaxfncIGXU/QwFI= From: chenxiaosong.chenxiaosong@linux.dev To: sfrench@samba.org, smfrench@gmail.com, linkinjeon@kernel.org, linkinjeon@samba.org, christophe.jaillet@wanadoo.fr Cc: linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, chenxiaosong@chenxiaosong.com, ChenXiaoSong Subject: [PATCH v6 1/2] smb: move CREATE_DURABLE_RECONN_REQ to common/smb2pdu.h Date: Thu, 13 Nov 2025 17:26:01 +0800 Message-ID: <20251113092602.24733-2-chenxiaosong.chenxiaosong@linux.dev> In-Reply-To: <20251113092602.24733-1-chenxiaosong.chenxiaosong@linux.dev> References: <20251113092602.24733-1-chenxiaosong.chenxiaosong@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: ChenXiaoSong The fields in struct create_durable_reconn_req and struct create_durable are exactly the same, so remove create_durable_reconn_req from server, and use typedef to define both CREATE_DURABLE and CREATE_DURABLE_RECONN_REQ for a single struct. Rename the following places: - struct create_durable -> CREATE_DURABLE - struct create_durable_reconn_req -> CREATE_DURABLE_RECONN_REQ The documentation references are: - SMB2_CREATE_DURABLE_HANDLE_REQUEST in MS-SMB2 2.2.13.2.3 - SMB2_CREATE_DURABLE_HANDLE_RECONNECT in MS-SMB2 2.2.13.2.4 - SMB2_FILEID in MS-SMB2 2.2.14.1 Descriptions of the struct fields: - __u8 Reserved[16]: DurableRequest field of SMB2_CREATE_DURABLE_HANDLE_= REQUEST. A 16-byte field that MUST be reserved. - __u64 PersistentFileId: Persistent field of 2.2.14.1 SMB2_FILEID - __u64 VolatileFileId: Volatile field of 2.2.14.1 SMB2_FILEID - struct Fid: Data field of SMB2_CREATE_DURABLE_HANDLE_RECONNECT. An SMB2_FILEID structure, as specified in section 2.2.14.1. Suggested-by: Namjae Jeon Signed-off-by: ChenXiaoSong --- fs/smb/client/smb2pdu.c | 23 +++++++++++------------ fs/smb/common/smb2pdu.h | 4 ++-- fs/smb/server/smb2pdu.c | 6 +++--- fs/smb/server/smb2pdu.h | 12 ------------ 4 files changed, 16 insertions(+), 29 deletions(-) diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c index 62ced22fc5a6..5cf724ccdc75 100644 --- a/fs/smb/client/smb2pdu.c +++ b/fs/smb/client/smb2pdu.c @@ -2229,21 +2229,20 @@ SMB2_tdis(const unsigned int xid, struct cifs_tcon = *tcon) return rc; } =20 - -static struct create_durable * +static CREATE_DURABLE * create_durable_buf(void) { - struct create_durable *buf; + CREATE_DURABLE *buf; =20 - buf =3D kzalloc(sizeof(struct create_durable), GFP_KERNEL); + buf =3D kzalloc(sizeof(CREATE_DURABLE), GFP_KERNEL); if (!buf) return NULL; =20 buf->ccontext.DataOffset =3D cpu_to_le16(offsetof - (struct create_durable, Data)); + (CREATE_DURABLE, Data)); buf->ccontext.DataLength =3D cpu_to_le32(16); buf->ccontext.NameOffset =3D cpu_to_le16(offsetof - (struct create_durable, Name)); + (CREATE_DURABLE, Name)); buf->ccontext.NameLength =3D cpu_to_le16(4); /* SMB2_CREATE_DURABLE_HANDLE_REQUEST is "DHnQ" */ buf->Name[0] =3D 'D'; @@ -2253,20 +2252,20 @@ create_durable_buf(void) return buf; } =20 -static struct create_durable * +static CREATE_DURABLE * create_reconnect_durable_buf(struct cifs_fid *fid) { - struct create_durable *buf; + CREATE_DURABLE *buf; =20 - buf =3D kzalloc(sizeof(struct create_durable), GFP_KERNEL); + buf =3D kzalloc(sizeof(CREATE_DURABLE), GFP_KERNEL); if (!buf) return NULL; =20 buf->ccontext.DataOffset =3D cpu_to_le16(offsetof - (struct create_durable, Data)); + (CREATE_DURABLE, Data)); buf->ccontext.DataLength =3D cpu_to_le32(16); buf->ccontext.NameOffset =3D cpu_to_le16(offsetof - (struct create_durable, Name)); + (CREATE_DURABLE, Name)); buf->ccontext.NameLength =3D cpu_to_le16(4); buf->Data.Fid.PersistentFileId =3D fid->persistent_fid; buf->Data.Fid.VolatileFileId =3D fid->volatile_fid; @@ -2552,7 +2551,7 @@ add_durable_context(struct kvec *iov, unsigned int *n= um_iovec, iov[num].iov_base =3D create_durable_buf(); if (iov[num].iov_base =3D=3D NULL) return -ENOMEM; - iov[num].iov_len =3D sizeof(struct create_durable); + iov[num].iov_len =3D sizeof(CREATE_DURABLE); *num_iovec =3D num + 1; return 0; } diff --git a/fs/smb/common/smb2pdu.h b/fs/smb/common/smb2pdu.h index 824d27297bec..592b22e3d0c7 100644 --- a/fs/smb/common/smb2pdu.h +++ b/fs/smb/common/smb2pdu.h @@ -1265,7 +1265,7 @@ struct create_posix { } __packed; =20 /* See MS-SMB2 2.2.13.2.3 and MS-SMB2 2.2.13.2.4 */ -struct create_durable { +typedef struct { struct create_context_hdr ccontext; __u8 Name[8]; union { @@ -1275,7 +1275,7 @@ struct create_durable { __u64 VolatileFileId; } Fid; } Data; -} __packed; +} __packed CREATE_DURABLE, CREATE_DURABLE_RECONN_REQ; =20 /* See MS-SMB2 2.2.13.2.5 */ struct create_mxac_req { diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c index 95186fa96080..780cdb7dc6cf 100644 --- a/fs/smb/server/smb2pdu.c +++ b/fs/smb/server/smb2pdu.c @@ -2766,7 +2766,7 @@ static int parse_durable_handle_context(struct ksmbd_= work *work, } case DURABLE_RECONN: { - struct create_durable_reconn_req *recon; + CREATE_DURABLE_RECONN_REQ *recon; =20 if (dh_info->type =3D=3D DURABLE_RECONN_V2 || dh_info->type =3D=3D DURABLE_REQ_V2) { @@ -2776,12 +2776,12 @@ static int parse_durable_handle_context(struct ksmb= d_work *work, =20 if (le16_to_cpu(context->DataOffset) + le32_to_cpu(context->DataLength) < - sizeof(struct create_durable_reconn_req)) { + sizeof(CREATE_DURABLE_RECONN_REQ)) { err =3D -EINVAL; goto out; } =20 - recon =3D (struct create_durable_reconn_req *)context; + recon =3D (CREATE_DURABLE_RECONN_REQ *)context; persistent_id =3D recon->Data.Fid.PersistentFileId; dh_info->fp =3D ksmbd_lookup_durable_fd(persistent_id); if (!dh_info->fp) { diff --git a/fs/smb/server/smb2pdu.h b/fs/smb/server/smb2pdu.h index b94de41049f4..66cdc8e4a648 100644 --- a/fs/smb/server/smb2pdu.h +++ b/fs/smb/server/smb2pdu.h @@ -68,18 +68,6 @@ struct preauth_integrity_info { =20 #define DURABLE_HANDLE_MAX_TIMEOUT 300000 =20 -struct create_durable_reconn_req { - struct create_context_hdr ccontext; - __u8 Name[8]; - union { - __u8 Reserved[16]; - struct { - __u64 PersistentFileId; - __u64 VolatileFileId; - } Fid; - } Data; -} __packed; - struct create_alloc_size_req { struct create_context_hdr ccontext; __u8 Name[8]; --=20 2.43.0 From nobody Sun Feb 8 11:26:14 2026 Received: from out-188.mta0.migadu.com (out-188.mta0.migadu.com [91.218.175.188]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6CBB22D9798 for ; Thu, 13 Nov 2025 09:27:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.188 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763026042; cv=none; b=ZCCqQ7stMkiAdihWSqDSNs0wj178KErlPzZcO+MsXd1gZEH3fOZakWBiCLv0K0FkwLBtQhZHlFkNUMZVazvKxOzDM8EFQ4RR4EjJ3xnvvLcVc5QJujsZfVUB/q9h/Yo/FqHQJJxZjytxcYSDLU5g1KM2p6K2IYcDOXVeqn48g1U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763026042; c=relaxed/simple; bh=LccbU0TtT2qQgElmlYyPgFwJj4du5x/XKUSTAEaVarc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZsOllGSj8oWh/Dgm+rQoSIU3T5lMqStu/9tNZJKwpE72uvAA/bYK2I1TundMXrDmeizOn4rx7n8PC0SahbclWWTe7iI8pSIvY4N73XdJYM+gXRiV7/o7e3n+rtyv/8xEph1iIqivtX/Omy7HSa6/uk12UVjAaxptRth+pyxehRw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=n22o8R07; arc=none smtp.client-ip=91.218.175.188 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="n22o8R07" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1763026037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w7vvCsHI5nElxztzx6XgOfvmGPZZkj/fhVJA4sYQEuQ=; b=n22o8R07jAQzv0WHCh2exlY32I1DRJZXumtBD25xeDfD0QOrFKeW9BnaTlSgEZfMjH2ByU otvSu9qfCKU9jt0b2XvWmTSYw8IUK5H4XK+AuXbQtV7VEFMQIGGm471++HYJqHWBjVC++Y xnQKSrOo1vGxsJRF+T4ITVat+XFUrU4= From: chenxiaosong.chenxiaosong@linux.dev To: sfrench@samba.org, smfrench@gmail.com, linkinjeon@kernel.org, linkinjeon@samba.org, christophe.jaillet@wanadoo.fr Cc: linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, chenxiaosong@chenxiaosong.com, ChenXiaoSong Subject: [PATCH v6 2/2] smb: move FILE_SYSTEM_ATTRIBUTE_INFO to common/fscc.h Date: Thu, 13 Nov 2025 17:26:02 +0800 Message-ID: <20251113092602.24733-3-chenxiaosong.chenxiaosong@linux.dev> In-Reply-To: <20251113092602.24733-1-chenxiaosong.chenxiaosong@linux.dev> References: <20251113092602.24733-1-chenxiaosong.chenxiaosong@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: ChenXiaoSong Modify the following places: - struct filesystem_attribute_info -> FILE_SYSTEM_ATTRIBUTE_INFO - client: remove MIN_FS_ATTR_INFO_SIZE definition, MIN_FS_ATTR_INFO_SIZE -> sizeof(FILE_SYSTEM_ATTRIBUTE_INFO) Then move FILE_SYSTEM_ATTRIBUTE_INFO to common header file. Suggested-by: Namjae Jeon Signed-off-by: ChenXiaoSong --- fs/smb/client/cifspdu.h | 10 ---------- fs/smb/client/smb2pdu.c | 2 +- fs/smb/common/fscc.h | 8 ++++++++ fs/smb/server/smb2pdu.c | 6 +++--- fs/smb/server/smb_common.h | 7 ------- 5 files changed, 12 insertions(+), 21 deletions(-) diff --git a/fs/smb/client/cifspdu.h b/fs/smb/client/cifspdu.h index d84e10b1477f..49f35cb3cf2e 100644 --- a/fs/smb/client/cifspdu.h +++ b/fs/smb/client/cifspdu.h @@ -2068,16 +2068,6 @@ typedef struct { #define FILE_PORTABLE_DEVICE 0x00004000 #define FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL 0x00020000 =20 -/* minimum includes first three fields, and empty FS Name */ -#define MIN_FS_ATTR_INFO_SIZE 12 - -typedef struct { - __le32 Attributes; - __le32 MaxPathNameComponentLength; - __le32 FileSystemNameLen; - char FileSystemName[52]; /* do not have to save this - get subset? */ -} __attribute__((packed)) FILE_SYSTEM_ATTRIBUTE_INFO; - /*************************************************************************= *****/ /* QueryFileInfo/QueryPathinfo (also for SetPath/SetFile) data buffer form= ats */ /*************************************************************************= *****/ diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c index 5cf724ccdc75..7ee17f77db95 100644 --- a/fs/smb/client/smb2pdu.c +++ b/fs/smb/client/smb2pdu.c @@ -5982,7 +5982,7 @@ SMB2_QFS_attr(const unsigned int xid, struct cifs_tco= n *tcon, min_len =3D sizeof(FILE_SYSTEM_DEVICE_INFO); } else if (level =3D=3D FS_ATTRIBUTE_INFORMATION) { max_len =3D sizeof(FILE_SYSTEM_ATTRIBUTE_INFO); - min_len =3D MIN_FS_ATTR_INFO_SIZE; + min_len =3D sizeof(FILE_SYSTEM_ATTRIBUTE_INFO); } else if (level =3D=3D FS_SECTOR_SIZE_INFORMATION) { max_len =3D sizeof(struct smb3_fs_ss_info); min_len =3D sizeof(struct smb3_fs_ss_info); diff --git a/fs/smb/common/fscc.h b/fs/smb/common/fscc.h index a0580a772a41..7eb3f715466d 100644 --- a/fs/smb/common/fscc.h +++ b/fs/smb/common/fscc.h @@ -94,6 +94,14 @@ struct smb2_file_network_open_info { __le32 Reserved; } __packed; /* level 34 Query also similar returned in close rsp and open = rsp */ =20 +/* See FS-FSCC 2.5.1 */ +typedef struct { + __le32 Attributes; + __le32 MaxPathNameComponentLength; + __le32 FileSystemNameLen; + __le16 FileSystemName[]; /* do not have to save this - get subset? */ +} __packed FILE_SYSTEM_ATTRIBUTE_INFO; + /* List of FileSystemAttributes - see MS-FSCC 2.5.1 */ #define FILE_SUPPORTS_SPARSE_VDL 0x10000000 /* faster nonsparse extend */ #define FILE_SUPPORTS_BLOCK_REFCOUNTING 0x08000000 /* allow ioctl dup exte= nts */ diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c index 780cdb7dc6cf..58327896e7d1 100644 --- a/fs/smb/server/smb2pdu.c +++ b/fs/smb/server/smb2pdu.c @@ -5492,10 +5492,10 @@ static int smb2_get_info_filesystem(struct ksmbd_wo= rk *work, } case FS_ATTRIBUTE_INFORMATION: { - struct filesystem_attribute_info *info; + FILE_SYSTEM_ATTRIBUTE_INFO *info; size_t sz; =20 - info =3D (struct filesystem_attribute_info *)rsp->Buffer; + info =3D (FILE_SYSTEM_ATTRIBUTE_INFO *)rsp->Buffer; info->Attributes =3D cpu_to_le32(FILE_SUPPORTS_OBJECT_IDS | FILE_PERSISTENT_ACLS | FILE_UNICODE_ON_DISK | @@ -5514,7 +5514,7 @@ static int smb2_get_info_filesystem(struct ksmbd_work= *work, "NTFS", PATH_MAX, conn->local_nls, 0); len =3D len * 2; info->FileSystemNameLen =3D cpu_to_le32(len); - sz =3D sizeof(struct filesystem_attribute_info) + len; + sz =3D sizeof(FILE_SYSTEM_ATTRIBUTE_INFO) + len; rsp->OutputBufferLength =3D cpu_to_le32(sz); break; } diff --git a/fs/smb/server/smb_common.h b/fs/smb/server/smb_common.h index 4dd573c5f0b2..6c1607b43eb3 100644 --- a/fs/smb/server/smb_common.h +++ b/fs/smb/server/smb_common.h @@ -90,13 +90,6 @@ struct smb_negotiate_rsp { __le16 ByteCount; } __packed; =20 -struct filesystem_attribute_info { - __le32 Attributes; - __le32 MaxPathNameComponentLength; - __le32 FileSystemNameLen; - __le16 FileSystemName[]; /* do not have to save this - get subset? */ -} __packed; - struct filesystem_vol_info { __le64 VolumeCreationTime; __le32 SerialNumber; --=20 2.43.0