iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfsd4: tweak nfsd4_encode_getattr to take xdr_stream

Browse Source 
Just change the nfsd4_encode_getattr api.  Not changing any code or
adding any new functionality yet.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields
2013-08-26 16:04:46 -04:00
parent 4aea24b2ff
commit d518465866
3 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfsd/nfs4proc.c
View File

@ -1061,10 +1061,10 @@ _nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
return nfserr_jukebox; return nfserr_jukebox;
p = buf; p = buf;
status = nfsd4_encode_fattr(&cstate->current_fh, status = nfsd4_encode_fattr_to_buf(&p, count, &cstate->current_fh,
cstate->current_fh.fh_export, cstate->current_fh.fh_export,
cstate->current_fh.fh_dentry, &p, cstate->current_fh.fh_dentry,
count, verify->ve_bmval, verify->ve_bmval,
rqstp, 0); rqstp, 0);
/* /*
* If nfsd4_encode_fattr() ran out of space, assume that's because * If nfsd4_encode_fattr() ran out of space, assume that's because

47
fs/nfsd/nfs4xdr.c
View File

@ -2045,12 +2045,11 @@ static int get_parent_attributes(struct svc_export *exp, struct kstat *stat)
/* /*
* Note: @fhp can be NULL; in this case, we might have to compose the filehandle * Note: @fhp can be NULL; in this case, we might have to compose the filehandle
* ourselves. * ourselves.
*
* countp is the buffer size in _words_
*/ */
__be32 __be32
nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
struct dentry *dentry, __be32 **buffer, int count, u32 *bmval, struct svc_export *exp,
struct dentry *dentry, u32 *bmval,
struct svc_rqst *rqstp, int ignore_crossmnt) struct svc_rqst *rqstp, int ignore_crossmnt)
{ {
u32 bmval0 = bmval[0]; u32 bmval0 = bmval[0];
@ -2059,12 +2058,12 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
struct kstat stat; struct kstat stat;
struct svc_fh *tempfh = NULL; struct svc_fh *tempfh = NULL;
struct kstatfs statfs; struct kstatfs statfs;
int buflen = count << 2; __be32 *p = xdr->p;
int buflen = xdr->buf->buflen;
__be32 *attrlenp; __be32 *attrlenp;
u32 dummy; u32 dummy;
u64 dummy64; u64 dummy64;
u32 rdattr_err = 0; u32 rdattr_err = 0;
__be32 *p = *buffer;
__be32 status; __be32 status;
int err; int err;
int aclsupport = 0; int aclsupport = 0;
@ -2491,7 +2490,7 @@ out_acl:
} }
*attrlenp = htonl((char *)p - (char *)attrlenp - 4); *attrlenp = htonl((char *)p - (char *)attrlenp - 4);
*buffer = p; xdr->p = p;
status = nfs_ok; status = nfs_ok;
out: out:
@ -2513,6 +2512,27 @@ out_resource:
goto out; goto out;
} }
__be32 nfsd4_encode_fattr_to_buf(__be32 **p, int words,
struct svc_fh *fhp, struct svc_export *exp,
struct dentry *dentry, u32 *bmval,
struct svc_rqst *rqstp, int ignore_crossmnt)
{
struct xdr_buf dummy = {
.head[0] = {
.iov_base = *p,
},
.buflen = words << 2,
};
struct xdr_stream xdr;
__be32 ret;
xdr_init_encode(&xdr, &dummy, NULL);
ret = nfsd4_encode_fattr(&xdr, fhp, exp, dentry, bmval, rqstp,
ignore_crossmnt);
*p = xdr.p;
return ret;
}
static inline int attributes_need_mount(u32 *bmval) static inline int attributes_need_mount(u32 *bmval)
{ {
if (bmval[0] & ~(FATTR4_WORD0_RDATTR_ERROR | FATTR4_WORD0_LEASE_TIME)) if (bmval[0] & ~(FATTR4_WORD0_RDATTR_ERROR | FATTR4_WORD0_LEASE_TIME))
@ -2576,7 +2596,8 @@ nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd,
} }
out_encode: out_encode:
nfserr = nfsd4_encode_fattr(NULL, exp, dentry, p, buflen, cd->rd_bmval, nfserr = nfsd4_encode_fattr_to_buf(p, buflen, NULL, exp, dentry,
cd->rd_bmval,
cd->rd_rqstp, ignore_crossmnt); cd->rd_rqstp, ignore_crossmnt);
out_put: out_put:
dput(dentry); dput(dentry);
@ -2746,14 +2767,16 @@ static __be32
nfsd4_encode_getattr(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_getattr *getattr) nfsd4_encode_getattr(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_getattr *getattr)
{ {
struct svc_fh *fhp = getattr->ga_fhp; struct svc_fh *fhp = getattr->ga_fhp;
int buflen; struct xdr_stream *xdr = &resp->xdr;
struct xdr_buf *buf = resp->xdr.buf;
if (nfserr) if (nfserr)
return nfserr; return nfserr;
buflen = resp->xdr.end - resp->xdr.p - (COMPOUND_ERR_SLACK_SPACE >> 2); buf->buflen = (void *)resp->xdr.end - (void *)resp->xdr.p
nfserr = nfsd4_encode_fattr(fhp, fhp->fh_export, fhp->fh_dentry, - COMPOUND_ERR_SLACK_SPACE;
&resp->xdr.p, buflen, getattr->ga_bmval, nfserr = nfsd4_encode_fattr(xdr, fhp, fhp->fh_export, fhp->fh_dentry,
getattr->ga_bmval,
resp->rqstp, 0); resp->rqstp, 0);
return nfserr; return nfserr;
} }

7
fs/nfsd/xdr4.h
View File

@ -562,9 +562,10 @@ int nfs4svc_encode_compoundres(struct svc_rqst *, __be32 *,
__be32 nfsd4_check_resp_size(struct nfsd4_compoundres *, u32); __be32 nfsd4_check_resp_size(struct nfsd4_compoundres *, u32);
void nfsd4_encode_operation(struct nfsd4_compoundres *, struct nfsd4_op *); void nfsd4_encode_operation(struct nfsd4_compoundres *, struct nfsd4_op *);
void nfsd4_encode_replay(struct nfsd4_compoundres *resp, struct nfsd4_op *op); void nfsd4_encode_replay(struct nfsd4_compoundres *resp, struct nfsd4_op *op);
__be32 nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, __be32 nfsd4_encode_fattr_to_buf(__be32 **p, int words,
struct dentry *dentry, __be32 **buffer, int countp, struct svc_fh *fhp, struct svc_export *exp,
u32 *bmval, struct svc_rqst *, int ignore_crossmnt); struct dentry *dentry,
u32 *bmval, struct svc_rqst *, int ignore_crossmnt);
extern __be32 nfsd4_setclientid(struct svc_rqst *rqstp, extern __be32 nfsd4_setclientid(struct svc_rqst *rqstp,
struct nfsd4_compound_state *, struct nfsd4_compound_state *,
struct nfsd4_setclientid *setclid); struct nfsd4_setclientid *setclid);