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>

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;
 };