git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.1' of git://linux-nfs.org/~bfields/linux
[pandora-kernel.git]
/
fs
/
fuse
/
file.c
diff --git
a/fs/fuse/file.c
b/fs/fuse/file.c
index
7bb685c
..
d480d9a
100644
(file)
--- a/
fs/fuse/file.c
+++ b/
fs/fuse/file.c
@@
-1507,7
+1507,7
@@
static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)
pid_t pid = fl->fl_type != F_UNLCK ? current->tgid : 0;
int err;
- if (fl->fl_lmops && fl->fl_lmops->
fl
_grant) {
+ if (fl->fl_lmops && fl->fl_lmops->
lm
_grant) {
/* NLM needs asynchronous locks, which we don't support yet */
return -ENOLCK;
}