diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-01-17 22:55:28 +1000 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-17 22:55:28 +1000 |
commit | 0c929238ca4baefe47f4034732db4c154f2329c6 (patch) | |
tree | 2636079800fa045501982a70e1be0425c1b968c2 /fs/nfsd/nfs4proc.c | |
parent | 6d7120a713300283a8b73e7d86cd1bab8b9d1971 (diff) | |
parent | 78da107a7ed14fbc6ef77ff4c41d92b11edc9036 (diff) |
Merge branch 'sh/platform-updates' into sh-latest
Diffstat (limited to 'fs/nfsd/nfs4proc.c')
-rw-r--r-- | fs/nfsd/nfs4proc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index c5e28ed8bca0..896da74ec563 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -266,10 +266,6 @@ do_open_fhandle(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_ { __be32 status; - /* Only reclaims from previously confirmed clients are valid */ - if ((status = nfs4_check_open_reclaim(&open->op_clientid))) - return status; - /* We don't know the target directory, and therefore can not * set the change info */ @@ -373,6 +369,9 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, break; case NFS4_OPEN_CLAIM_PREVIOUS: open->op_openowner->oo_flags |= NFS4_OO_CONFIRMED; + status = nfs4_check_open_reclaim(&open->op_clientid); + if (status) + goto out; case NFS4_OPEN_CLAIM_FH: case NFS4_OPEN_CLAIM_DELEG_CUR_FH: status = do_open_fhandle(rqstp, &cstate->current_fh, |