diff options
author | Jeff Layton <jlayton@redhat.com> | 2011-05-04 08:05:26 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2011-05-19 14:10:53 +0000 |
commit | 820a803ffac3ef591e597bc107f8e289a823a29c (patch) | |
tree | 246451259a7efc5027647de639a69cb121b889e0 /fs/cifs/netmisc.c | |
parent | 0e6e37a7a81f370d9aafafdf88aca13977f6fb5f (diff) | |
download | linux-820a803ffac3ef591e597bc107f8e289a823a29c.tar.gz linux-820a803ffac3ef591e597bc107f8e289a823a29c.tar.bz2 linux-820a803ffac3ef591e597bc107f8e289a823a29c.zip |
cifs: keep BCC in little-endian format
This is the same patch as originally posted, just with some merge
conflicts fixed up...
Currently, the ByteCount is usually converted to host-endian on receive.
This is confusing however, as we need to keep two sets of routines for
accessing it, and keep track of when to use each routine. Munging
received packets like this also limits when the signature can be
calulated.
Simplify the code by keeping the received ByteCount in little-endian
format. This allows us to eliminate a set of routines for accessing it
and we can now drop the *_le suffixes from the accessor functions since
that's now implied.
While we're at it, switch all of the places that read the ByteCount
directly to use the get_bcc inline which should also clean up some
unaligned accesses.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/netmisc.c')
-rw-r--r-- | fs/cifs/netmisc.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c index 79f641eeda30..79b71c2c7c9d 100644 --- a/fs/cifs/netmisc.c +++ b/fs/cifs/netmisc.c @@ -919,13 +919,6 @@ smbCalcSize(struct smb_hdr *ptr) 2 /* size of the bcc field */ + get_bcc(ptr)); } -unsigned int -smbCalcSize_LE(struct smb_hdr *ptr) -{ - return (sizeof(struct smb_hdr) + (2 * ptr->WordCount) + - 2 /* size of the bcc field */ + get_bcc_le(ptr)); -} - /* The following are taken from fs/ntfs/util.c */ #define NTFS_TIME_OFFSET ((u64)(369*365 + 89) * 24 * 3600 * 10000000) |