From nobody Sun Feb 8 05:41:26 2026 Received: from out-174.mta1.migadu.com (out-174.mta1.migadu.com [95.215.58.174]) (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 7DF0A2DCBFB for ; Mon, 27 Oct 2025 07:15:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761549345; cv=none; b=eLY9Yqd+DhqGmwKWCdlg79bZu9oBtYHV76xflgCtFZsTUhXwYb5scolb5nCxdyHEWJ40yQe8B/JNwdEA2QBxEUNGyrUWNP5u/Bf36KTzEqSucBg3Kf4zHM74GKzvAFN4b/4+RmLWG4hT5+quTdp2OuqA22uFopaFnkeVih+IECI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761549345; c=relaxed/simple; bh=3XVdcQaNCtJyyGPx5qLKOq4kL675M/oZzHwb5T8IxO0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lDD7JDsn+p7uZWq0mSiDYvnjf8KAMu7CUHP/KI1MnO1ofGVjzQtBjOeGxKHbOc7mF+aCs9xkB5lCmsUj96OLFh7XoBaMGSPFvqBlUypYpjwZWZ+nvz1ZaMwud8rX1+6+reR/iReEzAw515qAbrm0+s8tuqOB2j0Nv9WXyAS9AHo= 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=I3ULteJ2; arc=none smtp.client-ip=95.215.58.174 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="I3ULteJ2" 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=1761549341; 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=ZR8CM/heFmx9JwK+KiVtsFGPZAb6OotDV7aFw64ZLNI=; b=I3ULteJ22QVC+r2h4JREigzPOqp0yDoQn3vRY1uaer2YZUOu7IbB7nq1mVSA2KP/HzsF8e GXeRAXrTa2AI5xfESo22+JcjeljD3Q4jwTJRnRXLnhnu+QN9ekBVIQj3LX1T3rUIOleIDu P4oprzu4KOnoOa/Y2Vphi2a4mURsgkc= 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 Subject: [PATCH v4 09/24] smb: move FILE_SYSTEM_DEVICE_INFO to common/smb1pdu.h Date: Mon, 27 Oct 2025 15:13:01 +0800 Message-ID: <20251027071316.3468472-10-chenxiaosong.chenxiaosong@linux.dev> In-Reply-To: <20251027071316.3468472-1-chenxiaosong.chenxiaosong@linux.dev> References: <20251027071316.3468472-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 Rename "struct filesystem_device_info" to "FILE_SYSTEM_DEVICE_INFO", then move duplicate definitions to common header file. Signed-off-by: ChenXiaoSong --- fs/smb/client/cifspdu.h | 5 ----- fs/smb/common/smb1pdu.h | 6 ++++++ fs/smb/server/smb2pdu.c | 4 ++-- fs/smb/server/smb_common.h | 5 ----- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/fs/smb/client/cifspdu.h b/fs/smb/client/cifspdu.h index 7c781b17f73b..731cec5ab8a9 100644 --- a/fs/smb/client/cifspdu.h +++ b/fs/smb/client/cifspdu.h @@ -1938,11 +1938,6 @@ typedef struct { #define FILE_PORTABLE_DEVICE 0x00004000 #define FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL 0x00020000 =20 -typedef struct { - __le32 DeviceType; - __le32 DeviceCharacteristics; -} __attribute__((packed)) FILE_SYSTEM_DEVICE_INFO; /* device info level 0x= 104 */ - /* minimum includes first three fields, and empty FS Name */ #define MIN_FS_ATTR_INFO_SIZE 12 =20 diff --git a/fs/smb/common/smb1pdu.h b/fs/smb/common/smb1pdu.h index 37d1eb0b1fbe..aa15825706d3 100644 --- a/fs/smb/common/smb1pdu.h +++ b/fs/smb/common/smb1pdu.h @@ -319,6 +319,12 @@ typedef struct server_negotiate_rsp { __le16 ByteCount; } __packed SERVER_NEGOTIATE_RSP; =20 +/* See MS-CIFS 2.2.8.2.5 */ +typedef struct { + __le32 DeviceType; + __le32 DeviceCharacteristics; +} __packed FILE_SYSTEM_DEVICE_INFO; /* device info level 0x104 */ + /* List of FileSystemAttributes - see 2.5.1 of MS-FSCC */ #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 d0a077730387..eea7d4c89063 100644 --- a/fs/smb/server/smb2pdu.c +++ b/fs/smb/server/smb2pdu.c @@ -5476,9 +5476,9 @@ static int smb2_get_info_filesystem(struct ksmbd_work= *work, switch (fsinfoclass) { case FS_DEVICE_INFORMATION: { - struct filesystem_device_info *info; + FILE_SYSTEM_DEVICE_INFO *info; =20 - info =3D (struct filesystem_device_info *)rsp->Buffer; + info =3D (FILE_SYSTEM_DEVICE_INFO *)rsp->Buffer; =20 info->DeviceType =3D cpu_to_le32(FILE_DEVICE_DISK); info->DeviceCharacteristics =3D diff --git a/fs/smb/server/smb_common.h b/fs/smb/server/smb_common.h index 09861be254c6..3f90f0999549 100644 --- a/fs/smb/server/smb_common.h +++ b/fs/smb/server/smb_common.h @@ -57,11 +57,6 @@ FILE_EXECUTE | FILE_DELETE_CHILD | \ FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES) =20 -struct filesystem_device_info { - __le32 DeviceType; - __le32 DeviceCharacteristics; -} __packed; /* device info level 0x104 */ - struct filesystem_vol_info { __le64 VolumeCreationTime; __le32 SerialNumber; --=20 2.43.0