diff options
| author | Sachin Prabhu <sprabhu@redhat.com> | 2010-03-11 12:24:45 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2010-03-11 12:17:57 -0500 |
| commit | 720e7749279bde0d08684b1bb4e7a2eedeec6394 (patch) | |
| tree | 894b5b4695fa6e6a7f86101bad1862a0cd623fe8 /fs | |
| parent | 2e95e3f668c85276ce699993596d3b52b0fcf4c5 (diff) | |
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 <sprabhu@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | 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 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) | |||
| 640 | 640 | ||
| 641 | if (!(fl->fl_flags & FL_POSIX)) | 641 | if (!(fl->fl_flags & FL_POSIX)) |
| 642 | return -ENOLCK; | 642 | return -ENOLCK; |
| 643 | if (__mandatory_lock(&ip->i_inode)) | 643 | if (__mandatory_lock(&ip->i_inode) && fl->fl_type != F_UNLCK) |
| 644 | return -ENOLCK; | 644 | return -ENOLCK; |
| 645 | 645 | ||
| 646 | if (cmd == F_CANCELLK) { | 646 | if (cmd == F_CANCELLK) { |