Skip to contentSkip to conversation

v9fs: Skip check for mandatory locks when unlocking

PATCH New Sachin Prabhu 1 participant 1 message Mar 11, 2010 1 message not in the archive 9P file system

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 129079056.288181268330011583.JavaMail.root@zmail06.collab.prod.int.phx2.redhat.com

#1 lore raw

PATCH 1/1 v9fs: Skip check for mandatory locks when unlocking

While investigating a bug, I came across a possible bug in v9fs. The problem is similar to the one reported for NFS by ASANO Masahiro in http://lkml.org/lkml/2005/12/21/334.

v9fs_file_lock() will skip locks on file which has mode set to 02666. This is a problem in cases where the mode of the file is changed after a process has obtained a lock on the file. Such a lock will be skipped during unlock and the machine will end up with a BUG in locks_remove_flock().

v9fs_file_lock() should skip the check for mandatory locks when unlocking a file.

fs/9p/vfs_file.c renamed from fs/9p/vfs_file.c.9p +1 -1
diff -up linux-2.6/fs/9p/vfs_file.c.9p linux-2.6/fs/9p/vfs_file.c
@@ -114,7 +114,7 @@ static int v9fs_file_lock(struct file *f
 	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) {