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

smb: move some duplicate struct definitions to common/fscc.h 



Modify the following places:

  - smb2_file_ntwrk_info -> smb2_file_network_open_info
  - struct filesystem_device_info -> FILE_SYSTEM_DEVICE_INFO
  - struct file_directory_info -> FILE_DIRECTORY_INFO
  - struct file_full_directory_info -> FILE_FULL_DIRECTORY_INFO
  - struct file_both_directory_info -> FILE_BOTH_DIRECTORY_INFO
  - struct file_id_full_dir_info -> FILE_ID_FULL_DIR_INFO
  - struct filesystem_posix_info -> FILE_SYSTEM_POSIX_INFO

The fields of these structures are exactly the same on both client and
server, so move duplicate definitions to common header file.

Signed-off-by: default avatarChenXiaoSong <chenxiaosong@kylinos.cn>
Acked-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 84d8d4cf

fs/smb/client/cifspdu.h

+0 −91
Original line number Diff line number Diff line
@@ -2036,28 +2036,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
@@ -2092,11 +2070,6 @@ typedef struct { 
#define FILE_PORTABLE_DEVICE			0x00004000

#define FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL 0x00020000



typedef struct {

	__le32 DeviceType;

	__le32 DeviceCharacteristics;

} __attribute__((packed)) FILE_SYSTEM_DEVICE_INFO; /* device info level 0x104 */



/* minimum includes first three fields, and empty FS Name */

#define MIN_FS_ATTR_INFO_SIZE 12
@@ -2332,70 +2305,6 @@ typedef struct { 
	};

} __attribute__((packed)) FILE_UNIX_INFO; /* level 0x202 */



typedef struct {

	__le32 NextEntryOffset;

	__u32 FileIndex;

	__le64 CreationTime;

	__le64 LastAccessTime;

	__le64 LastWriteTime;

	__le64 ChangeTime;

	__le64 EndOfFile;

	__le64 AllocationSize;

	__le32 ExtFileAttributes;

	__le32 FileNameLength;

	char FileName[];

} __attribute__((packed)) FILE_DIRECTORY_INFO;   /* level 0x101 FF resp data */



typedef struct {

	__le32 NextEntryOffset;

	__u32 FileIndex;

	__le64 CreationTime;

	__le64 LastAccessTime;

	__le64 LastWriteTime;

	__le64 ChangeTime;

	__le64 EndOfFile;

	__le64 AllocationSize;

	__le32 ExtFileAttributes;

	__le32 FileNameLength;

	__le32 EaSize; /* length of the xattrs */

	char FileName[];

} __attribute__((packed)) FILE_FULL_DIRECTORY_INFO; /* level 0x102 rsp data */



typedef struct {

	__le32 NextEntryOffset;

	__u32 FileIndex;

	__le64 CreationTime;

	__le64 LastAccessTime;

	__le64 LastWriteTime;

	__le64 ChangeTime;

	__le64 EndOfFile;

	__le64 AllocationSize;

	__le32 ExtFileAttributes;

	__le32 FileNameLength;

	__le32 EaSize; /* EA size */

	__le32 Reserved;

	__le64 UniqueId; /* inode num - le since Samba puts ino in low 32 bit*/

	char FileName[];

} __attribute__((packed)) SEARCH_ID_FULL_DIR_INFO; /* level 0x105 FF rsp data */



typedef struct {

	__le32 NextEntryOffset;

	__u32 FileIndex;

	__le64 CreationTime;

	__le64 LastAccessTime;

	__le64 LastWriteTime;

	__le64 ChangeTime;

	__le64 EndOfFile;

	__le64 AllocationSize;

	__le32 ExtFileAttributes;

	__le32 FileNameLength;

	__le32 EaSize; /* length of the xattrs */

	__u8   ShortNameLength;

	__u8   Reserved;

	__u8   ShortName[24];

	char FileName[];

} __attribute__((packed)) FILE_BOTH_DIRECTORY_INFO; /* level 0x104 FFrsp data */



typedef struct {

	__u32  ResumeKey;

	__le16 CreationDate; /* SMB Date */

fs/smb/client/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -1328,7 +1328,7 @@ static int cifs_get_fattr(struct cifs_open_info_data *data, 
			/* for easier reading */

			FILE_ALL_INFO *fi;

			FILE_DIRECTORY_INFO *fdi;

			SEARCH_ID_FULL_DIR_INFO *si;

			FILE_ID_FULL_DIR_INFO *si;



			rc = cifs_backup_query_path_info(xid, tcon, sb,

							 full_path,
@@ -1339,7 +1339,7 @@ static int cifs_get_fattr(struct cifs_open_info_data *data, 


			move_cifs_info_to_smb2(&data->fi, fi);

			fdi = (FILE_DIRECTORY_INFO *)fi;

			si = (SEARCH_ID_FULL_DIR_INFO *)fi;

			si = (FILE_ID_FULL_DIR_INFO *)fi;



			cifs_dir_info_to_fattr(fattr, fdi, cifs_sb);

			fattr->cf_uniqueid = le64_to_cpu(si->UniqueId);

fs/smb/client/readdir.c

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static void cifs_fill_dirent_full(struct cifs_dirent *de, 
}



static void cifs_fill_dirent_search(struct cifs_dirent *de,

		const SEARCH_ID_FULL_DIR_INFO *info)

		const FILE_ID_FULL_DIR_INFO *info)

{

	de->name = &info->FileName[0];

	de->namelen = le32_to_cpu(info->FileNameLength);

fs/smb/client/smb2pdu.c

+1 −1
Original line number Diff line number Diff line
@@ -5454,7 +5454,7 @@ smb2_parse_query_directory(struct cifs_tcon *tcon, 
		info_buf_size = sizeof(FILE_DIRECTORY_INFO);

		break;

	case SMB_FIND_FILE_ID_FULL_DIR_INFO:

		info_buf_size = sizeof(SEARCH_ID_FULL_DIR_INFO);

		info_buf_size = sizeof(FILE_ID_FULL_DIR_INFO);

		break;

	case SMB_FIND_FILE_POSIX_INFO:

		/* note that posix payload are variable size */

fs/smb/client/smb2pdu.h

+0 −13
Original line number Diff line number Diff line
@@ -224,19 +224,6 @@ struct smb2_file_reparse_point_info { 
	__le32 Tag;

} __packed;



struct smb2_file_network_open_info {

	struct_group_attr(network_open_info, __packed,

		__le64 CreationTime;

		__le64 LastAccessTime;

		__le64 LastWriteTime;

		__le64 ChangeTime;

		__le64 AllocationSize;

		__le64 EndOfFile;

		__le32 Attributes;

	);

	__le32 Reserved;

} __packed; /* level 34 Query also similar returned in close rsp and open rsp */



/* See MS-FSCC 2.4.21 */

struct smb2_file_id_information {

	__le64	VolumeSerialNumber;