Re: [PATCH v4 15/24] smb: move FILE_SYSTEM_POSIX_INFO to common/smb1pdu.h

ChenXiaoSong
2025-10-31T02:32:04Z

This GitLab repository seems to be more up to date than the one on
samba.org: https://git.samba.org/?p=slow/smb3_posix_spec.git;a=shortlog

Thanks,
ChenXiaoSong.

在 2025/10/31 09:53, Steve French 写道:
> Sorry forgot to attach the link
>
> https://gitlab.com/samba-team/smb3-posix-spec
>
> On Thu, Oct 30, 2025 at 8:53 PM Steve French <smfrench@gmail.com> wrote:
>>
>> Ralph,
>> Is this link current? or do you have the link to a more current
>> version of the POSIX extensions documentation?
>>
>> On Thu, Oct 30, 2025 at 8:42 PM ChenXiaoSong
>> <chenxiaosong.chenxiaosong@linux.dev> wrote:
>>>
>>> Hi Namjae and Steve,
>>>
>>> I couldn’t find the definition of FILE_SYSTEM_POSIX_INFO in any of the
>>> following MS documents:
>>>
>>> - MS-FSCC:
>>> https://learn.microsoft.com/pdf?url=https%3A%2F%2Flearn.microsoft.com%2Fen-us%2Fopenspecs%2Fwindows_protocols%2Fms-fscc%2Ftoc.json
>>> - MS-CIFS:
>>> https://learn.microsoft.com/pdf?url=https%3A%2F%2Flearn.microsoft.com%2Fen-us%2Fopenspecs%2Fwindows_protocols%2Fms-cifs%2Ftoc.json
>>> - MS-SMB:
>>> https://learn.microsoft.com/pdf?url=https%3A%2F%2Flearn.microsoft.com%2Fen-us%2Fopenspecs%2Fwindows_protocols%2Fms-smb%2Ftoc.json
>>> - MS-SMB2:
>>> https://learn.microsoft.com/pdf?url=https%3A%2F%2Flearn.microsoft.com%2Fen-us%2Fopenspecs%2Fwindows_protocols%2Fms-smb2%2Ftoc.json
>>>
>>> Is this structure defined in other MS document?
>>>
>>> On 10/27/25 3:21 PM, chenxiaosong.chenxiaosong@linux.dev wrote:
>>>> From: ChenXiaoSong <chenxiaosong@kylinos.cn>
>>>>
>>>> Rename "struct filesystem_posix_info" to "FILE_SYSTEM_POSIX_INFO",
>>>> then move duplicate definitions to common header file.
>>>>
>>>> Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
>>>> ---
>>>> fs/smb/client/cifspdu.h | 22 ----------------------
>>>> fs/smb/common/smb1pdu.h | 23 +++++++++++++++++++++++
>>>> fs/smb/server/smb2pdu.c | 4 ++--
>>>> fs/smb/server/smb_common.h | 23 -----------------------
>>>> 4 files changed, 25 insertions(+), 47 deletions(-)
>>>>
>>>> diff --git a/fs/smb/client/cifspdu.h b/fs/smb/client/cifspdu.h
>>>> index d106c6850807..55aaae6dbc86 100644
>>>> --- a/fs/smb/client/cifspdu.h
>>>> +++ b/fs/smb/client/cifspdu.h
>>>> @@ -1875,28 +1875,6 @@ typedef struct {
>>>>
>>>> #define CIFS_POSIX_EXTENSIONS 0x00000010 /* support for new QFSInfo */
>>>>
>>>> -typedef struct {
>>>> - /* For undefined recommended transfer size return -1 in that field */
>>>> - __le32 OptimalTransferSize; /* bsize on some os, iosize on other os */
>>>> - __le32 BlockSize;
>>>> - /* The next three fields are in terms of the block size.
>>>> - (above). If block size is unknown, 4096 would be a
>>>> - reasonable block size for a server to report.
>>>> - Note that returning the blocks/blocksavail removes need
>>>> - to make a second call (to QFSInfo level 0x103 to get this info.
>>>> - UserBlockAvail is typically less than or equal to BlocksAvail,
>>>> - if no distinction is made return the same value in each */
>>>> - __le64 TotalBlocks;
>>>> - __le64 BlocksAvail; /* bfree */
>>>> - __le64 UserBlocksAvail; /* bavail */
>>>> - /* For undefined Node fields or FSID return -1 */
>>>> - __le64 TotalFileNodes;
>>>> - __le64 FreeFileNodes;
>>>> - __le64 FileSysIdentifier; /* fsid */
>>>> - /* NB Namelen comes from FILE_SYSTEM_ATTRIBUTE_INFO call */
>>>> - /* NB flags can come from FILE_SYSTEM_DEVICE_INFO call */
>>>> -} __attribute__((packed)) FILE_SYSTEM_POSIX_INFO;
>>>> -
>>>> /* DeviceType Flags */
>>>> #define FILE_DEVICE_CD_ROM 0x00000002
>>>> #define FILE_DEVICE_CD_ROM_FILE_SYSTEM 0x00000003
>>>> diff --git a/fs/smb/common/smb1pdu.h b/fs/smb/common/smb1pdu.h
>>>> index 82331a8f70e8..38b9c091baab 100644
>>>> --- a/fs/smb/common/smb1pdu.h
>>>> +++ b/fs/smb/common/smb1pdu.h
>>>> @@ -327,6 +327,29 @@ typedef struct {
>>>> __le32 BytesPerSector;
>>>> } __packed FILE_SYSTEM_INFO; /* size info, level 0x103 */
>>>>
>>>> +typedef struct {
>>>> + /* For undefined recommended transfer size return -1 in that field */
>>>> + __le32 OptimalTransferSize; /* bsize on some os, iosize on other os */
>>>> + __le32 BlockSize;
>>>> + /* The next three fields are in terms of the block size.
>>>> + * (above). If block size is unknown, 4096 would be a
>>>> + * reasonable block size for a server to report.
>>>> + * Note that returning the blocks/blocksavail removes need
>>>> + * to make a second call (to QFSInfo level 0x103 to get this info.
>>>> + * UserBlockAvail is typically less than or equal to BlocksAvail,
>>>> + * if no distinction is made return the same value in each
>>>> + */
>>>> + __le64 TotalBlocks;
>>>> + __le64 BlocksAvail; /* bfree */
>>>> + __le64 UserBlocksAvail; /* bavail */
>>>> + /* For undefined Node fields or FSID return -1 */
>>>> + __le64 TotalFileNodes;
>>>> + __le64 FreeFileNodes;
>>>> + __le64 FileSysIdentifier; /* fsid */
>>>> + /* NB Namelen comes from FILE_SYSTEM_ATTRIBUTE_INFO call */
>>>> + /* NB flags can come from FILE_SYSTEM_DEVICE_INFO call */
>>>> +} __packed FILE_SYSTEM_POSIX_INFO;
>>>> +
>>>> /* See MS-CIFS 2.2.8.2.5 */
>>>> typedef struct {
>>>> __le32 DeviceType;
>>>> diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
>>>> index 47fab72a3588..dc0f0ed4ccb6 100644
>>>> --- a/fs/smb/server/smb2pdu.c
>>>> +++ b/fs/smb/server/smb2pdu.c
>>>> @@ -5633,14 +5633,14 @@ static int smb2_get_info_filesystem(struct ksmbd_work *work,
>>>> }
>>>> case FS_POSIX_INFORMATION:
>>>> {
>>>> - struct filesystem_posix_info *info;
>>>> + FILE_SYSTEM_POSIX_INFO *info;
>>>>
>>>> if (!work->tcon->posix_extensions) {
>>>> pr_err("client doesn't negotiate with SMB3.1.1 POSIX Extensions\n");
>>>> path_put(&path);
>>>> return -EOPNOTSUPP;
>>>> } else {
>>>> - info = (struct filesystem_posix_info *)(rsp->Buffer);
>>>> + info = (FILE_SYSTEM_POSIX_INFO *)(rsp->Buffer);
>>>> info->OptimalTransferSize = cpu_to_le32(stfs.f_bsize);
>>>> info->BlockSize = cpu_to_le32(stfs.f_bsize);
>>>> info->TotalBlocks = cpu_to_le64(stfs.f_blocks);
>>>> diff --git a/fs/smb/server/smb_common.h b/fs/smb/server/smb_common.h
>>>> index 6141ca8f7e1c..61048568f4c7 100644
>>>> --- a/fs/smb/server/smb_common.h
>>>> +++ b/fs/smb/server/smb_common.h
>>>> @@ -108,29 +108,6 @@ struct file_id_both_directory_info {
>>>> char FileName[];
>>>> } __packed;
>>>>
>>>> -struct filesystem_posix_info {
>>>> - /* For undefined recommended transfer size return -1 in that field */
>>>> - __le32 OptimalTransferSize; /* bsize on some os, iosize on other os */
>>>> - __le32 BlockSize;
>>>> - /* The next three fields are in terms of the block size.
>>>> - * (above). If block size is unknown, 4096 would be a
>>>> - * reasonable block size for a server to report.
>>>> - * Note that returning the blocks/blocksavail removes need
>>>> - * to make a second call (to QFSInfo level 0x103 to get this info.
>>>> - * UserBlockAvail is typically less than or equal to BlocksAvail,
>>>> - * if no distinction is made return the same value in each
>>>> - */
>>>> - __le64 TotalBlocks;
>>>> - __le64 BlocksAvail; /* bfree */
>>>> - __le64 UserBlocksAvail; /* bavail */
>>>> - /* For undefined Node fields or FSID return -1 */
>>>> - __le64 TotalFileNodes;
>>>> - __le64 FreeFileNodes;
>>>> - __le64 FileSysIdentifier; /* fsid */
>>>> - /* NB Namelen comes from FILE_SYSTEM_ATTRIBUTE_INFO call */
>>>> - /* NB flags can come from FILE_SYSTEM_DEVICE_INFO call */
>>>> -} __packed;
>>>> -
>>>> struct smb_version_ops {
>>>> u16 (*get_cmd_val)(struct ksmbd_work *swork);
>>>> int (*init_rsp_hdr)(struct ksmbd_work *swork);
>>>
>>
>>
>> --
>> Thanks,
>>
>> Steve
>
>
>