Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 4385
b: refs/heads/master
c: 893f877
h: refs/heads/master
i:
  4383: 8b12ad7
v: v3
  • Loading branch information
NeilBrown authored and Linus Torvalds committed Jul 8, 2005
1 parent affbec9 commit 3ad9035
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 375151773125f56b7f6d798d914ea469256b330b
refs/heads/master: 893f87701c9e5bd5610dfbb3f8bf1135f86d85cb
18 changes: 9 additions & 9 deletions trunk/fs/nfsd/nfs4state.c
Original file line number Diff line number Diff line change
Expand Up @@ -2704,11 +2704,11 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
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.
*/
/*
* Client indicates that this is a new lockowner.
* Use open owner and open stateid to create lock owner and
* lock stateid.
*/
struct nfs4_stateid *open_stp = NULL;
struct nfs4_file *fp;

Expand Down Expand Up @@ -2842,10 +2842,10 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
out_destroy_new_stateid:
if (lock->lk_is_new) {
dprintk("NFSD: nfsd4_lock: destroy new stateid!\n");
/*
* An error encountered after instantiation of the new
* stateid has forced us to destroy it.
*/
/*
* An error encountered after instantiation of the new
* stateid has forced us to destroy it.
*/
if (!seqid_mutating_err(status))
open_sop->so_seqid--;

Expand Down

0 comments on commit 3ad9035

Please sign in to comment.