diff options
| author | Jeff Layton <jeff.layton@primarydata.com> | 2019-08-18 14:18:53 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2019-08-19 11:09:09 -0400 |
| commit | eb82dd393744107ebc365a53e7813c7c67cb203b (patch) | |
| tree | 4def0a6086a0403975673ae589d51a9d989d8bae /fs/nfsd/state.h | |
| parent | fd4f83fd7dfb1bce2f1af51fcbaf6575f4b9d189 (diff) | |
| download | linux-eb82dd393744107ebc365a53e7813c7c67cb203b.tar.gz | |
nfsd: convert fi_deleg_file and ls_file fields to nfsd_file
Have them keep an nfsd_file reference instead of a struct file. Signed-off-by: Jeff Layton <jeff.layton@primarydata.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/state.h')
| -rw-r--r-- | fs/nfsd/state.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 8196bfb74f12..d89d1ade1254 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -516,7 +516,7 @@ struct nfs4_file { */ atomic_t fi_access[2]; u32 fi_share_deny; - struct file *fi_deleg_file; + struct nfsd_file *fi_deleg_file; int fi_delegees; struct knfsd_fh fi_fhandle; bool fi_had_conflict; @@ -565,7 +565,7 @@ struct nfs4_layout_stateid { spinlock_t ls_lock; struct list_head ls_layouts; u32 ls_layout_type; - struct file *ls_file; + struct nfsd_file *ls_file; struct nfsd4_callback ls_recall; stateid_t ls_recall_sid; bool ls_recalled; @@ -657,7 +657,7 @@ static inline void get_nfs4_file(struct nfs4_file *fi) { refcount_inc(&fi->fi_ref); } -struct file *find_any_file(struct nfs4_file *f); +struct nfsd_file *find_any_file(struct nfs4_file *f); /* grace period management */ void nfsd4_end_grace(struct nfsd_net *nn); |