diff options
| author | Steve French <smfrench@gmail.com> | 2011-10-19 21:22:41 -0500 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2011-10-19 21:22:41 -0500 |
| commit | fbcae3ea169189ee49dc6820478cb1d069b80a08 (patch) | |
| tree | 5e5b35c3bc9c11082697c4190ff96c6a4291ef16 /fs/cifs/cifspdu.h | |
| parent | 71c424bac5679200e272357a225639da8bf94068 (diff) | |
| parent | f06ac72e929115f2772c29727152ba0832d641e4 (diff) | |
Merge branch 'cifs-3.2' of git://git.samba.org/jlayton/linux into temp-3.2-jeff
Diffstat (limited to 'fs/cifs/cifspdu.h')
| -rw-r--r-- | fs/cifs/cifspdu.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h index de3aa285de0..3c6ef34fe2b 100644 --- a/fs/cifs/cifspdu.h +++ b/fs/cifs/cifspdu.h @@ -1089,9 +1089,7 @@ typedef struct smb_com_read_rsp { __le16 DataLengthHigh; __u64 Reserved2; __u16 ByteCount; - __u8 Pad; /* BB check for whether padded to DWORD - boundary and optimum performance here */ - char Data[1]; + /* read response data immediately follows */ } __attribute__((packed)) READ_RSP; typedef struct locking_andx_range { |