projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[firefly-linux-kernel-4.4.55.git]
/
fs
/
nfs
/
nfs4filelayoutdev.c
diff --git
a/fs/nfs/nfs4filelayoutdev.c
b/fs/nfs/nfs4filelayoutdev.c
index ed388aae96893628dfcecb25743acac320b8a1b4..8ae91908f5aa6fa38c128348beb272ddb6226a3b 100644
(file)
--- a/
fs/nfs/nfs4filelayoutdev.c
+++ b/
fs/nfs/nfs4filelayoutdev.c
@@
-382,7
+382,7
@@
decode_ds_addr(struct xdr_stream *streamp, gfp_t gfp_flags)
{
struct nfs4_pnfs_ds_addr *da = NULL;
char *buf, *portstr;
-
u32
port;
+
__be16
port;
int nlen, rlen;
int tmp[2];
__be32 *p;