diff options
| author |   NeilBrown <neilb@suse.com> | 2016-10-13 15:26:47 +1100 |
|---|---|---|
| committer |   Trond Myklebust <trond.myklebust@primarydata.com> | 2016-12-01 17:58:13 -0500 |
| commit | d51fdb87a611f8ef50518df7187173ae10469fd0 (patch) | |
| tree | 5c7b1f573e024cdc906641ede0f7d035bed2c016 | |
| parent | NFSv4: enhance nfs4_copy_lock_stateid to use a flock stateid if there is one (diff) | |
| download | linux-dev-d51fdb87a611f8ef50518df7187173ae10469fd0.tar.xz linux-dev-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>
| -rw-r--r-- | fs/nfs/inode.c | 4 | ||||
| -rw-r--r-- | fs/nfs/nfs4state.c | 2 | ||||
| -rw-r--r-- | fs/nfs/pagelist.c | 2 | ||||
| -rw-r--r-- | fs/nfs/write.c | 2 | ||||
| -rw-r--r-- | include/linux/nfs_fs.h | 6 |
5 files changed, 6 insertions, 10 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 3a7601fe9dee..d79e0bac836e 100644 --- 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 4f1de9be10c6..26b6b8b0cae3 100644 --- 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 161f8b13bbaa..6e629b856a00 100644 --- 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 4d5897e6d6cb..6e761f3f4cbf 100644 --- 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 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; }; |