diff options
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 142b63bc2051..74cd9bf3e0a1 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
| @@ -2704,11 +2704,11 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock | |||
| 2704 | nfs4_lock_state(); | 2704 | nfs4_lock_state(); |
| 2705 | 2705 | ||
| 2706 | if (lock->lk_is_new) { | 2706 | if (lock->lk_is_new) { |
| 2707 | /* | 2707 | /* |
| 2708 | * Client indicates that this is a new lockowner. | 2708 | * Client indicates that this is a new lockowner. |
| 2709 | * Use open owner and open stateid to create lock owner and lock | 2709 | * Use open owner and open stateid to create lock owner and |
| 2710 | * stateid. | 2710 | * lock stateid. |
| 2711 | */ | 2711 | */ |
| 2712 | struct nfs4_stateid *open_stp = NULL; | 2712 | struct nfs4_stateid *open_stp = NULL; |
| 2713 | struct nfs4_file *fp; | 2713 | struct nfs4_file *fp; |
| 2714 | 2714 | ||
| @@ -2842,10 +2842,10 @@ conflicting_lock: | |||
| 2842 | out_destroy_new_stateid: | 2842 | out_destroy_new_stateid: |
| 2843 | if (lock->lk_is_new) { | 2843 | if (lock->lk_is_new) { |
| 2844 | dprintk("NFSD: nfsd4_lock: destroy new stateid!\n"); | 2844 | dprintk("NFSD: nfsd4_lock: destroy new stateid!\n"); |
| 2845 | /* | 2845 | /* |
| 2846 | * An error encountered after instantiation of the new | 2846 | * An error encountered after instantiation of the new |
| 2847 | * stateid has forced us to destroy it. | 2847 | * stateid has forced us to destroy it. |
| 2848 | */ | 2848 | */ |
| 2849 | if (!seqid_mutating_err(status)) | 2849 | if (!seqid_mutating_err(status)) |
| 2850 | open_sop->so_seqid--; | 2850 | open_sop->so_seqid--; |
| 2851 | 2851 | ||