diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2012-06-06 16:01:37 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-06-20 08:59:42 -0400 |
| commit | e1aaa8916f19d23d39d88e985bc6933a74159e91 (patch) | |
| tree | 762d505166c522d7de5b679b899e4addd9fb6383 /fs/nfsd/nfs4state.c | |
| parent | 9068bed1a35da413df8751b8b1b845a04f62b9fd (diff) | |
| download | blackbird-op-linux-e1aaa8916f19d23d39d88e985bc6933a74159e91.tar.gz blackbird-op-linux-e1aaa8916f19d23d39d88e985bc6933a74159e91.zip | |
nfsd4: nfsd4_lock() cleanup
Share a little common logic. And note the comments here are a little
out of date (e.g. we don't always create new state in the "new" case any
more.)
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 59b9efc9d69b..de8f7e45102d 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4059,11 +4059,6 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, nfs4_lock_state(); if (lock->lk_is_new) { - /* - * Client indicates that this is a new lockowner. - * Use open owner and open stateid to create lock owner and - * lock stateid. - */ struct nfs4_ol_stateid *open_stp = NULL; if (nfsd4_has_session(cstate)) @@ -4090,17 +4085,13 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, goto out; status = lookup_or_create_lock_state(cstate, open_stp, lock, &lock_stp, &new_state); - if (status) - goto out; - } else { - /* lock (lock owner + lock stateid) already exists */ + } else status = nfs4_preprocess_seqid_op(cstate, lock->lk_old_lock_seqid, &lock->lk_old_lock_stateid, NFS4_LOCK_STID, &lock_stp); - if (status) - goto out; - } + if (status) + goto out; lock_sop = lockowner(lock_stp->st_stateowner); lkflg = setlkflg(lock->lk_type); |
