projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'spi/topic/core' into spi-next
[linux-2.6-microblaze.git]
/
fs
/
nfs
/
proc.c
diff --git
a/fs/nfs/proc.c
b/fs/nfs/proc.c
index
b7bca83
..
9872cf6
100644
(file)
--- a/
fs/nfs/proc.c
+++ b/
fs/nfs/proc.c
@@
-638,7
+638,7
@@
nfs_proc_lock(struct file *filp, int cmd, struct file_lock *fl)
{
struct inode *inode = file_inode(filp);
- return nlmclnt_proc(NFS_SERVER(inode)->nlm_host, cmd, fl);
+ return nlmclnt_proc(NFS_SERVER(inode)->nlm_host, cmd, fl
, NULL
);
}
/* Helper functions for NFS lock bounds checking */