diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-27 17:18:29 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-27 17:18:29 -0500 |
| commit | 292dd876ee765c478b27c93cc51e93a558ed58bf (patch) | |
| tree | 5b740e93253295baee2a9c414a6c66d03d44a9ef /include/linux/nfsd/xdr4.h | |
| parent | d4ec6c7cc9a15a7a529719bc3b84f46812f9842e (diff) | |
| parent | 9fdb62af92c741addbea15545f214a6e89460865 (diff) | |
Pull release into acpica branch
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 |