diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 19:07:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 19:07:40 -0400 |
| commit | 541010e4b8921cd781ff02ae68028501457045b6 (patch) | |
| tree | 58bd529d4c6e69899a0aa20afa2d7f1c23326417 /fs/nfs | |
| parent | e457f790d8b05977853aa238bbc667b3bb375671 (diff) | |
| parent | 5e7fc436426b1f9e106f511a049de91c82ec2c53 (diff) | |
Merge branch 'locks' of git://linux-nfs.org/~bfields/linux
* 'locks' of git://linux-nfs.org/~bfields/linux:
nfsd: remove IS_ISMNDLCK macro
Rework /proc/locks via seq_files and seq_list helpers
fs/locks.c: use list_for_each_entry() instead of list_for_each()
NFS: clean up explicit check for mandatory locks
AFS: clean up explicit check for mandatory locks
9PFS: clean up explicit check for mandatory locks
GFS2: clean up explicit check for mandatory locks
Cleanup macros for distinguishing mandatory locks
Documentation: move locks.txt in filesystems/
locks: add warning about mandatory locking races
Documentation: move mandatory locking documentation to filesystems/
locks: Fix potential OOPS in generic_setlease()
Use list_first_entry in locks_wake_up_blocks
locks: fix flock_lock_file() comment
Memory shortage can result in inconsistent flocks state
locks: kill redundant local variable
locks: reverse order of posix_locks_conflict() arguments
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/file.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index c664bb921425..08c7c7387fce 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c | |||
| @@ -577,8 +577,7 @@ static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl) | |||
| 577 | nfs_inc_stats(inode, NFSIOS_VFSLOCK); | 577 | nfs_inc_stats(inode, NFSIOS_VFSLOCK); |
| 578 | 578 | ||
| 579 | /* No mandatory locks over NFS */ | 579 | /* No mandatory locks over NFS */ |
| 580 | if ((inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID && | 580 | if (__mandatory_lock(inode) && fl->fl_type != F_UNLCK) |
| 581 | fl->fl_type != F_UNLCK) | ||
| 582 | return -ENOLCK; | 581 | return -ENOLCK; |
| 583 | 582 | ||
| 584 | if (IS_GETLK(cmd)) | 583 | if (IS_GETLK(cmd)) |