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

[PATCH] knfsd: nfsd4: make verify and nverify wrappers

Browse Source 
Make wrappers for verify and nverify, for consistency with other ops.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
J.Bruce Fields 2006-12-13 00:35:31 -08:00 committed by Linus Torvalds
parent 7191155bd3
commit c954e2a5d1
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fs/nfsd/nfs4proc.c
View File

@ -681,7 +681,7 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
* to NFS_OK after the call; NVERIFY by mapping NFSERR_NOT_SAME to NFS_OK. * to NFS_OK after the call; NVERIFY by mapping NFSERR_NOT_SAME to NFS_OK.
*/ */
static __be32 static __be32
nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, _nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
struct nfsd4_verify *verify) struct nfsd4_verify *verify)
{ {
__be32 *buf, *p; __be32 *buf, *p;
@ -733,6 +733,26 @@ out_kfree:
return status; return status;
} }
static __be32
nfsd4_nverify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
struct nfsd4_verify *verify)
{
__be32 status;
status = _nfsd4_verify(rqstp, cstate, verify);
return status == nfserr_not_same ? nfs_ok : status;
}
static __be32
nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
struct nfsd4_verify *verify)
{
__be32 status;
status = _nfsd4_verify(rqstp, cstate, verify);
return status == nfserr_same ? nfs_ok : status;
}
/* /*
* NULL call. * NULL call.
*/ */
@ -911,10 +931,8 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
op->status = nfsd4_lookupp(rqstp, cstate); op->status = nfsd4_lookupp(rqstp, cstate);
break; break;
case OP_NVERIFY: case OP_NVERIFY:
op->status = nfsd4_verify(rqstp, cstate, op->status = nfsd4_nverify(rqstp, cstate,
&op->u.nverify); &op->u.nverify);
if (op->status == nfserr_not_same)
op->status = nfs_ok;
break; break;
case OP_OPEN: case OP_OPEN:
op->status = nfsd4_open(rqstp, cstate, op->status = nfsd4_open(rqstp, cstate,
@ -975,8 +993,6 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
case OP_VERIFY: case OP_VERIFY:
op->status = nfsd4_verify(rqstp, cstate, op->status = nfsd4_verify(rqstp, cstate,
&op->u.verify); &op->u.verify);
if (op->status == nfserr_same)
op->status = nfs_ok;
break; break;
case OP_WRITE: case OP_WRITE:
op->status = nfsd4_write(rqstp, cstate, &op->u.write); op->status = nfsd4_write(rqstp, cstate, &op->u.write);