aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfs/inode.c')
-rw-r--r--fs/nfs/inode.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index b5e2913dff2d..126a4cbbb98f 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -547,8 +547,8 @@ EXPORT_SYMBOL_GPL(nfs_getattr);
547static void nfs_init_lock_context(struct nfs_lock_context *l_ctx) 547static void nfs_init_lock_context(struct nfs_lock_context *l_ctx)
548{ 548{
549 atomic_set(&l_ctx->count, 1); 549 atomic_set(&l_ctx->count, 1);
550 l_ctx->lockowner = current->files; 550 l_ctx->lockowner.l_owner = current->files;
551 l_ctx->pid = current->tgid; 551 l_ctx->lockowner.l_pid = current->tgid;
552 INIT_LIST_HEAD(&l_ctx->list); 552 INIT_LIST_HEAD(&l_ctx->list);
553} 553}
554 554
@@ -557,9 +557,9 @@ static struct nfs_lock_context *__nfs_find_lock_context(struct nfs_open_context
557 struct nfs_lock_context *pos; 557 struct nfs_lock_context *pos;
558 558
559 list_for_each_entry(pos, &ctx->lock_context.list, list) { 559 list_for_each_entry(pos, &ctx->lock_context.list, list) {
560 if (pos->lockowner != current->files) 560 if (pos->lockowner.l_owner != current->files)
561 continue; 561 continue;
562 if (pos->pid != current->tgid) 562 if (pos->lockowner.l_pid != current->tgid)
563 continue; 563 continue;
564 atomic_inc(&pos->count); 564 atomic_inc(&pos->count);
565 return pos; 565 return pos;