From: Sachin Prabhu Date: Thu, 11 Mar 2010 17:24:45 +0000 (-0500) Subject: GFS2: Skip check for mandatory locks when unlocking X-Git-Tag: MMI-PSA29.97-13-9~24384^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=720e7749279bde0d08684b1bb4e7a2eedeec6394;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git GFS2: Skip check for mandatory locks when unlocking gfs2_lock() will skip locks on file which have 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 and will result in a BUG in locks_remove_flock(). gfs2_lock() should skip the check for mandatory locks when unlocking a file. Signed-off-by: Sachin Prabhu Signed-off-by: Steven Whitehouse --- diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index a6abbae8a278..e6dd2aec6f82 100644 --- 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) {