Skip to content

L
linux
Commit 131a21c2 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files
Options

[PATCH] xdr annotations: NFSv2 server 

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarTrond Myklebust <trond.myklebust@fys.uio.no>
Acked-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ad451d38
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 71 deletions
fs/nfsd/nfs2acl.c
View file @ 131a21c2
...@@ -158,7 +158,7 @@ static __be32 nfsacld_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessarg ...@@ -158,7 +158,7 @@ static __be32 nfsacld_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessarg
/* /*
* XDR decode functions * XDR decode functions
*/ */
static int nfsaclsvc_decode_getaclargs(struct svc_rqst *rqstp, u32 *p, static int nfsaclsvc_decode_getaclargs(struct svc_rqst *rqstp, __be32 *p,
struct nfsd3_getaclargs *argp) struct nfsd3_getaclargs *argp)
{ {
if (!(p = nfs2svc_decode_fh(p, &argp->fh))) if (!(p = nfs2svc_decode_fh(p, &argp->fh)))
...@@ -169,7 +169,7 @@ static int nfsaclsvc_decode_getaclargs(struct svc_rqst *rqstp, u32 *p, ...@@ -169,7 +169,7 @@ static int nfsaclsvc_decode_getaclargs(struct svc_rqst *rqstp, u32 *p,
} }
static int nfsaclsvc_decode_setaclargs(struct svc_rqst *rqstp, u32 *p, static int nfsaclsvc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p,
struct nfsd3_setaclargs *argp) struct nfsd3_setaclargs *argp)
{ {
struct kvec *head = rqstp->rq_arg.head; struct kvec *head = rqstp->rq_arg.head;
...@@ -194,7 +194,7 @@ static int nfsaclsvc_decode_setaclargs(struct svc_rqst *rqstp, u32 *p, ...@@ -194,7 +194,7 @@ static int nfsaclsvc_decode_setaclargs(struct svc_rqst *rqstp, u32 *p,
return (n > 0); return (n > 0);
} }
static int nfsaclsvc_decode_fhandleargs(struct svc_rqst *rqstp, u32 *p, static int nfsaclsvc_decode_fhandleargs(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_fhandle *argp) struct nfsd_fhandle *argp)
{ {
if (!(p = nfs2svc_decode_fh(p, &argp->fh))) if (!(p = nfs2svc_decode_fh(p, &argp->fh)))
...@@ -202,7 +202,7 @@ static int nfsaclsvc_decode_fhandleargs(struct svc_rqst *rqstp, u32 *p, ...@@ -202,7 +202,7 @@ static int nfsaclsvc_decode_fhandleargs(struct svc_rqst *rqstp, u32 *p,
return xdr_argsize_check(rqstp, p); return xdr_argsize_check(rqstp, p);
} }
static int nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, u32 *p, static int nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, __be32 *p,
struct nfsd3_accessargs *argp) struct nfsd3_accessargs *argp)
{ {
if (!(p = nfs2svc_decode_fh(p, &argp->fh))) if (!(p = nfs2svc_decode_fh(p, &argp->fh)))
...@@ -217,7 +217,7 @@ static int nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, u32 *p, ...@@ -217,7 +217,7 @@ static int nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, u32 *p,
*/ */
/* GETACL */ /* GETACL */
static int nfsaclsvc_encode_getaclres(struct svc_rqst *rqstp, u32 *p, static int nfsaclsvc_encode_getaclres(struct svc_rqst *rqstp, __be32 *p,
struct nfsd3_getaclres *resp) struct nfsd3_getaclres *resp)
{ {
struct dentry *dentry = resp->fh.fh_dentry; struct dentry *dentry = resp->fh.fh_dentry;
...@@ -259,7 +259,7 @@ static int nfsaclsvc_encode_getaclres(struct svc_rqst *rqstp, u32 *p, ...@@ -259,7 +259,7 @@ static int nfsaclsvc_encode_getaclres(struct svc_rqst *rqstp, u32 *p,
return 1; return 1;
} }
static int nfsaclsvc_encode_attrstatres(struct svc_rqst *rqstp, u32 *p, static int nfsaclsvc_encode_attrstatres(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_attrstat *resp) struct nfsd_attrstat *resp)
{ {
p = nfs2svc_encode_fattr(rqstp, p, &resp->fh); p = nfs2svc_encode_fattr(rqstp, p, &resp->fh);
...@@ -267,7 +267,7 @@ static int nfsaclsvc_encode_attrstatres(struct svc_rqst *rqstp, u32 *p, ...@@ -267,7 +267,7 @@ static int nfsaclsvc_encode_attrstatres(struct svc_rqst *rqstp, u32 *p,
} }
/* ACCESS */ /* ACCESS */
static int nfsaclsvc_encode_accessres(struct svc_rqst *rqstp, u32 *p, static int nfsaclsvc_encode_accessres(struct svc_rqst *rqstp, __be32 *p,
struct nfsd3_accessres *resp) struct nfsd3_accessres *resp)
{ {
p = nfs2svc_encode_fattr(rqstp, p, &resp->fh); p = nfs2svc_encode_fattr(rqstp, p, &resp->fh);
...@@ -278,7 +278,7 @@ static int nfsaclsvc_encode_accessres(struct svc_rqst *rqstp, u32 *p, ...@@ -278,7 +278,7 @@ static int nfsaclsvc_encode_accessres(struct svc_rqst *rqstp, u32 *p,
/* /*
* XDR release functions * XDR release functions
*/ */
static int nfsaclsvc_release_getacl(struct svc_rqst *rqstp, u32 *p, static int nfsaclsvc_release_getacl(struct svc_rqst *rqstp, __be32 *p,
struct nfsd3_getaclres *resp) struct nfsd3_getaclres *resp)
{ {
fh_put(&resp->fh); fh_put(&resp->fh);
...@@ -287,7 +287,7 @@ static int nfsaclsvc_release_getacl(struct svc_rqst *rqstp, u32 *p, ...@@ -287,7 +287,7 @@ static int nfsaclsvc_release_getacl(struct svc_rqst *rqstp, u32 *p,
return 1; return 1;
} }
static int nfsaclsvc_release_fhandle(struct svc_rqst *rqstp, u32 *p, static int nfsaclsvc_release_fhandle(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_fhandle *resp) struct nfsd_fhandle *resp)
{ {
fh_put(&resp->fh); fh_put(&resp->fh);
......
fs/nfsd/nfsxdr.c
View file @ 131a21c2
...@@ -37,8 +37,8 @@ static u32 nfs_ftypes[] = { ...@@ -37,8 +37,8 @@ static u32 nfs_ftypes[] = {
/* /*
* XDR functions for basic NFS types * XDR functions for basic NFS types
*/ */
static u32 * static __be32 *
decode_fh(u32 *p, struct svc_fh *fhp) decode_fh(__be32 *p, struct svc_fh *fhp)
{ {
fh_init(fhp, NFS_FHSIZE); fh_init(fhp, NFS_FHSIZE);
memcpy(&fhp->fh_handle.fh_base, p, NFS_FHSIZE); memcpy(&fhp->fh_handle.fh_base, p, NFS_FHSIZE);
...@@ -50,13 +50,13 @@ decode_fh(u32 *p, struct svc_fh *fhp) ...@@ -50,13 +50,13 @@ decode_fh(u32 *p, struct svc_fh *fhp)
} }
/* Helper function for NFSv2 ACL code */ /* Helper function for NFSv2 ACL code */
u32 *nfs2svc_decode_fh(u32 *p, struct svc_fh *fhp) __be32 *nfs2svc_decode_fh(__be32 *p, struct svc_fh *fhp)
{ {
return decode_fh(p, fhp); return decode_fh(p, fhp);
} }
static inline u32 * static inline __be32 *
encode_fh(u32 *p, struct svc_fh *fhp) encode_fh(__be32 *p, struct svc_fh *fhp)
{ {
memcpy(p, &fhp->fh_handle.fh_base, NFS_FHSIZE); memcpy(p, &fhp->fh_handle.fh_base, NFS_FHSIZE);
return p + (NFS_FHSIZE>> 2); return p + (NFS_FHSIZE>> 2);
...@@ -66,8 +66,8 @@ encode_fh(u32 *p, struct svc_fh *fhp) ...@@ -66,8 +66,8 @@ encode_fh(u32 *p, struct svc_fh *fhp)
* Decode a file name and make sure that the path contains * Decode a file name and make sure that the path contains
* no slashes or null bytes. * no slashes or null bytes.
*/ */
static inline u32 * static inline __be32 *
decode_filename(u32 *p, char **namp, int *lenp) decode_filename(__be32 *p, char **namp, int *lenp)
{ {
char *name; char *name;
int i; int i;
...@@ -82,8 +82,8 @@ decode_filename(u32 *p, char **namp, int *lenp) ...@@ -82,8 +82,8 @@ decode_filename(u32 *p, char **namp, int *lenp)
return p; return p;
} }
static inline u32 * static inline __be32 *
decode_pathname(u32 *p, char **namp, int *lenp) decode_pathname(__be32 *p, char **namp, int *lenp)
{ {
char *name; char *name;
int i; int i;
...@@ -98,8 +98,8 @@ decode_pathname(u32 *p, char **namp, int *lenp) ...@@ -98,8 +98,8 @@ decode_pathname(u32 *p, char **namp, int *lenp)
return p; return p;
} }
static inline u32 * static inline __be32 *
decode_sattr(u32 *p, struct iattr *iap) decode_sattr(__be32 *p, struct iattr *iap)
{ {
u32 tmp, tmp1; u32 tmp, tmp1;
...@@ -151,8 +151,8 @@ decode_sattr(u32 *p, struct iattr *iap) ...@@ -151,8 +151,8 @@ decode_sattr(u32 *p, struct iattr *iap)
return p; return p;
} }
static u32 * static __be32 *
encode_fattr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp, encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp,
struct kstat *stat) struct kstat *stat)
{ {
struct dentry *dentry = fhp->fh_dentry; struct dentry *dentry = fhp->fh_dentry;
...@@ -195,7 +195,7 @@ encode_fattr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp, ...@@ -195,7 +195,7 @@ encode_fattr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp,
} }
/* Helper function for NFSv2 ACL code */ /* Helper function for NFSv2 ACL code */
u32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) __be32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp)
{ {
struct kstat stat; struct kstat stat;
vfs_getattr(fhp->fh_export->ex_mnt, fhp->fh_dentry, &stat); vfs_getattr(fhp->fh_export->ex_mnt, fhp->fh_dentry, &stat);
...@@ -206,13 +206,13 @@ u32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) ...@@ -206,13 +206,13 @@ u32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp)
* XDR decode functions * XDR decode functions
*/ */
int int
nfssvc_decode_void(struct svc_rqst *rqstp, u32 *p, void *dummy) nfssvc_decode_void(struct svc_rqst *rqstp, __be32 *p, void *dummy)
{ {
return xdr_argsize_check(rqstp, p); return xdr_argsize_check(rqstp, p);
} }
int int
nfssvc_decode_fhandle(struct svc_rqst *rqstp, u32 *p, struct nfsd_fhandle *args) nfssvc_decode_fhandle(struct svc_rqst *rqstp, __be32 *p, struct nfsd_fhandle *args)
{ {
if (!(p = decode_fh(p, &args->fh))) if (!(p = decode_fh(p, &args->fh)))
return 0; return 0;
...@@ -220,7 +220,7 @@ nfssvc_decode_fhandle(struct svc_rqst *rqstp, u32 *p, struct nfsd_fhandle *args) ...@@ -220,7 +220,7 @@ nfssvc_decode_fhandle(struct svc_rqst *rqstp, u32 *p, struct nfsd_fhandle *args)
} }
int int
nfssvc_decode_sattrargs(struct svc_rqst *rqstp, u32 *p, nfssvc_decode_sattrargs(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_sattrargs *args) struct nfsd_sattrargs *args)
{ {
if (!(p = decode_fh(p, &args->fh)) if (!(p = decode_fh(p, &args->fh))
...@@ -231,7 +231,7 @@ nfssvc_decode_sattrargs(struct svc_rqst *rqstp, u32 *p, ...@@ -231,7 +231,7 @@ nfssvc_decode_sattrargs(struct svc_rqst *rqstp, u32 *p,
} }
int int
nfssvc_decode_diropargs(struct svc_rqst *rqstp, u32 *p, nfssvc_decode_diropargs(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_diropargs *args) struct nfsd_diropargs *args)
{ {
if (!(p = decode_fh(p, &args->fh)) if (!(p = decode_fh(p, &args->fh))
...@@ -242,7 +242,7 @@ nfssvc_decode_diropargs(struct svc_rqst *rqstp, u32 *p, ...@@ -242,7 +242,7 @@ nfssvc_decode_diropargs(struct svc_rqst *rqstp, u32 *p,
} }
int int
nfssvc_decode_readargs(struct svc_rqst *rqstp, u32 *p, nfssvc_decode_readargs(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_readargs *args) struct nfsd_readargs *args)
{ {
unsigned int len; unsigned int len;
...@@ -273,7 +273,7 @@ nfssvc_decode_readargs(struct svc_rqst *rqstp, u32 *p, ...@@ -273,7 +273,7 @@ nfssvc_decode_readargs(struct svc_rqst *rqstp, u32 *p,
} }
int int
nfssvc_decode_writeargs(struct svc_rqst *rqstp, u32 *p, nfssvc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_writeargs *args) struct nfsd_writeargs *args)
{ {
unsigned int len; unsigned int len;
...@@ -303,7 +303,7 @@ nfssvc_decode_writeargs(struct svc_rqst *rqstp, u32 *p, ...@@ -303,7 +303,7 @@ nfssvc_decode_writeargs(struct svc_rqst *rqstp, u32 *p,
} }
int int
nfssvc_decode_createargs(struct svc_rqst *rqstp, u32 *p, nfssvc_decode_createargs(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_createargs *args) struct nfsd_createargs *args)
{ {
if (!(p = decode_fh(p, &args->fh)) if (!(p = decode_fh(p, &args->fh))
...@@ -315,7 +315,7 @@ nfssvc_decode_createargs(struct svc_rqst *rqstp, u32 *p, ...@@ -315,7 +315,7 @@ nfssvc_decode_createargs(struct svc_rqst *rqstp, u32 *p,
} }
int int
nfssvc_decode_renameargs(struct svc_rqst *rqstp, u32 *p, nfssvc_decode_renameargs(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_renameargs *args) struct nfsd_renameargs *args)
{ {
if (!(p = decode_fh(p, &args->ffh)) if (!(p = decode_fh(p, &args->ffh))
...@@ -328,7 +328,7 @@ nfssvc_decode_renameargs(struct svc_rqst *rqstp, u32 *p, ...@@ -328,7 +328,7 @@ nfssvc_decode_renameargs(struct svc_rqst *rqstp, u32 *p,
} }
int int
nfssvc_decode_readlinkargs(struct svc_rqst *rqstp, u32 *p, struct nfsd_readlinkargs *args) nfssvc_decode_readlinkargs(struct svc_rqst *rqstp, __be32 *p, struct nfsd_readlinkargs *args)
{ {
if (!(p = decode_fh(p, &args->fh))) if (!(p = decode_fh(p, &args->fh)))
return 0; return 0;
...@@ -338,7 +338,7 @@ nfssvc_decode_readlinkargs(struct svc_rqst *rqstp, u32 *p, struct nfsd_readlinka ...@@ -338,7 +338,7 @@ nfssvc_decode_readlinkargs(struct svc_rqst *rqstp, u32 *p, struct nfsd_readlinka
} }
int int
nfssvc_decode_linkargs(struct svc_rqst *rqstp, u32 *p, nfssvc_decode_linkargs(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_linkargs *args) struct nfsd_linkargs *args)
{ {
if (!(p = decode_fh(p, &args->ffh)) if (!(p = decode_fh(p, &args->ffh))
...@@ -350,7 +350,7 @@ nfssvc_decode_linkargs(struct svc_rqst *rqstp, u32 *p, ...@@ -350,7 +350,7 @@ nfssvc_decode_linkargs(struct svc_rqst *rqstp, u32 *p,
} }
int int
nfssvc_decode_symlinkargs(struct svc_rqst *rqstp, u32 *p, nfssvc_decode_symlinkargs(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_symlinkargs *args) struct nfsd_symlinkargs *args)
{ {
if (!(p = decode_fh(p, &args->ffh)) if (!(p = decode_fh(p, &args->ffh))
...@@ -363,7 +363,7 @@ nfssvc_decode_symlinkargs(struct svc_rqst *rqstp, u32 *p, ...@@ -363,7 +363,7 @@ nfssvc_decode_symlinkargs(struct svc_rqst *rqstp, u32 *p,
} }
int int
nfssvc_decode_readdirargs(struct svc_rqst *rqstp, u32 *p, nfssvc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_readdirargs *args) struct nfsd_readdirargs *args)
{ {
if (!(p = decode_fh(p, &args->fh))) if (!(p = decode_fh(p, &args->fh)))
...@@ -382,13 +382,13 @@ nfssvc_decode_readdirargs(struct svc_rqst *rqstp, u32 *p, ...@@ -382,13 +382,13 @@ nfssvc_decode_readdirargs(struct svc_rqst *rqstp, u32 *p,
* XDR encode functions * XDR encode functions
*/ */
int int
nfssvc_encode_void(struct svc_rqst *rqstp, u32 *p, void *dummy) nfssvc_encode_void(struct svc_rqst *rqstp, __be32 *p, void *dummy)
{ {
return xdr_ressize_check(rqstp, p); return xdr_ressize_check(rqstp, p);
} }
int int
nfssvc_encode_attrstat(struct svc_rqst *rqstp, u32 *p, nfssvc_encode_attrstat(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_attrstat *resp) struct nfsd_attrstat *resp)
{ {
p = encode_fattr(rqstp, p, &resp->fh, &resp->stat); p = encode_fattr(rqstp, p, &resp->fh, &resp->stat);
...@@ -396,7 +396,7 @@ nfssvc_encode_attrstat(struct svc_rqst *rqstp, u32 *p, ...@@ -396,7 +396,7 @@ nfssvc_encode_attrstat(struct svc_rqst *rqstp, u32 *p,
} }
int int
nfssvc_encode_diropres(struct svc_rqst *rqstp, u32 *p, nfssvc_encode_diropres(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_diropres *resp) struct nfsd_diropres *resp)
{ {
p = encode_fh(p, &resp->fh); p = encode_fh(p, &resp->fh);
...@@ -405,7 +405,7 @@ nfssvc_encode_diropres(struct svc_rqst *rqstp, u32 *p, ...@@ -405,7 +405,7 @@ nfssvc_encode_diropres(struct svc_rqst *rqstp, u32 *p,
} }
int int
nfssvc_encode_readlinkres(struct svc_rqst *rqstp, u32 *p, nfssvc_encode_readlinkres(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_readlinkres *resp) struct nfsd_readlinkres *resp)
{ {
*p++ = htonl(resp->len); *p++ = htonl(resp->len);
...@@ -421,7 +421,7 @@ nfssvc_encode_readlinkres(struct svc_rqst *rqstp, u32 *p, ...@@ -421,7 +421,7 @@ nfssvc_encode_readlinkres(struct svc_rqst *rqstp, u32 *p,
} }
int int
nfssvc_encode_readres(struct svc_rqst *rqstp, u32 *p, nfssvc_encode_readres(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_readres *resp) struct nfsd_readres *resp)
{ {
p = encode_fattr(rqstp, p, &resp->fh, &resp->stat); p = encode_fattr(rqstp, p, &resp->fh, &resp->stat);
...@@ -440,7 +440,7 @@ nfssvc_encode_readres(struct svc_rqst *rqstp, u32 *p, ...@@ -440,7 +440,7 @@ nfssvc_encode_readres(struct svc_rqst *rqstp, u32 *p,
} }
int int
nfssvc_encode_readdirres(struct svc_rqst *rqstp, u32 *p, nfssvc_encode_readdirres(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_readdirres *resp) struct nfsd_readdirres *resp)
{ {
xdr_ressize_check(rqstp, p); xdr_ressize_check(rqstp, p);
...@@ -453,7 +453,7 @@ nfssvc_encode_readdirres(struct svc_rqst *rqstp, u32 *p, ...@@ -453,7 +453,7 @@ nfssvc_encode_readdirres(struct svc_rqst *rqstp, u32 *p,
} }
int int
nfssvc_encode_statfsres(struct svc_rqst *rqstp, u32 *p, nfssvc_encode_statfsres(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_statfsres *resp) struct nfsd_statfsres *resp)
{ {
struct kstatfs *stat = &resp->stats; struct kstatfs *stat = &resp->stats;
...@@ -471,7 +471,7 @@ nfssvc_encode_entry(struct readdir_cd *ccd, const char *name, ...@@ -471,7 +471,7 @@ nfssvc_encode_entry(struct readdir_cd *ccd, const char *name,
int namlen, loff_t offset, ino_t ino, unsigned int d_type) int namlen, loff_t offset, ino_t ino, unsigned int d_type)
{ {
struct nfsd_readdirres *cd = container_of(ccd, struct nfsd_readdirres, common); struct nfsd_readdirres *cd = container_of(ccd, struct nfsd_readdirres, common);
u32 *p = cd->buffer; __be32 *p = cd->buffer;
int buflen, slen; int buflen, slen;
/* /*
...@@ -497,7 +497,7 @@ nfssvc_encode_entry(struct readdir_cd *ccd, const char *name, ...@@ -497,7 +497,7 @@ nfssvc_encode_entry(struct readdir_cd *ccd, const char *name,
*p++ = htonl((u32) ino); /* file id */ *p++ = htonl((u32) ino); /* file id */
p = xdr_encode_array(p, name, namlen);/* name length & name */ p = xdr_encode_array(p, name, namlen);/* name length & name */
cd->offset = p; /* remember pointer */ cd->offset = p; /* remember pointer */
*p++ = ~(u32) 0; /* offset of next entry */ *p++ = htonl(~0U); /* offset of next entry */
cd->buflen = buflen; cd->buflen = buflen;
cd->buffer = p; cd->buffer = p;
...@@ -509,7 +509,7 @@ nfssvc_encode_entry(struct readdir_cd *ccd, const char *name, ...@@ -509,7 +509,7 @@ nfssvc_encode_entry(struct readdir_cd *ccd, const char *name,
* XDR release functions * XDR release functions
*/ */
int int
nfssvc_release_fhandle(struct svc_rqst *rqstp, u32 *p, nfssvc_release_fhandle(struct svc_rqst *rqstp, __be32 *p,
struct nfsd_fhandle *resp) struct nfsd_fhandle *resp)
{ {
fh_put(&resp->fh); fh_put(&resp->fh);
......
include/linux/nfsd/nfsd.h
View file @ 131a21c2
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
* Callback function for readdir * Callback function for readdir
*/ */
struct readdir_cd { struct readdir_cd {
int err; /* 0, nfserr, or nfserr_eof */ __be32 err; /* 0, nfserr, or nfserr_eof */
}; };
typedef int (*encode_dent_fn)(struct readdir_cd *, const char *, typedef int (*encode_dent_fn)(struct readdir_cd *, const char *,
int, loff_t, ino_t, unsigned int); int, loff_t, ino_t, unsigned int);
......
include/linux/nfsd/xdr.h
View file @ 131a21c2
...@@ -81,7 +81,7 @@ struct nfsd_readdirargs { ...@@ -81,7 +81,7 @@ struct nfsd_readdirargs {
struct svc_fh fh; struct svc_fh fh;
__u32 cookie; __u32 cookie;
__u32 count; __u32 count;
u32 * buffer; __be32 * buffer;
}; };
struct nfsd_attrstat { struct nfsd_attrstat {
...@@ -108,9 +108,9 @@ struct nfsd_readdirres { ...@@ -108,9 +108,9 @@ struct nfsd_readdirres {
int count; int count;
struct readdir_cd common; struct readdir_cd common;
u32 * buffer; __be32 * buffer;
int buflen; int buflen;
u32 * offset; __be32 * offset;
}; };
struct nfsd_statfsres { struct nfsd_statfsres {
...@@ -135,43 +135,43 @@ union nfsd_xdrstore { ...@@ -135,43 +135,43 @@ union nfsd_xdrstore {
#define NFS2_SVC_XDRSIZE sizeof(union nfsd_xdrstore) #define NFS2_SVC_XDRSIZE sizeof(union nfsd_xdrstore)
int nfssvc_decode_void(struct svc_rqst *, u32 *, void *); int nfssvc_decode_void(struct svc_rqst *, __be32 *, void *);
int nfssvc_decode_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *); int nfssvc_decode_fhandle(struct svc_rqst *, __be32 *, struct nfsd_fhandle *);
int nfssvc_decode_sattrargs(struct svc_rqst *, u32 *, int nfssvc_decode_sattrargs(struct svc_rqst *, __be32 *,
struct nfsd_sattrargs *); struct nfsd_sattrargs *);
int nfssvc_decode_diropargs(struct svc_rqst *, u32 *, int nfssvc_decode_diropargs(struct svc_rqst *, __be32 *,
struct nfsd_diropargs *); struct nfsd_diropargs *);
int nfssvc_decode_readargs(struct svc_rqst *, u32 *, int nfssvc_decode_readargs(struct svc_rqst *, __be32 *,
struct nfsd_readargs *); struct nfsd_readargs *);
int nfssvc_decode_writeargs(struct svc_rqst *, u32 *, int nfssvc_decode_writeargs(struct svc_rqst *, __be32 *,
struct nfsd_writeargs *); struct nfsd_writeargs *);
int nfssvc_decode_createargs(struct svc_rqst *, u32 *, int nfssvc_decode_createargs(struct svc_rqst *, __be32 *,
struct nfsd_createargs *); struct nfsd_createargs *);
int nfssvc_decode_renameargs(struct svc_rqst *, u32 *, int nfssvc_decode_renameargs(struct svc_rqst *, __be32 *,
struct nfsd_renameargs *); struct nfsd_renameargs *);
int nfssvc_decode_readlinkargs(struct svc_rqst *, u32 *, int nfssvc_decode_readlinkargs(struct svc_rqst *, __be32 *,
struct nfsd_readlinkargs *); struct nfsd_readlinkargs *);
int nfssvc_decode_linkargs(struct svc_rqst *, u32 *, int nfssvc_decode_linkargs(struct svc_rqst *, __be32 *,
struct nfsd_linkargs *); struct nfsd_linkargs *);
int nfssvc_decode_symlinkargs(struct svc_rqst *, u32 *, int nfssvc_decode_symlinkargs(struct svc_rqst *, __be32 *,
struct nfsd_symlinkargs *); struct nfsd_symlinkargs *);
int nfssvc_decode_readdirargs(struct svc_rqst *, u32 *, int nfssvc_decode_readdirargs(struct svc_rqst *, __be32 *,
struct nfsd_readdirargs *); struct nfsd_readdirargs *);
int nfssvc_encode_void(struct svc_rqst *, u32 *, void *); int nfssvc_encode_void(struct svc_rqst *, __be32 *, void *);
int nfssvc_encode_attrstat(struct svc_rqst *, u32 *, struct nfsd_attrstat *); int nfssvc_encode_attrstat(struct svc_rqst *, __be32 *, struct nfsd_attrstat *);
int nfssvc_encode_diropres(struct svc_rqst *, u32 *, struct nfsd_diropres *); int nfssvc_encode_diropres(struct svc_rqst *, __be32 *, struct nfsd_diropres *);
int nfssvc_encode_readlinkres(struct svc_rqst *, u32 *, struct nfsd_readlinkres *); int nfssvc_encode_readlinkres(struct svc_rqst *, __be32 *, struct nfsd_readlinkres *);
int nfssvc_encode_readres(struct svc_rqst *, u32 *, struct nfsd_readres *); int nfssvc_encode_readres(struct svc_rqst *, __be32 *, struct nfsd_readres *);
int nfssvc_encode_statfsres(struct svc_rqst *, u32 *, struct nfsd_statfsres *); int nfssvc_encode_statfsres(struct svc_rqst *, __be32 *, struct nfsd_statfsres *);
int nfssvc_encode_readdirres(struct svc_rqst *, u32 *, struct nfsd_readdirres *); int nfssvc_encode_readdirres(struct svc_rqst *, __be32 *, struct nfsd_readdirres *);
int nfssvc_encode_entry(struct readdir_cd *, const char *name, int nfssvc_encode_entry(struct readdir_cd *, const char *name,
int namlen, loff_t offset, ino_t ino, unsigned int); int namlen, loff_t offset, ino_t ino, unsigned int);
int nfssvc_release_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *); int nfssvc_release_fhandle(struct svc_rqst *, __be32 *, struct nfsd_fhandle *);
/* Helper functions for NFSv2 ACL code */ /* Helper functions for NFSv2 ACL code */
u32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp); __be32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp);
u32 *nfs2svc_decode_fh(u32 *p, struct svc_fh *fhp); __be32 *nfs2svc_decode_fh(__be32 *p, struct svc_fh *fhp);
#endif /* LINUX_NFSD_H */ #endif /* LINUX_NFSD_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7