diff options
| author | J. Bruce Fields | 2010-12-16 16:06:27 +0100 |
|---|---|---|
| committer | J. Bruce Fields | 2010-12-17 21:48:24 +0100 |
| commit | 0ff7ab46719a9c1e264b8d8e85416d59737ff13c (patch) | |
| tree | 8dc86bf6bcbee5185b30e1487c7f6948e9d55ddd /fs/nfsd/nfs4proc.c | |
| parent | nfsd4: 4.1 SECINFO should consume filehandle (diff) | |
| download | kernel-qcow2-linux-0ff7ab46719a9c1e264b8d8e85416d59737ff13c.tar.gz kernel-qcow2-linux-0ff7ab46719a9c1e264b8d8e85416d59737ff13c.tar.xz kernel-qcow2-linux-0ff7ab46719a9c1e264b8d8e85416d59737ff13c.zip | |
nfsd4: move guts of nfsd4_lookupp into helper
We'll reuse this code in secinfo_no_name.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4proc.c')
| -rw-r--r-- | fs/nfsd/nfs4proc.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index bad4bf8e4bbc..095431a35722 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -604,9 +604,7 @@ nfsd4_link(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, return status; } -static __be32 -nfsd4_lookupp(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, - void *arg) +static __be32 nfsd4_do_lookupp(struct svc_rqst *rqstp, struct svc_fh *fh) { struct svc_fh tmp_fh; __be32 ret; @@ -615,13 +613,19 @@ nfsd4_lookupp(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, ret = exp_pseudoroot(rqstp, &tmp_fh); if (ret) return ret; - if (tmp_fh.fh_dentry == cstate->current_fh.fh_dentry) { + if (tmp_fh.fh_dentry == fh->fh_dentry) { fh_put(&tmp_fh); return nfserr_noent; } fh_put(&tmp_fh); - return nfsd_lookup(rqstp, &cstate->current_fh, - "..", 2, &cstate->current_fh); + return nfsd_lookup(rqstp, fh, "..", 2, fh); +} + +static __be32 +nfsd4_lookupp(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, + void *arg) +{ + return nfsd4_do_lookupp(rqstp, &cstate->current_fh); } static __be32 |