Commit 9544597b authored by Steve French's avatar Steve French

cifs: fix various whitespace errors in headers

Fix some extra spaces and a few comments that were unnecessarily split over
two lines. These were some trivial issues pointed out by checkpatch)
Reviewed-by: default avatarPaulo Alcantara (SUSE) <pc@cjr.nz>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent c19204cb
...@@ -1429,7 +1429,7 @@ typedef struct smb_com_transaction_change_notify_req { ...@@ -1429,7 +1429,7 @@ typedef struct smb_com_transaction_change_notify_req {
__u8 WatchTree; /* 1 = Monitor subdirectories */ __u8 WatchTree; /* 1 = Monitor subdirectories */
__u8 Reserved2; __u8 Reserved2;
__le16 ByteCount; __le16 ByteCount;
/* __u8 Pad[3];*/ /* __u8 Pad[3];*/
/* __u8 Data[1];*/ /* __u8 Data[1];*/
} __attribute__((packed)) TRANSACT_CHANGE_NOTIFY_REQ; } __attribute__((packed)) TRANSACT_CHANGE_NOTIFY_REQ;
...@@ -1752,8 +1752,7 @@ struct smb_com_transaction2_sfi_rsp { ...@@ -1752,8 +1752,7 @@ struct smb_com_transaction2_sfi_rsp {
struct smb_hdr hdr; /* wct = 10 + SetupCount */ struct smb_hdr hdr; /* wct = 10 + SetupCount */
struct trans2_resp t2; struct trans2_resp t2;
__u16 ByteCount; __u16 ByteCount;
__u16 Reserved2; /* parameter word reserved - __u16 Reserved2; /* parameter word reserved - present for infolevels > 100 */
present for infolevels > 100 */
} __attribute__((packed)); } __attribute__((packed));
struct smb_t2_qfi_req { struct smb_t2_qfi_req {
...@@ -1768,8 +1767,7 @@ struct smb_t2_qfi_rsp { ...@@ -1768,8 +1767,7 @@ struct smb_t2_qfi_rsp {
struct smb_hdr hdr; /* wct = 10 + SetupCount */ struct smb_hdr hdr; /* wct = 10 + SetupCount */
struct trans2_resp t2; struct trans2_resp t2;
__u16 ByteCount; __u16 ByteCount;
__u16 Reserved2; /* parameter word reserved - __u16 Reserved2; /* parameter word reserved - present for infolevels > 100 */
present for infolevels > 100 */
} __attribute__((packed)); } __attribute__((packed));
/* /*
...@@ -2146,13 +2144,11 @@ typedef struct { ...@@ -2146,13 +2144,11 @@ typedef struct {
#define CIFS_UNIX_POSIX_PATH_OPS_CAP 0x00000020 /* Allow new POSIX path based #define CIFS_UNIX_POSIX_PATH_OPS_CAP 0x00000020 /* Allow new POSIX path based
calls including posix open calls including posix open
and posix unlink */ and posix unlink */
#define CIFS_UNIX_LARGE_READ_CAP 0x00000040 /* support reads >128K (up #define CIFS_UNIX_LARGE_READ_CAP 0x00000040 /* support reads >128K (up to 0xFFFF00 */
to 0xFFFF00 */
#define CIFS_UNIX_LARGE_WRITE_CAP 0x00000080 #define CIFS_UNIX_LARGE_WRITE_CAP 0x00000080
#define CIFS_UNIX_TRANSPORT_ENCRYPTION_CAP 0x00000100 /* can do SPNEGO crypt */ #define CIFS_UNIX_TRANSPORT_ENCRYPTION_CAP 0x00000100 /* can do SPNEGO crypt */
#define CIFS_UNIX_TRANSPORT_ENCRYPTION_MANDATORY_CAP 0x00000200 /* must do */ #define CIFS_UNIX_TRANSPORT_ENCRYPTION_MANDATORY_CAP 0x00000200 /* must do */
#define CIFS_UNIX_PROXY_CAP 0x00000400 /* Proxy cap: 0xACE ioctl and #define CIFS_UNIX_PROXY_CAP 0x00000400 /* Proxy cap: 0xACE ioctl and QFS PROXY call */
QFS PROXY call */
#ifdef CONFIG_CIFS_POSIX #ifdef CONFIG_CIFS_POSIX
/* presumably don't need the 0x20 POSIX_PATH_OPS_CAP since we never send /* presumably don't need the 0x20 POSIX_PATH_OPS_CAP since we never send
LockingX instead of posix locking call on unix sess (and we do not expect LockingX instead of posix locking call on unix sess (and we do not expect
...@@ -2368,8 +2364,7 @@ typedef struct { ...@@ -2368,8 +2364,7 @@ typedef struct {
struct file_allocation_info { struct file_allocation_info {
__le64 AllocationSize; /* Note old Samba srvr rounds this up too much */ __le64 AllocationSize; /* Note old Samba srvr rounds this up too much */
} __attribute__((packed)); /* size used on disk, for level 0x103 for set, } __packed; /* size used on disk, for level 0x103 for set, 0x105 for query */
0x105 for query */
struct file_end_of_file_info { struct file_end_of_file_info {
__le64 FileSize; /* offset to end of file */ __le64 FileSize; /* offset to end of file */
...@@ -2409,8 +2404,7 @@ struct cifs_posix_acl { /* access conrol list (ACL) */ ...@@ -2409,8 +2404,7 @@ struct cifs_posix_acl { /* access conrol list (ACL) */
__le16 access_entry_count; /* access ACL - count of entries */ __le16 access_entry_count; /* access ACL - count of entries */
__le16 default_entry_count; /* default ACL - count of entries */ __le16 default_entry_count; /* default ACL - count of entries */
struct cifs_posix_ace ace_array[]; struct cifs_posix_ace ace_array[];
/* followed by /* followed by struct cifs_posix_ace default_ace_array[] */
struct cifs_posix_ace default_ace_arraay[] */
} __attribute__((packed)); /* level 0x204 */ } __attribute__((packed)); /* level 0x204 */
/* types of access control entries already defined in posix_acl.h */ /* types of access control entries already defined in posix_acl.h */
...@@ -2429,17 +2423,17 @@ struct cifs_posix_acl { /* access conrol list (ACL) */ ...@@ -2429,17 +2423,17 @@ struct cifs_posix_acl { /* access conrol list (ACL) */
/* end of POSIX ACL definitions */ /* end of POSIX ACL definitions */
/* POSIX Open Flags */ /* POSIX Open Flags */
#define SMB_O_RDONLY 0x1 #define SMB_O_RDONLY 0x1
#define SMB_O_WRONLY 0x2 #define SMB_O_WRONLY 0x2
#define SMB_O_RDWR 0x4 #define SMB_O_RDWR 0x4
#define SMB_O_CREAT 0x10 #define SMB_O_CREAT 0x10
#define SMB_O_EXCL 0x20 #define SMB_O_EXCL 0x20
#define SMB_O_TRUNC 0x40 #define SMB_O_TRUNC 0x40
#define SMB_O_APPEND 0x80 #define SMB_O_APPEND 0x80
#define SMB_O_SYNC 0x100 #define SMB_O_SYNC 0x100
#define SMB_O_DIRECTORY 0x200 #define SMB_O_DIRECTORY 0x200
#define SMB_O_NOFOLLOW 0x400 #define SMB_O_NOFOLLOW 0x400
#define SMB_O_DIRECT 0x800 #define SMB_O_DIRECT 0x800
typedef struct { typedef struct {
__le32 OpenFlags; /* same as NT CreateX */ __le32 OpenFlags; /* same as NT CreateX */
...@@ -2716,15 +2710,13 @@ typedef struct file_xattr_info { ...@@ -2716,15 +2710,13 @@ typedef struct file_xattr_info {
__u32 xattr_value_len; __u32 xattr_value_len;
char xattr_name[]; char xattr_name[];
/* followed by xattr_value[xattr_value_len], no pad */ /* followed by xattr_value[xattr_value_len], no pad */
} __attribute__((packed)) FILE_XATTR_INFO; /* extended attribute info } __packed FILE_XATTR_INFO; /* extended attribute info level 0x205 */
level 0x205 */
/* flags for lsattr and chflags commands removed arein uapi/linux/fs.h */ /* flags for lsattr and chflags commands removed arein uapi/linux/fs.h */
typedef struct file_chattr_info { typedef struct file_chattr_info {
__le64 mask; /* list of all possible attribute bits */ __le64 mask; /* list of all possible attribute bits */
__le64 mode; /* list of actual attribute bits on this inode */ __le64 mode; /* list of actual attribute bits on this inode */
} __attribute__((packed)) FILE_CHATTR_INFO; /* ext attributes } __packed FILE_CHATTR_INFO; /* ext attributes (chattr, chflags) level 0x206 */
(chattr, chflags) level 0x206 */ #endif /* POSIX */
#endif /* POSIX */
#endif /* _CIFSPDU_H */ #endif /* _CIFSPDU_H */
...@@ -124,7 +124,7 @@ extern int SendReceive2(const unsigned int /* xid */ , struct cifs_ses *, ...@@ -124,7 +124,7 @@ extern int SendReceive2(const unsigned int /* xid */ , struct cifs_ses *,
struct kvec * /* resp vec */); struct kvec * /* resp vec */);
extern int SendReceiveBlockingLock(const unsigned int xid, extern int SendReceiveBlockingLock(const unsigned int xid,
struct cifs_tcon *ptcon, struct cifs_tcon *ptcon,
struct smb_hdr *in_buf , struct smb_hdr *in_buf,
struct smb_hdr *out_buf, struct smb_hdr *out_buf,
int *bytes_returned); int *bytes_returned);
void void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment