diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-07-30 03:34:08 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-07-31 18:51:34 +0200 |
| commit | 11b9164adad7cd119b82b1f2c911a6d9bc67f1cc (patch) | |
| tree | 865bd5d31dccec6f6ff9d71534e83dad10e9e215 /fs/nfsd/state.h | |
| parent | nfsd: Add reference counting to the lock and open stateids (diff) | |
| download | linux-11b9164adad7cd119b82b1f2c911a6d9bc67f1cc.tar.xz linux-11b9164adad7cd119b82b1f2c911a6d9bc67f1cc.zip | |
nfsd: Add a struct nfs4_file field to struct nfs4_stid
All stateids are associated with a nfs4_file. Let's consolidate.
Replace delegation->dl_file with the dl_stid.sc_file, and
nfs4_ol_stateid->st_file with st_stid.sc_file.
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 '')
| -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 32c466265ac1..af1d9c42e939 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -85,6 +85,7 @@ struct nfs4_stid { unsigned char sc_type; stateid_t sc_stateid; struct nfs4_client *sc_client; + struct nfs4_file *sc_file; void (*sc_free)(struct nfs4_stid *); }; @@ -93,7 +94,6 @@ struct nfs4_delegation { struct list_head dl_perfile; struct list_head dl_perclnt; struct list_head dl_recall_lru; /* delegation recalled */ - struct nfs4_file *dl_file; u32 dl_type; time_t dl_time; /* For recall: */ @@ -407,7 +407,6 @@ struct nfs4_ol_stateid { struct list_head st_perstateowner; struct list_head st_locks; struct nfs4_stateowner * st_stateowner; - struct nfs4_file * st_file; unsigned char st_access_bmap; unsigned char st_deny_bmap; struct nfs4_ol_stateid * st_openstp; |