diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-12 15:24:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-12 15:24:42 -0700 |
| commit | 6faf9a54156fb4d01d73344cc90cb52dda074433 (patch) | |
| tree | 5b7e904314ea3d62ab79b04d6af63e6ac0ef8dee /fs/cifs/cache.c | |
| parent | d77d9597ad8f2bd381a5168005a21e82df6f18eb (diff) | |
| parent | ca83ce3d5b9ad321ee24f5870a77f0b21ac5a5de (diff) | |
| download | kernel_replicant_linux-6faf9a54156fb4d01d73344cc90cb52dda074433.tar.gz kernel_replicant_linux-6faf9a54156fb4d01d73344cc90cb52dda074433.tar.bz2 kernel_replicant_linux-6faf9a54156fb4d01d73344cc90cb52dda074433.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: don't allow mmap'ed pages to be dirtied while under writeback (try #3)
[CIFS] Warn on requesting default security (ntlm) on mount
[CIFS] cifs: clarify the meaning of tcpStatus == CifsGood
cifs: wrap received signature check in srv_mutex
cifs: clean up various nits in unicode routines (try #2)
cifs: clean up length checks in check2ndT2
cifs: set ra_pages in backing_dev_info
cifs: fix broken BCC check in is_valid_oplock_break
cifs: always do is_path_accessible check in cifs_mount
various endian fixes to cifs
Elminate sparse __CHECK_ENDIAN__ warnings on port conversion
Max share size is too small
Allow user names longer than 32 bytes
cifs: replace /proc/fs/cifs/Experimental with a module parm
cifs: check for private_data before trying to put it
Diffstat (limited to 'fs/cifs/cache.c')
| -rw-r--r-- | fs/cifs/cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cache.c b/fs/cifs/cache.c index e654dfd092c3..53d57a3fe427 100644 --- a/fs/cifs/cache.c +++ b/fs/cifs/cache.c @@ -50,7 +50,7 @@ void cifs_fscache_unregister(void) */ struct cifs_server_key { uint16_t family; /* address family */ - uint16_t port; /* IP port */ + __be16 port; /* IP port */ union { struct in_addr ipv4_addr; struct in6_addr ipv6_addr; |