Commit 2b6abb89 authored by ChenXiaoSong's avatar ChenXiaoSong Committed by Steve French
Browse files

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: default avatarChenXiaoSong <chenxiaosong@kylinos.cn>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent c9750332

fs/smb/common/fscc.h

+45 −0
Original line number Diff line number Diff line
@@ -144,6 +144,51 @@ typedef struct { 
	__le32 DeviceCharacteristics;

} __packed FILE_SYSTEM_DEVICE_INFO; /* device info level 0x104 */



/*

 * File Attributes

 * See MS-FSCC 2.6

 */

#define FILE_ATTRIBUTE_READONLY			0x00000001

#define FILE_ATTRIBUTE_HIDDEN			0x00000002

#define FILE_ATTRIBUTE_SYSTEM			0x00000004

#define FILE_ATTRIBUTE_DIRECTORY		0x00000010

#define FILE_ATTRIBUTE_ARCHIVE			0x00000020

#define FILE_ATTRIBUTE_NORMAL			0x00000080

#define FILE_ATTRIBUTE_TEMPORARY		0x00000100

#define FILE_ATTRIBUTE_SPARSE_FILE		0x00000200

#define FILE_ATTRIBUTE_REPARSE_POINT		0x00000400

#define FILE_ATTRIBUTE_COMPRESSED		0x00000800

#define FILE_ATTRIBUTE_OFFLINE			0x00001000

#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED	0x00002000

#define FILE_ATTRIBUTE_ENCRYPTED		0x00004000

#define FILE_ATTRIBUTE_INTEGRITY_STREAM		0x00008000

#define FILE_ATTRIBUTE_NO_SCRUB_DATA		0x00020000

#define FILE_ATTRIBUTE_MASK (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | \

		FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_DIRECTORY | \

		FILE_ATTRIBUTE_ARCHIVE | FILE_ATTRIBUTE_NORMAL | \

		FILE_ATTRIBUTE_TEMPORARY | FILE_ATTRIBUTE_SPARSE_FILE | \

		FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_COMPRESSED | \

		FILE_ATTRIBUTE_OFFLINE | FILE_ATTRIBUTE_NOT_CONTENT_INDEXED | \

		FILE_ATTRIBUTE_ENCRYPTED | FILE_ATTRIBUTE_INTEGRITY_STREAM | \

		FILE_ATTRIBUTE_NO_SCRUB_DATA)



#define FILE_ATTRIBUTE_READONLY_LE		cpu_to_le32(FILE_ATTRIBUTE_READONLY)

#define FILE_ATTRIBUTE_HIDDEN_LE		cpu_to_le32(FILE_ATTRIBUTE_HIDDEN)

#define FILE_ATTRIBUTE_SYSTEM_LE		cpu_to_le32(FILE_ATTRIBUTE_SYSTEM)

#define FILE_ATTRIBUTE_DIRECTORY_LE		cpu_to_le32(FILE_ATTRIBUTE_DIRECTORY)

#define FILE_ATTRIBUTE_ARCHIVE_LE		cpu_to_le32(FILE_ATTRIBUTE_ARCHIVE)

#define FILE_ATTRIBUTE_NORMAL_LE		cpu_to_le32(FILE_ATTRIBUTE_NORMAL)

#define FILE_ATTRIBUTE_TEMPORARY_LE		cpu_to_le32(FILE_ATTRIBUTE_TEMPORARY)

#define FILE_ATTRIBUTE_SPARSE_FILE_LE		cpu_to_le32(FILE_ATTRIBUTE_SPARSE_FILE)

#define FILE_ATTRIBUTE_REPARSE_POINT_LE		cpu_to_le32(FILE_ATTRIBUTE_REPARSE_POINT)

#define FILE_ATTRIBUTE_COMPRESSED_LE		cpu_to_le32(FILE_ATTRIBUTE_COMPRESSED)

#define FILE_ATTRIBUTE_OFFLINE_LE		cpu_to_le32(FILE_ATTRIBUTE_OFFLINE)

#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED_LE	cpu_to_le32(FILE_ATTRIBUTE_NOT_CONTENT_INDEXED)

