[155/156] GFS2: Skip check for mandatory locks when unlocking
in [Kernel]
|
Prev: [065/156] tty: Keep the default buffering to sub-page units
Next: [101/116] ath9k: Enable TIM timer interrupt only when needed.
From: Greg KH on 30 Mar 2010 19:30 2.6.33-stable review patch. If anyone has any objections, please let us know. ------------------ From: Sachin Prabhu <sprabhu(a)redhat.com> commit 720e7749279bde0d08684b1bb4e7a2eedeec6394 upstream. 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 <sprabhu(a)redhat.com> Signed-off-by: Steven Whitehouse <swhiteho(a)redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> --- fs/gfs2/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -640,7 +640,7 @@ static int gfs2_lock(struct file *file, 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) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |