diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 17:38:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 17:38:53 -0500 |
| commit | 8cea4eb642890a1de58980e7e1617d1765ef8f7c (patch) | |
| tree | ea43bc34715d854c599743bf226437339bed1beb /fs/gfs2/file.c | |
| parent | 122ce878dc189860a380539bde19498bf93443a7 (diff) | |
| parent | 720e7749279bde0d08684b1bb4e7a2eedeec6394 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
GFS2: Skip check for mandatory locks when unlocking
GFS2: Allow the number of committed revokes to temporarily be negative
GFS2: do not select QUOTA
Diffstat (limited to 'fs/gfs2/file.c')
| -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) { |