xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'nfsv4_xdr_cleanups-for-2.6.32' into nfs-for-2.6.32

Browse Source 
Conflicts:
	fs/nfs/nfs4xdr.c
This commit is contained in:
Trond Myklebust
2009-08-19 18:21:52 -04:00
parent f884dcaead cccddf4f55
commit 6a396f67d2
158 changed files with 3602 additions and 1461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/linux/sunrpc/xdr.h
View File

@@ -117,17 +117,15 @@ static inline __be32 *xdr_encode_array(__be32 *p, const void *s, unsigned int le
static inline __be32 *
xdr_encode_hyper(__be32 *p, __u64 val)
{
*p++ = htonl(val >> 32);
*p++ = htonl(val & 0xFFFFFFFF);
return p;
*(__be64 *)p = cpu_to_be64(val);
return p + 2;
}
static inline __be32 *
xdr_decode_hyper(__be32 *p, __u64 *valp)
{
*valp = ((__u64) ntohl(*p++)) << 32;
*valp |= ntohl(*p++);
return p;
*valp = be64_to_cpup((__be64 *)p);
return p + 2;
}
/*