From nobody Sun Feb 8 05:59:06 2026 Received: from out-170.mta1.migadu.com (out-170.mta1.migadu.com [95.215.58.170]) (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 CEDDA1A9FB5 for ; Sun, 16 Nov 2025 06:53:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763276009; cv=none; b=QsxStXggSUN++wrTfbxj9jrc9N2kXyexIwQrUFQHy/4bHwCUuvJDOfhdhAgZIMTZL/Q8PAk9U9bCeilhj5a4u7BOoFZTn8OiglM5ttmndt5T07NaljPpgipTWhYSzx4ZCT818NRJi1AXKccbfyqWIutM9KtkzgE3VsK8uKQ4f4k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763276009; c=relaxed/simple; bh=MtkJceG6vHRGeYgDEOKI93Lfeqxrc1k2V5RWTbXOLhQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SnIdd78IuDeTM8o4PURilRqnYgCfLAmwTB9tewAuSwk+XLF1yb8zxNXumDH1lf4/4IzwlzklPej4H9xnfkLgW6tV1CX/N9DRxx9gcQO1qyyzJZpfY2h9O0FXPRjtFHKYrCmWTx4qNPnkvd6n8n/xCXH7XnXCkeeqS5/x+RUpMXo= 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=ha14mLC8; arc=none smtp.client-ip=95.215.58.170 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="ha14mLC8" 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=1763276004; 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=nxeMLv/Iu7nfx7QXwZWnnurBiRurJdFvDDko/04OW6U=; b=ha14mLC8uh0ogdLHUvWKiAsRDgWpxFkaOUXWw23pDs0W39mLpMCmOqGB5c1C2QGP21HnU9 P0j3UUUiSBJ7s41tM/Wq3B3Axfm1rD7x3xlPLciqz50zFyDBrv55pQq5nYlbbdGGFxeF53 wd33HlXBZQPi1L4Sf/VmoOYU8JuPDsM= 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 v8 1/1] smb: move FILE_SYSTEM_ATTRIBUTE_INFO to common/fscc.h Date: Sun, 16 Nov 2025 14:52:13 +0800 Message-ID: <20251116065213.282598-2-chenxiaosong.chenxiaosong@linux.dev> In-Reply-To: <20251116065213.282598-1-chenxiaosong.chenxiaosong@linux.dev> References: <20251116065213.282598-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 - Remove MIN_FS_ATTR_INFO_SIZE definition - Introduce MAX_FS_NAME_LEN - max_len of FileFsAttributeInformation -> sizeof(FILE_SYSTEM_ATTRIBUTE_I= NFO) + MAX_FS_NAME_LEN - min_len of FileFsAttributeInformation -> sizeof(FILE_SYSTEM_ATTRIBUTE_I= NFO) 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 | 4 ++-- fs/smb/common/fscc.h | 9 +++++++++ fs/smb/server/smb2pdu.c | 6 +++--- fs/smb/server/smb_common.h | 7 ------- 5 files changed, 14 insertions(+), 22 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 032b4b037f07..1f40458e2156 100644 --- a/fs/smb/client/smb2pdu.c +++ b/fs/smb/client/smb2pdu.c @@ -5981,8 +5981,8 @@ SMB2_QFS_attr(const unsigned int xid, struct cifs_tco= n *tcon, max_len =3D sizeof(FILE_SYSTEM_DEVICE_INFO); 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; + max_len =3D sizeof(FILE_SYSTEM_ATTRIBUTE_INFO) + MAX_FS_NAME_LEN; + 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..226dcdba0a09 100644 --- a/fs/smb/common/fscc.h +++ b/fs/smb/common/fscc.h @@ -94,6 +94,15 @@ 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 */ +#define MAX_FS_NAME_LEN 52 +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 c71f156cc64a..1c8935f61150 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