diff options
| author | Len Brown <len.brown@intel.com> | 2005-12-22 22:01:55 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-12-22 22:01:55 -0500 |
| commit | db9ace7083dbdcc3d02bdd6a1d26132c80b5b726 (patch) | |
| tree | 022e1162c2ef3f83d6214fdc7f3678bc5545714a /fs/nfs/file.c | |
| parent | d8bcd8e41576809f276fa44be5012568296cce41 (diff) | |
| parent | c162eeaa21fde6c27112690f5bc0a461a9f1763e (diff) | |
Auto-update from upstream
Diffstat (limited to 'fs/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index eb5cd4c3bbf..7a79fbe9f53 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -509,7 +509,8 @@ static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl) return -EINVAL; /* No mandatory locks over NFS */ - if ((inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID) + if ((inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID && + fl->fl_type != F_UNLCK) return -ENOLCK; if (IS_GETLK(cmd)) |