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>

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 3a7601fe9dee8af15de4ff97759671a5a6daee00..d79e0bac836e2e9a16d0bf66f3a127da646e635d 100644 (file)
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -702,7 +702,7 @@ EXPORT_SYMBOL_GPL(nfs_getattr);
 static void nfs_init_lock_context(struct nfs_lock_context *l_ctx)
 {
        atomic_set(&l_ctx->count, 1);
-       l_ctx->lockowner.l_owner = current->files;
+       l_ctx->lockowner = current->files;
        INIT_LIST_HEAD(&l_ctx->list);
        atomic_set(&l_ctx->io_count, 0);
 }
@@ -713,7 +713,7 @@ static struct nfs_lock_context *__nfs_find_lock_context(struct nfs_open_context
        struct nfs_lock_context *pos = head;
 
        do {
-               if (pos->lockowner.l_owner != current->files)
+               if (pos->lockowner != current->files)
                        continue;
                atomic_inc(&pos->count);
                return pos;

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 4f1de9be10c69552b436a0e117de6c4068badefb..26b6b8b0cae3cbb8141fda46d417b76631c0b3af 100644 (file)
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -953,7 +953,7 @@ static int nfs4_copy_lock_stateid(nfs4_stateid *dst,
        if (test_bit(LK_STATE_IN_USE, &state->flags) == 0)
                goto out;
 
-       fl_owner = l_ctx->lockowner.l_owner;
+       fl_owner = l_ctx->lockowner;
        fl_flock_owner = l_ctx->open_context->flock_owner;
 
        spin_lock(&state->state_lock);

diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 161f8b13bbaa1ebd442c03d9a57e31acebbdaa5e..6e629b856a00f2ebe52b4ba6badb356d49f380e6 100644 (file)
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -867,7 +867,7 @@ static void nfs_pageio_cleanup_mirroring(struct nfs_pageio_descriptor *pgio)
 static bool nfs_match_lock_context(const struct nfs_lock_context *l1,
                const struct nfs_lock_context *l2)
 {
-       return l1->lockowner.l_owner == l2->lockowner.l_owner;
+       return l1->lockowner == l2->lockowner;
 }
 
 /**

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 4d5897e6d6cb52866d52b2916ddaf236b4658f1f..6e761f3f4cbf0fb1c8de526813ca9b6dc72c8629 100644 (file)
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1151,7 +1151,7 @@ int nfs_flush_incompatible(struct file *file, struct page *page)
                if (l_ctx && flctx &&
                    !(list_empty_careful(&flctx->flc_posix) &&
                      list_empty_careful(&flctx->flc_flock))) {
-                       do_flush |= l_ctx->lockowner.l_owner != current->files;
+                       do_flush |= l_ctx->lockowner != current->files;
                }
                nfs_release_request(req);
                if (!do_flush)

diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 0adb02c4744de1fcd086c82ce3ce29fe31443d39..db1002abc95e7783520b0ada7d3e63c3a07c08ec 100644 (file)
--- 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;
 };