summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Prabhu <sprabhu@redhat.com>2010-03-10 10:28:40 -0500
committerJoel Becker <joel.becker@oracle.com>2010-03-17 12:07:16 -0700
commitee860b6a650360c91f5d5f9a94262aad9be90015 (patch)
tree745d678c30f4bcb6bd3306b39f9b2d1869481cef
parenta3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff)
downloadlinux-ee860b6a650360c91f5d5f9a94262aad9be90015.tar.gz
linux-ee860b6a650360c91f5d5f9a94262aad9be90015.tar.bz2
linux-ee860b6a650360c91f5d5f9a94262aad9be90015.zip
[PATCH] Skip check for mandatory locks when unlocking
ocfs2_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. ocfs2_lock() should skip the check for mandatory locks when unlocking a file. Signed-off-by: Sachin Prabhu <sprabhu@redhat.com> Signed-off-by: Joel Becker <joel.becker@oracle.com>
-rw-r--r--fs/ocfs2/locks.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/locks.c b/fs/ocfs2/locks.c
index 544ac6245175..b5cb3ede9408 100644
--- a/fs/ocfs2/locks.c
+++ b/fs/ocfs2/locks.c
@@ -133,7 +133,7 @@ int ocfs2_lock(struct file *file, int cmd, struct file_lock *fl)
if (!(fl->fl_flags & FL_POSIX))
return -ENOLCK;
- if (__mandatory_lock(inode))
+ if (__mandatory_lock(inode) && fl->fl_type != F_UNLCK)
return -ENOLCK;
return ocfs2_plock(osb->cconn, OCFS2_I(inode)->ip_blkno, file, cmd, fl);