git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
serial: Tidy REMOTE_DEBUG
[safe/jmp/linux-2.6]
/
fs
/
9p
/
vfs_file.c
diff --git
a/fs/9p/vfs_file.c
b/fs/9p/vfs_file.c
index
019f1cd
..
df52d48
100644
(file)
--- a/
fs/9p/vfs_file.c
+++ b/
fs/9p/vfs_file.c
@@
-114,7
+114,7
@@
static int v9fs_file_lock(struct file *filp, int cmd, struct file_lock *fl)
P9_DPRINTK(P9_DEBUG_VFS, "filp: %p lock: %p\n", filp, fl);
/* No mandatory locks */
P9_DPRINTK(P9_DEBUG_VFS, "filp: %p lock: %p\n", filp, fl);
/* No mandatory locks */
- if (__mandatory_lock(inode))
+ if (__mandatory_lock(inode)
&& fl->fl_type != F_UNLCK
)
return -ENOLCK;
if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) && fl->fl_type != F_UNLCK) {
return -ENOLCK;
if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) && fl->fl_type != F_UNLCK) {