diff options
| author | NeilBrown <neilb@suse.com> | 2016-10-13 06:26:47 +0200 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2016-12-01 23:58:13 +0100 |
| commit | d51fdb87a611f8ef50518df7187173ae10469fd0 (patch) | |
| tree | 5c7b1f573e024cdc906641ede0f7d035bed2c016 /fs/nfs/inode.c | |
| parent | NFSv4: enhance nfs4_copy_lock_stateid to use a flock stateid if there is one (diff) | |
| download | linux-d51fdb87a611f8ef50518df7187173ae10469fd0.tar.xz linux-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 'fs/nfs/inode.c')
| -rw-r--r-- | fs/nfs/inode.c | 4 |
1 files changed, 2 insertions, 2 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; |