summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/state.h
diff options
context:
space:
mode:
authorJeff Layton <jlayton@primarydata.com>2014-07-23 16:17:41 -0400
committerJ. Bruce Fields <bfields@redhat.com>2014-07-23 16:35:24 -0400
commitf9c00c3ab425ef04ca5a3caa5e9a9f5e0272bb8a (patch)
tree1a6137e597d1a9e0523834a865f34d683dd8a012 /fs/nfsd/state.h
parentb07c54a4a3802f28b0ed7b40b4341b170a3ef78f (diff)
downloadop-kernel-dev-f9c00c3ab425ef04ca5a3caa5e9a9f5e0272bb8a.zip
op-kernel-dev-f9c00c3ab425ef04ca5a3caa5e9a9f5e0272bb8a.tar.gz
nfsd: Do not let nfs4_file pin the struct inode
Remove the fi_inode field in struct nfs4_file in order to remove the possibility of struct nfs4_file pinning the inode when it does not have any open state. The only place we still need to get to an inode is in check_for_locks, so change it to use find_any_file and use the inode from any that it finds. If it doesn't find one, then just assume there aren't any. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by: Jeff Layton <jlayton@primarydata.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/state.h')
-rw-r--r--fs/nfsd/state.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index 33cf950..0097d47 100644
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -397,7 +397,6 @@ struct nfs4_file {
struct file_lock *fi_lease;
atomic_t fi_delegees;
struct knfsd_fh fi_fhandle;
- struct inode *fi_inode;
bool fi_had_conflict;
};
OpenPOWER on IntegriCloud