projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
[cascardo/linux.git]
/
fs
/
gfs2
/
file.c
diff --git
a/fs/gfs2/file.c
b/fs/gfs2/file.c
index
a6abbae
..
e6dd2ae
100644
(file)
--- a/
fs/gfs2/file.c
+++ b/
fs/gfs2/file.c
@@
-640,7
+640,7
@@
static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)
if (!(fl->fl_flags & FL_POSIX))
return -ENOLCK;
- if (__mandatory_lock(&ip->i_inode))
+ if (__mandatory_lock(&ip->i_inode)
&& fl->fl_type != F_UNLCK
)
return -ENOLCK;
if (cmd == F_CANCELLK) {