#define FILE_ATTRIBUTE_ENCRYPTED_LE		cpu_to_le32(FILE_ATTRIBUTE_ENCRYPTED)

#define FILE_ATTRIBUTE_INTEGRITY_STREAM_LE	cpu_to_le32(FILE_ATTRIBUTE_INTEGRITY_STREAM)

#define FILE_ATTRIBUTE_NO_SCRUB_DATA_LE		cpu_to_le32(FILE_ATTRIBUTE_NO_SCRUB_DATA)

#define FILE_ATTRIBUTE_MASK_LE			cpu_to_le32(FILE_ATTRIBUTE_MASK)



/*

 * Response contains array of the following structures

 * See MS-FSCC 2.7.1

fs/smb/common/smb2pdu.h

+0 −35
Original line number Diff line number Diff line
@@ -1072,41 +1072,6 @@ struct smb2_server_client_notification { 
#define IL_IMPERSONATION	cpu_to_le32(0x00000002)

#define IL_DELEGATE		cpu_to_le32(0x00000003)



/* File Attributes */

#define FILE_ATTRIBUTE_READONLY			0x00000001

#define FILE_ATTRIBUTE_HIDDEN			0x00000002

#define FILE_ATTRIBUTE_SYSTEM			0x00000004

#define FILE_ATTRIBUTE_DIRECTORY		0x00000010

#define FILE_ATTRIBUTE_ARCHIVE			0x00000020

#define FILE_ATTRIBUTE_NORMAL			0x00000080

#define FILE_ATTRIBUTE_TEMPORARY		0x00000100

#define FILE_ATTRIBUTE_SPARSE_FILE		0x00000200

#define FILE_ATTRIBUTE_REPARSE_POINT		0x00000400

#define FILE_ATTRIBUTE_COMPRESSED		0x00000800

#define FILE_ATTRIBUTE_OFFLINE			0x00001000

#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED	0x00002000

#define FILE_ATTRIBUTE_ENCRYPTED		0x00004000

#define FILE_ATTRIBUTE_INTEGRITY_STREAM		0x00008000

#define FILE_ATTRIBUTE_NO_SCRUB_DATA		0x00020000

#define FILE_ATTRIBUTE__MASK			0x00007FB7



#define FILE_ATTRIBUTE_READONLY_LE              cpu_to_le32(0x00000001)

#define FILE_ATTRIBUTE_HIDDEN_LE		cpu_to_le32(0x00000002)

#define FILE_ATTRIBUTE_SYSTEM_LE		cpu_to_le32(0x00000004)

#define FILE_ATTRIBUTE_DIRECTORY_LE		cpu_to_le32(0x00000010)

#define FILE_ATTRIBUTE_ARCHIVE_LE		cpu_to_le32(0x00000020)

#define FILE_ATTRIBUTE_NORMAL_LE		cpu_to_le32(0x00000080)

#define FILE_ATTRIBUTE_TEMPORARY_LE		cpu_to_le32(0x00000100)

#define FILE_ATTRIBUTE_SPARSE_FILE_LE		cpu_to_le32(0x00000200)

#define FILE_ATTRIBUTE_REPARSE_POINT_LE		cpu_to_le32(0x00000400)

#define FILE_ATTRIBUTE_COMPRESSED_LE		cpu_to_le32(0x00000800)

#define FILE_ATTRIBUTE_OFFLINE_LE		cpu_to_le32(0x00001000)

#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED_LE	cpu_to_le32(0x00002000)

#define FILE_ATTRIBUTE_ENCRYPTED_LE		cpu_to_le32(0x00004000)

#define FILE_ATTRIBUTE_INTEGRITY_STREAM_LE	cpu_to_le32(0x00008000)

#define FILE_ATTRIBUTE_NO_SCRUB_DATA_LE		cpu_to_le32(0x00020000)

#define FILE_ATTRIBUTE_MASK_LE			cpu_to_le32(0x00007FB7)



/* Desired Access Flags */

#define FILE_READ_DATA_LE		cpu_to_le32(0x00000001)

#define FILE_LIST_DIRECTORY_LE		cpu_to_le32(0x00000001)