diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-08 08:52:42 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-08 08:52:42 -0700 |
| commit | 88c3cdfdde3cf87e1831265ea4246430bef34fc9 (patch) | |
| tree | caea510ffb2f81a5ea13b00ecb8a4146ad462048 /include/linux/nfsd/state.h | |
| parent | 2b2c3750330325ae5071582b5c4dbdf1c8bc1e51 (diff) | |
| parent | a92b7b80579fe68fe229892815c750f6652eb6a9 (diff) | |
| download | talos-op-linux-88c3cdfdde3cf87e1831265ea4246430bef34fc9.tar.gz talos-op-linux-88c3cdfdde3cf87e1831265ea4246430bef34fc9.zip | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/linux/nfsd/state.h')
| -rw-r--r-- | include/linux/nfsd/state.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h index a84a3fa99be1..8bf23cf8b603 100644 --- a/include/linux/nfsd/state.h +++ b/include/linux/nfsd/state.h @@ -203,7 +203,9 @@ struct nfs4_stateowner { int so_is_open_owner; /* 1=openowner,0=lockowner */ u32 so_id; struct nfs4_client * so_client; - u32 so_seqid; + /* after increment in ENCODE_SEQID_OP_TAIL, represents the next + * sequence id expected from the client: */ + u32 so_seqid; struct xdr_netobj so_owner; /* open owner name */ int so_confirmed; /* successful OPEN_CONFIRM? */ struct nfs4_replay so_replay; @@ -235,6 +237,10 @@ struct nfs4_file { * st_perlockowner: (open stateid) list of lock nfs4_stateowners * st_access_bmap: used only for open stateid * st_deny_bmap: used only for open stateid +* st_openstp: open stateid lock stateid was derived from +* +* XXX: open stateids and lock stateids have diverged sufficiently that +* we should consider defining separate structs for the two cases. */ struct nfs4_stateid { @@ -248,6 +254,7 @@ struct nfs4_stateid { struct file * st_vfs_file; unsigned long st_access_bmap; unsigned long st_deny_bmap; + struct nfs4_stateid * st_openstp; }; /* flags for preprocess_seqid_op() */ |
