Skip to content

Commit 2b6abb8

Browse files
ChenXiaoSongsmfrench
ChenXiaoSong
authored and
smfrench
committed
smb: move File Attributes definitions into common/fscc.h
These definitions are specified in MS-FSCC 2.6, so move them into fscc.h. Modify the following places: - FILE_ATTRIBUTE__MASK -> FILE_ATTRIBUTE_MASK - Update FILE_ATTRIBUTE_MASK value - cpu_to_le32(constant) -> cpu_to_le32(MACRO DEFINITION) Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent c975033 commit 2b6abb8

2 files changed

Lines changed: 45 additions & 35 deletions

File tree

‎fs/smb/common/fscc.h‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,51 @@ typedef struct {
144144
__le32 DeviceCharacteristics;
145145
} __packed FILE_SYSTEM_DEVICE_INFO; /* device info level 0x104 */
146146

147+
/*
148+
* File Attributes
149+
* See MS-FSCC 2.6
150+
*/
151+
#define FILE_ATTRIBUTE_READONLY 0x00000001
152+
#define FILE_ATTRIBUTE_HIDDEN 0x00000002
153+
#define FILE_ATTRIBUTE_SYSTEM 0x00000004
154+
#define FILE_ATTRIBUTE_DIRECTORY 0x00000010
155+
#define FILE_ATTRIBUTE_ARCHIVE 0x00000020
156+
#define FILE_ATTRIBUTE_NORMAL 0x00000080
157+
#define FILE_ATTRIBUTE_TEMPORARY 0x00000100
158+
#define FILE_ATTRIBUTE_SPARSE_FILE 0x00000200
159+
#define FILE_ATTRIBUTE_REPARSE_POINT 0x00000400
160+
#define FILE_ATTRIBUTE_COMPRESSED 0x00000800
161+
#define FILE_ATTRIBUTE_OFFLINE 0x00001000
162+
#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED 0x00002000
163+
#define FILE_ATTRIBUTE_ENCRYPTED 0x00004000
164+
#define FILE_ATTRIBUTE_INTEGRITY_STREAM 0x00008000
165+
#define FILE_ATTRIBUTE_NO_SCRUB_DATA 0x00020000
166+
#define FILE_ATTRIBUTE_MASK (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | \
167+
FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_DIRECTORY | \
168+
FILE_ATTRIBUTE_ARCHIVE | FILE_ATTRIBUTE_NORMAL | \
169+
FILE_ATTRIBUTE_TEMPORARY | FILE_ATTRIBUTE_SPARSE_FILE | \
170+
FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_COMPRESSED | \
171+
FILE_ATTRIBUTE_OFFLINE | FILE_ATTRIBUTE_NOT_CONTENT_INDEXED | \
172+
FILE_ATTRIBUTE_ENCRYPTED | FILE_ATTRIBUTE_INTEGRITY_STREAM | \
173+
FILE_ATTRIBUTE_NO_SCRUB_DATA)
174+
175+
#define FILE_ATTRIBUTE_READONLY_LE cpu_to_le32(FILE_ATTRIBUTE_READONLY)
176+
#define FILE_ATTRIBUTE_HIDDEN_LE cpu_to_le32(FILE_ATTRIBUTE_HIDDEN)
177+
#define FILE_ATTRIBUTE_SYSTEM_LE cpu_to_le32(FILE_ATTRIBUTE_SYSTEM)
178+
#define FILE_ATTRIBUTE_DIRECTORY_LE cpu_to_le32(FILE_ATTRIBUTE_DIRECTORY)
179+
#define FILE_ATTRIBUTE_ARCHIVE_LE cpu_to_le32(FILE_ATTRIBUTE_ARCHIVE)
180+
#define FILE_ATTRIBUTE_NORMAL_LE cpu_to_le32(FILE_ATTRIBUTE_NORMAL)
181+
#define FILE_ATTRIBUTE_TEMPORARY_LE cpu_to_le32(FILE_ATTRIBUTE_TEMPORARY)
182+
#define FILE_ATTRIBUTE_SPARSE_FILE_LE cpu_to_le32(FILE_ATTRIBUTE_SPARSE_FILE)
183+
#define FILE_ATTRIBUTE_REPARSE_POINT_LE cpu_to_le32(FILE_ATTRIBUTE_REPARSE_POINT)
184+
#define FILE_ATTRIBUTE_COMPRESSED_LE cpu_to_le32(FILE_ATTRIBUTE_COMPRESSED)
185+
#define FILE_ATTRIBUTE_OFFLINE_LE cpu_to_le32(FILE_ATTRIBUTE_OFFLINE)
186+
#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED_LE cpu_to_le32(FILE_ATTRIBUTE_NOT_CONTENT_INDEXED)
187+
#define FILE_ATTRIBUTE_ENCRYPTED_LE cpu_to_le32(FILE_ATTRIBUTE_ENCRYPTED)
188+
#define FILE_ATTRIBUTE_INTEGRITY_STREAM_LE cpu_to_le32(FILE_ATTRIBUTE_INTEGRITY_STREAM)
189+
#define FILE_ATTRIBUTE_NO_SCRUB_DATA_LE cpu_to_le32(FILE_ATTRIBUTE_NO_SCRUB_DATA)
190+
#define FILE_ATTRIBUTE_MASK_LE cpu_to_le32(FILE_ATTRIBUTE_MASK)
191+
147192
/*
148193
* Response contains array of the following structures
149194
* See MS-FSCC 2.7.1

‎fs/smb/common/smb2pdu.h‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,41 +1072,6 @@ struct smb2_server_client_notification {
10721072
#define IL_IMPERSONATION cpu_to_le32(0x00000002)
10731073
#define IL_DELEGATE cpu_to_le32(0x00000003)
10741074

1075-
/* File Attributes */
1076-
#define FILE_ATTRIBUTE_READONLY 0x00000001
1077-
#define FILE_ATTRIBUTE_HIDDEN 0x00000002
1078-
#define FILE_ATTRIBUTE_SYSTEM 0x00000004
1079-
#define FILE_ATTRIBUTE_DIRECTORY 0x00000010
1080-
#define FILE_ATTRIBUTE_ARCHIVE 0x00000020
1081-
#define FILE_ATTRIBUTE_NORMAL 0x00000080
1082-
#define FILE_ATTRIBUTE_TEMPORARY 0x00000100
1083-
#define FILE_ATTRIBUTE_SPARSE_FILE 0x00000200
1084-
#define FILE_ATTRIBUTE_REPARSE_POINT 0x00000400
1085-
#define FILE_ATTRIBUTE_COMPRESSED 0x00000800
1086-
#define FILE_ATTRIBUTE_OFFLINE 0x00001000
1087-
#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED 0x00002000
1088-
#define FILE_ATTRIBUTE_ENCRYPTED 0x00004000
1089-
#define FILE_ATTRIBUTE_INTEGRITY_STREAM 0x00008000
1090-
#define FILE_ATTRIBUTE_NO_SCRUB_DATA 0x00020000
1091-
#define FILE_ATTRIBUTE__MASK 0x00007FB7
1092-
1093-
#define FILE_ATTRIBUTE_READONLY_LE cpu_to_le32(0x00000001)
1094-
#define FILE_ATTRIBUTE_HIDDEN_LE cpu_to_le32(0x00000002)
1095-
#define FILE_ATTRIBUTE_SYSTEM_LE cpu_to_le32(0x00000004)
1096-
#define FILE_ATTRIBUTE_DIRECTORY_LE cpu_to_le32(0x00000010)
1097-
#define FILE_ATTRIBUTE_ARCHIVE_LE cpu_to_le32(0x00000020)
1098-
#define FILE_ATTRIBUTE_NORMAL_LE cpu_to_le32(0x00000080)
1099-
#define FILE_ATTRIBUTE_TEMPORARY_LE cpu_to_le32(0x00000100)
1100-
#define FILE_ATTRIBUTE_SPARSE_FILE_LE cpu_to_le32(0x00000200)
1101-
#define FILE_ATTRIBUTE_REPARSE_POINT_LE cpu_to_le32(0x00000400)
1102-
#define FILE_ATTRIBUTE_COMPRESSED_LE cpu_to_le32(0x00000800)
1103-
#define FILE_ATTRIBUTE_OFFLINE_LE cpu_to_le32(0x00001000)
1104-
#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED_LE cpu_to_le32(0x00002000)
1105-
#define FILE_ATTRIBUTE_ENCRYPTED_LE cpu_to_le32(0x00004000)
1106-
#define FILE_ATTRIBUTE_INTEGRITY_STREAM_LE cpu_to_le32(0x00008000)
1107-
#define FILE_ATTRIBUTE_NO_SCRUB_DATA_LE cpu_to_le32(0x00020000)
1108-
#define FILE_ATTRIBUTE_MASK_LE cpu_to_le32(0x00007FB7)
1109-
11101075
/* Desired Access Flags */
11111076
#define FILE_READ_DATA_LE cpu_to_le32(0x00000001)
11121077
#define FILE_LIST_DIRECTORY_LE cpu_to_le32(0x00000001)

0 commit comments

Comments
 (0)