From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Whitehouse Date: Thu, 11 Mar 2010 17:22:01 +0000 Subject: [Cluster-devel] [PATCH 3/3] GFS2: Skip check for mandatory locks when unlocking In-Reply-To: <1268328121-10797-3-git-send-email-swhiteho@redhat.com> References: <1268328121-10797-1-git-send-email-swhiteho@redhat.com> <1268328121-10797-2-git-send-email-swhiteho@redhat.com> <1268328121-10797-3-git-send-email-swhiteho@redhat.com> Message-ID: <1268328121-10797-4-git-send-email-swhiteho@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit From: Sachin Prabhu 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 --- fs/gfs2/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index a6abbae..e6dd2ae 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) { -- 1.6.2.5