diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-06-30 17:48:38 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-07-08 23:14:37 +0200 |
| commit | 3c87b9b7c05d7775a3d942de588296025023c6d2 (patch) | |
| tree | 5f2f480974ad925b754b91cea2037d5237bc28e4 /fs/nfsd/state.h | |
| parent | nfsd: clean up nfsd4_close_open_stateid (diff) | |
| download | linux-3c87b9b7c05d7775a3d942de588296025023c6d2.tar.xz linux-3c87b9b7c05d7775a3d942de588296025023c6d2.zip | |
nfsd: lock owners are not per open stateid
In the NFSv4 spec, lock stateids are per-file objects. Lockowners are not.
This patch replaces the current list of lock owners in the open stateids
with a list of lock stateids.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/state.h')
| -rw-r--r-- | fs/nfsd/state.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 62f33b7ec10c..c1e384a0a40a 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -365,7 +365,6 @@ struct nfs4_openowner { struct nfs4_lockowner { struct nfs4_stateowner lo_owner; /* must be first element */ struct list_head lo_owner_ino_hash; /* hash by owner,file */ - struct list_head lo_perstateid; struct list_head lo_list; /* for temporary uses */ }; @@ -433,7 +432,7 @@ struct nfs4_ol_stateid { struct nfs4_stid st_stid; /* must be first field */ struct list_head st_perfile; struct list_head st_perstateowner; - struct list_head st_lockowners; + struct list_head st_locks; struct nfs4_stateowner * st_stateowner; struct nfs4_file * st_file; unsigned long st_access_bmap; |