diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2006-01-18 20:43:19 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-18 22:20:24 -0500 |
| commit | 3a65588adc4401622b204caa897123e16a4a0318 (patch) | |
| tree | a96a8d4a28608b49440062273c70565c1129165d /include/linux | |
| parent | 8a280510852959c0d51b1d625e90c0491c238368 (diff) | |
[PATCH] nfsd4: rename lk_stateowner
One of the things that's confusing about nfsd4_lock is that the lk_stateowner
field could be set to either of two different lockowners: the open owner or
the lock owner. Rename to lk_replay_owner and add a comment to make it clear
that it's used for whichever stateowner has its sequence id bumped for replay
detection.
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>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nfsd/xdr4.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/nfsd/xdr4.h b/include/linux/nfsd/xdr4.h index 8903688890ce..77adba7d2281 100644 --- a/include/linux/nfsd/xdr4.h +++ b/include/linux/nfsd/xdr4.h | |||
| @@ -145,8 +145,9 @@ struct nfsd4_lock { | |||
| 145 | } ok; | 145 | } ok; |
| 146 | struct nfsd4_lock_denied denied; | 146 | struct nfsd4_lock_denied denied; |
| 147 | } u; | 147 | } u; |
| 148 | 148 | /* The lk_replay_owner is the open owner in the open_to_lock_owner | |
| 149 | struct nfs4_stateowner *lk_stateowner; | 149 | * case and the lock owner otherwise: */ |
| 150 | struct nfs4_stateowner *lk_replay_owner; | ||
| 150 | }; | 151 | }; |
| 151 | #define lk_new_open_seqid v.new.open_seqid | 152 | #define lk_new_open_seqid v.new.open_seqid |
| 152 | #define lk_new_open_stateid v.new.open_stateid | 153 | #define lk_new_open_stateid v.new.open_stateid |