openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFS: __nfs_find_lock_context needs to check ctx->lock_context for a match too 

Currently, we're forcing an unnecessary duplication of the
initial nfs_lock_context in calls to nfs_get_lock_context, since
__nfs_find_lock_context ignores the ctx->lock_context.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2013-03-15 18:11:31 -04:00
parent c58c844187
commit 8c86899f62
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/nfs/inode.c
View File

@ -565,16 +565,17 @@ static void nfs_init_lock_context(struct nfs_lock_context *l_ctx)
static struct nfs_lock_context *__nfs_find_lock_context(struct nfs_open_context *ctx) static struct nfs_lock_context *__nfs_find_lock_context(struct nfs_open_context *ctx)
{ {
struct nfs_lock_context *pos; struct nfs_lock_context *head = &ctx->lock_context;
struct nfs_lock_context *pos = head;
list_for_each_entry(pos, &ctx->lock_context.list, list) { do {
if (pos->lockowner.l_owner != current->files) if (pos->lockowner.l_owner != current->files)
continue; continue;
if (pos->lockowner.l_pid != current->tgid) if (pos->lockowner.l_pid != current->tgid)
continue; continue;
atomic_inc(&pos->count); atomic_inc(&pos->count);
return pos; return pos;
} } while ((pos = list_entry(pos->list.next, typeof(*pos), list)) != head);
return NULL; return NULL;
} }