smb: move FILE_SYSTEM_SIZE_INFO to common/fscc.h

Rename the following places:

  - struct filesystem_info -> FILE_SYSTEM_SIZE_INFO
  - FILE_SYSTEM_INFO -> FILE_SYSTEM_SIZE_INFO
  - FreeAllocationUnits -> AvailableAllocationUnits: consistent with MS-FSCC 2.5.8

Then move duplicate definitions to common header file.

Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/smb/client/cifspdu.h b/fs/smb/client/cifspdu.h
index 39f43105186009cd9dd100e7320f4649ba4459eb..a9a853b9011f63db6c176fa4112223689aae8226 100644 (file)
--- a/fs/smb/client/cifspdu.h
+++ b/fs/smb/client/cifspdu.h
@@ -1982,13 +1982,6 @@ struct aliasInfo92 {
        int shareNameOffset;
 } __attribute__((packed));
 
-typedef struct {
-       __le64 TotalAllocationUnits;
-       __le64 FreeAllocationUnits;
-       __le32 SectorsPerAllocationUnit;
-       __le32 BytesPerSector;
-} __attribute__((packed)) FILE_SYSTEM_INFO;    /* size info, level 0x103 */
-
 typedef struct {
        __le32 fsid;
        __le32 SectorsPerAllocationUnit;

diff --git a/fs/smb/client/cifssmb.c b/fs/smb/client/cifssmb.c
index fba439447dec36fbfdfa435fde5916a837d7a98c..428e582e0414f8d002e7631d4879ab9f9919e8e3 100644 (file)
--- a/fs/smb/client/cifssmb.c
+++ b/fs/smb/client/cifssmb.c
@@ -4746,7 +4746,7 @@ CIFSSMBQFSInfo(const unsigned int xid, struct cifs_tcon *tcon,
 /* level 0x103 SMB_QUERY_FILE_SYSTEM_INFO */
        TRANSACTION2_QFSI_REQ *pSMB = NULL;
        TRANSACTION2_QFSI_RSP *pSMBr = NULL;
-       FILE_SYSTEM_INFO *response_data;
+       FILE_SYSTEM_SIZE_INFO *response_data;
        int rc = 0;
        int bytes_returned = 0;
        __u16 params, byte_count;
@@ -4794,7 +4794,7 @@ QFSInfoRetry:
                        __u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset);
 
                        response_data =
-                           (FILE_SYSTEM_INFO
+                           (FILE_SYSTEM_SIZE_INFO
                             *) (((char *) &pSMBr->hdr.Protocol) +
                                 data_offset);
                        FSData->f_bsize =
@@ -4811,7 +4811,7 @@ QFSInfoRetry:
                        FSData->f_blocks =
                            le64_to_cpu(response_data->TotalAllocationUnits);
                        FSData->f_bfree = FSData->f_bavail =
-                           le64_to_cpu(response_data->FreeAllocationUnits);
+                           le64_to_cpu(response_data->AvailableAllocationUnits);
                        cifs_dbg(FYI, "Blocks: %lld  Free: %lld Block size %ld\n",
                                 (unsigned long long)FSData->f_blocks,
                                 (unsigned long long)FSData->f_bfree,

diff --git a/fs/smb/common/fscc.h b/fs/smb/common/fscc.h
index 6fa7c65d304b58876b2e3b63b7f42f7b57252b64..a0580a772a41818b190afbac4406006e6bcd0181 100644 (file)
--- a/fs/smb/common/fscc.h
+++ b/fs/smb/common/fscc.h
@@ -121,6 +121,14 @@ struct smb2_file_network_open_info {
 #define FILE_CASE_PRESERVED_NAMES      0x00000002
 #define FILE_CASE_SENSITIVE_SEARCH     0x00000001
 
+/* See MS-FSCC 2.5.8 */
+typedef struct {
+       __le64 TotalAllocationUnits;
+       __le64 AvailableAllocationUnits;
+       __le32 SectorsPerAllocationUnit;
+       __le32 BytesPerSector;
+} __packed FILE_SYSTEM_SIZE_INFO;      /* size info, level 0x103 */
+
 /* See MS-FSCC 2.5.10 */
 typedef struct {
        __le32 DeviceType;

diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
index 5696ac8bf5e891427bcf05ed295038034b34bad6..8facd4ca69d09f32639c3f77fd09182588efd062 100644 (file)
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -5536,11 +5536,11 @@ static int smb2_get_info_filesystem(struct ksmbd_work *work,
        }
        case FS_SIZE_INFORMATION:
        {
-               struct filesystem_info *info;
+               FILE_SYSTEM_SIZE_INFO *info;
 
-               info = (struct filesystem_info *)(rsp->Buffer);
+               info = (FILE_SYSTEM_SIZE_INFO *)(rsp->Buffer);
                info->TotalAllocationUnits = cpu_to_le64(stfs.f_blocks);
-               info->FreeAllocationUnits = cpu_to_le64(stfs.f_bfree);
+               info->AvailableAllocationUnits = cpu_to_le64(stfs.f_bfree);
                info->SectorsPerAllocationUnit = cpu_to_le32(1);
                info->BytesPerSector = cpu_to_le32(stfs.f_bsize);
                rsp->OutputBufferLength = cpu_to_le32(24);

diff --git a/fs/smb/server/smb_common.h b/fs/smb/server/smb_common.h
index c171c1e190a549d5812fb641e781f318e03b7bbf..13751a4f0888fb4f4c4a8b14f571b1c2b35541cb 100644 (file)
--- a/fs/smb/server/smb_common.h
+++ b/fs/smb/server/smb_common.h
@@ -112,13 +112,6 @@ struct filesystem_vol_info {
        __le16 VolumeLabel[];
 } __packed;
 
-struct filesystem_info {
-       __le64 TotalAllocationUnits;
-       __le64 FreeAllocationUnits;
-       __le32 SectorsPerAllocationUnit;
-       __le32 BytesPerSector;
-} __packed;     /* size info, level 0x103 */
-
 #define EXTENDED_INFO_MAGIC 0x43667364 /* Cfsd */
 #define STRING_LENGTH 28