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/gfs2 | |
| 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/gfs2')
| -rw-r--r-- | fs/gfs2/ops_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c index 46a9e10ff17b..7eb4b280ac66 100644 --- a/fs/gfs2/ops_file.c +++ b/fs/gfs2/ops_file.c | |||
| @@ -535,7 +535,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl) | |||
| 535 | 535 | ||
| 536 | if (!(fl->fl_flags & FL_POSIX)) | 536 | if (!(fl->fl_flags & FL_POSIX)) |
| 537 | return -ENOLCK; | 537 | return -ENOLCK; |
| 538 | if ((ip->i_inode.i_mode & (S_ISGID | S_IXGRP)) == S_ISGID) | 538 | if (__mandatory_lock(&ip->i_inode)) |
| 539 | return -ENOLCK; | 539 | return -ENOLCK; |
| 540 | 540 | ||
| 541 | if (sdp->sd_args.ar_localflocks) { | 541 | if (sdp->sd_args.ar_localflocks) { |
| @@ -636,7 +636,7 @@ static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl) | |||
| 636 | 636 | ||
| 637 | if (!(fl->fl_flags & FL_FLOCK)) | 637 | if (!(fl->fl_flags & FL_FLOCK)) |
| 638 | return -ENOLCK; | 638 | return -ENOLCK; |
| 639 | if ((ip->i_inode.i_mode & (S_ISGID | S_IXGRP)) == S_ISGID) | 639 | if (__mandatory_lock(&ip->i_inode)) |
| 640 | return -ENOLCK; | 640 | return -ENOLCK; |
| 641 | 641 | ||
| 642 | if (sdp->sd_args.ar_localflocks) | 642 | if (sdp->sd_args.ar_localflocks) |