projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
fs
/
lockd
/
clntlock.c
diff --git
a/fs/lockd/clntlock.c
b/fs/lockd/clntlock.c
index 96c1d14c18f12fd6d61e74344c6d28d3e6cf2730..c2a128678e6e596ffebdc43db0989bbbd83ee1f4 100644
(file)
--- a/
fs/lockd/clntlock.c
+++ b/
fs/lockd/clntlock.c
@@
-187,7
+187,7
@@
__be32 nlmclnt_grant(const struct sockaddr *addr, const struct nlm_lock *lock)
continue;
if (!rpc_cmp_addr(nlm_addr(block->b_host), addr))
continue;
continue;
if (!rpc_cmp_addr(nlm_addr(block->b_host), addr))
continue;
- if (nfs_compare_fh(NFS_FH(
file_inode(fl_blocked->fl_file)) ,
fh) != 0)
+ if (nfs_compare_fh(NFS_FH(
locks_inode(fl_blocked->fl_file)),
fh) != 0)
continue;
/* Alright, we found a lock. Set the return status
* and wake up the caller
continue;
/* Alright, we found a lock. Set the return status
* and wake up the caller