@@ -1429,7 +1429,7 @@ typedef struct smb_com_transaction_change_notify_req {
14291429 __u8 WatchTree ; /* 1 = Monitor subdirectories */
14301430 __u8 Reserved2 ;
14311431 __le16 ByteCount ;
1432- /* __u8 Pad[3];*/
1432+ /* __u8 Pad[3];*/
14331433/* __u8 Data[1];*/
14341434} __attribute__((packed )) TRANSACT_CHANGE_NOTIFY_REQ ;
14351435
@@ -1752,8 +1752,7 @@ struct smb_com_transaction2_sfi_rsp {
17521752 struct smb_hdr hdr ; /* wct = 10 + SetupCount */
17531753 struct trans2_resp t2 ;
17541754 __u16 ByteCount ;
1755- __u16 Reserved2 ; /* parameter word reserved -
1756- present for infolevels > 100 */
1755+ __u16 Reserved2 ; /* parameter word reserved - present for infolevels > 100 */
17571756} __attribute__((packed ));
17581757
17591758struct smb_t2_qfi_req {
@@ -1768,8 +1767,7 @@ struct smb_t2_qfi_rsp {
17681767 struct smb_hdr hdr ; /* wct = 10 + SetupCount */
17691768 struct trans2_resp t2 ;
17701769 __u16 ByteCount ;
1771- __u16 Reserved2 ; /* parameter word reserved -
1772- present for infolevels > 100 */
1770+ __u16 Reserved2 ; /* parameter word reserved - present for infolevels > 100 */
17731771} __attribute__((packed ));
17741772
17751773/*
@@ -2146,13 +2144,11 @@ typedef struct {
21462144#define CIFS_UNIX_POSIX_PATH_OPS_CAP 0x00000020 /* Allow new POSIX path based
21472145 calls including posix open
21482146 and posix unlink */
2149- #define CIFS_UNIX_LARGE_READ_CAP 0x00000040 /* support reads >128K (up
2150- to 0xFFFF00 */
2147+ #define CIFS_UNIX_LARGE_READ_CAP 0x00000040 /* support reads >128K (up to 0xFFFF00 */
21512148#define CIFS_UNIX_LARGE_WRITE_CAP 0x00000080
21522149#define CIFS_UNIX_TRANSPORT_ENCRYPTION_CAP 0x00000100 /* can do SPNEGO crypt */
21532150#define CIFS_UNIX_TRANSPORT_ENCRYPTION_MANDATORY_CAP 0x00000200 /* must do */
2154- #define CIFS_UNIX_PROXY_CAP 0x00000400 /* Proxy cap: 0xACE ioctl and
2155- QFS PROXY call */
2151+ #define CIFS_UNIX_PROXY_CAP 0x00000400 /* Proxy cap: 0xACE ioctl and QFS PROXY call */
21562152#ifdef CONFIG_CIFS_POSIX
21572153/* presumably don't need the 0x20 POSIX_PATH_OPS_CAP since we never send
21582154 LockingX instead of posix locking call on unix sess (and we do not expect
@@ -2368,8 +2364,7 @@ typedef struct {
23682364
23692365struct file_allocation_info {
23702366 __le64 AllocationSize ; /* Note old Samba srvr rounds this up too much */
2371- } __attribute__((packed )); /* size used on disk, for level 0x103 for set,
2372- 0x105 for query */
2367+ } __packed ; /* size used on disk, for level 0x103 for set, 0x105 for query */
23732368
23742369struct file_end_of_file_info {
23752370 __le64 FileSize ; /* offset to end of file */
@@ -2409,8 +2404,7 @@ struct cifs_posix_acl { /* access conrol list (ACL) */
24092404 __le16 access_entry_count ; /* access ACL - count of entries */
24102405 __le16 default_entry_count ; /* default ACL - count of entries */
24112406 struct cifs_posix_ace ace_array [];
2412- /* followed by
2413- struct cifs_posix_ace default_ace_arraay[] */
2407+ /* followed by struct cifs_posix_ace default_ace_array[] */
24142408} __attribute__((packed )); /* level 0x204 */
24152409
24162410/* types of access control entries already defined in posix_acl.h */
@@ -2429,17 +2423,17 @@ struct cifs_posix_acl { /* access conrol list (ACL) */
24292423/* end of POSIX ACL definitions */
24302424
24312425/* POSIX Open Flags */
2432- #define SMB_O_RDONLY 0x1
2433- #define SMB_O_WRONLY 0x2
2434- #define SMB_O_RDWR 0x4
2435- #define SMB_O_CREAT 0x10
2436- #define SMB_O_EXCL 0x20
2437- #define SMB_O_TRUNC 0x40
2438- #define SMB_O_APPEND 0x80
2439- #define SMB_O_SYNC 0x100
2440- #define SMB_O_DIRECTORY 0x200
2441- #define SMB_O_NOFOLLOW 0x400
2442- #define SMB_O_DIRECT 0x800
2426+ #define SMB_O_RDONLY 0x1
2427+ #define SMB_O_WRONLY 0x2
2428+ #define SMB_O_RDWR 0x4
2429+ #define SMB_O_CREAT 0x10
2430+ #define SMB_O_EXCL 0x20
2431+ #define SMB_O_TRUNC 0x40
2432+ #define SMB_O_APPEND 0x80
2433+ #define SMB_O_SYNC 0x100
2434+ #define SMB_O_DIRECTORY 0x200
2435+ #define SMB_O_NOFOLLOW 0x400
2436+ #define SMB_O_DIRECT 0x800
24432437
24442438typedef struct {
24452439 __le32 OpenFlags ; /* same as NT CreateX */
@@ -2716,15 +2710,13 @@ typedef struct file_xattr_info {
27162710 __u32 xattr_value_len ;
27172711 char xattr_name [];
27182712 /* followed by xattr_value[xattr_value_len], no pad */
2719- } __attribute__((packed )) FILE_XATTR_INFO ; /* extended attribute info
2720- level 0x205 */
2713+ } __packed FILE_XATTR_INFO ; /* extended attribute info level 0x205 */
27212714
27222715/* flags for lsattr and chflags commands removed arein uapi/linux/fs.h */
27232716
27242717typedef struct file_chattr_info {
27252718 __le64 mask ; /* list of all possible attribute bits */
27262719 __le64 mode ; /* list of actual attribute bits on this inode */
2727- } __attribute__((packed )) FILE_CHATTR_INFO ; /* ext attributes
2728- (chattr, chflags) level 0x206 */
2729- #endif /* POSIX */
2720+ } __packed FILE_CHATTR_INFO ; /* ext attributes (chattr, chflags) level 0x206 */
2721+ #endif /* POSIX */
27302722#endif /* _CIFSPDU_H */
0 commit comments