@@ -1429,7 +1429,7 @@ typedef struct smb_com_transaction_change_notify_req {
1429
1429
__u8 WatchTree ; /* 1 = Monitor subdirectories */
1430
1430
__u8 Reserved2 ;
1431
1431
__le16 ByteCount ;
1432
- /* __u8 Pad[3];*/
1432
+ /* __u8 Pad[3];*/
1433
1433
/* __u8 Data[1];*/
1434
1434
} __attribute__((packed )) TRANSACT_CHANGE_NOTIFY_REQ ;
1435
1435
@@ -1752,8 +1752,7 @@ struct smb_com_transaction2_sfi_rsp {
1752
1752
struct smb_hdr hdr ; /* wct = 10 + SetupCount */
1753
1753
struct trans2_resp t2 ;
1754
1754
__u16 ByteCount ;
1755
- __u16 Reserved2 ; /* parameter word reserved -
1756
- present for infolevels > 100 */
1755
+ __u16 Reserved2 ; /* parameter word reserved - present for infolevels > 100 */
1757
1756
} __attribute__((packed ));
1758
1757
1759
1758
struct smb_t2_qfi_req {
@@ -1768,8 +1767,7 @@ struct smb_t2_qfi_rsp {
1768
1767
struct smb_hdr hdr ; /* wct = 10 + SetupCount */
1769
1768
struct trans2_resp t2 ;
1770
1769
__u16 ByteCount ;
1771
- __u16 Reserved2 ; /* parameter word reserved -
1772
- present for infolevels > 100 */
1770
+ __u16 Reserved2 ; /* parameter word reserved - present for infolevels > 100 */
1773
1771
} __attribute__((packed ));
1774
1772
1775
1773
/*
@@ -2146,13 +2144,11 @@ typedef struct {
2146
2144
#define CIFS_UNIX_POSIX_PATH_OPS_CAP 0x00000020 /* Allow new POSIX path based
2147
2145
calls including posix open
2148
2146
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 */
2151
2148
#define CIFS_UNIX_LARGE_WRITE_CAP 0x00000080
2152
2149
#define CIFS_UNIX_TRANSPORT_ENCRYPTION_CAP 0x00000100 /* can do SPNEGO crypt */
2153
2150
#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 */
2156
2152
#ifdef CONFIG_CIFS_POSIX
2157
2153
/* presumably don't need the 0x20 POSIX_PATH_OPS_CAP since we never send
2158
2154
LockingX instead of posix locking call on unix sess (and we do not expect
@@ -2368,8 +2364,7 @@ typedef struct {
2368
2364
2369
2365
struct file_allocation_info {
2370
2366
__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 */
2373
2368
2374
2369
struct file_end_of_file_info {
2375
2370
__le64 FileSize ; /* offset to end of file */
@@ -2409,8 +2404,7 @@ struct cifs_posix_acl { /* access conrol list (ACL) */
2409
2404
__le16 access_entry_count ; /* access ACL - count of entries */
2410
2405
__le16 default_entry_count ; /* default ACL - count of entries */
2411
2406
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[] */
2414
2408
} __attribute__((packed )); /* level 0x204 */
2415
2409
2416
2410
/* types of access control entries already defined in posix_acl.h */
@@ -2429,17 +2423,17 @@ struct cifs_posix_acl { /* access conrol list (ACL) */
2429
2423
/* end of POSIX ACL definitions */
2430
2424
2431
2425
/* 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
2443
2437
2444
2438
typedef struct {
2445
2439
__le32 OpenFlags ; /* same as NT CreateX */
@@ -2716,15 +2710,13 @@ typedef struct file_xattr_info {
2716
2710
__u32 xattr_value_len ;
2717
2711
char xattr_name [];
2718
2712
/* 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 */
2721
2714
2722
2715
/* flags for lsattr and chflags commands removed arein uapi/linux/fs.h */
2723
2716
2724
2717
typedef struct file_chattr_info {
2725
2718
__le64 mask ; /* list of all possible attribute bits */
2726
2719
__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 */
2730
2722
#endif /* _CIFSPDU_H */
0 commit comments