diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 |
| commit | 944d79559d154c12becde0dab327016cf438f46c (patch) | |
| tree | 50c101806f4d3b6585222dda060559eb4f3e005a /include/linux/nfsd/xdr4.h | |
| parent | d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b (diff) | |
| parent | 0f36b018b2e314d45af86449f1a97facb1fbe300 (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'include/linux/nfsd/xdr4.h')
| -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 |