Merge branch 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab...

[cascardo/linux.git] / fs / nfs / nfs4filelayoutdev.c

diff --git a/fs/nfs/nfs4filelayoutdev.c b/fs/nfs/nfs4filelayoutdev.c
index ed388aa..8ae9190 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;