summaryrefslogtreecommitdiff
path: root/include/linux/nfs_fs.h
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.com>2016-10-13 15:26:47 +1100
committerTrond Myklebust <trond.myklebust@primarydata.com>2016-12-01 17:58:13 -0500
commitd51fdb87a611f8ef50518df7187173ae10469fd0 (patch)
tree5c7b1f573e024cdc906641ede0f7d035bed2c016 /include/linux/nfs_fs.h
parent8d42443166a5d3800756db98498a4961a5ea5de7 (diff)
downloadlwn-d51fdb87a611f8ef50518df7187173ae10469fd0.tar.gz
lwn-d51fdb87a611f8ef50518df7187173ae10469fd0.zip
NFS: discard nfs_lockowner structure.
It now has only one field and is only used in one structure. So replaced it in that structure by the field it contains. Signed-off-by: NeilBrown <neilb@suse.com> Reviewed-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'include/linux/nfs_fs.h')
-rw-r--r--include/linux/nfs_fs.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 0adb02c4744d..db1002abc95e 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -55,15 +55,11 @@ struct nfs_access_entry {
struct rcu_head rcu_head;
};
-struct nfs_lockowner {
- fl_owner_t l_owner;
-};
-
struct nfs_lock_context {
atomic_t count;
struct list_head list;
struct nfs_open_context *open_context;
- struct nfs_lockowner lockowner;
+ fl_owner_t lockowner;
atomic_t io_count;
};