Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 69451
b: refs/heads/master
c: 7afaac6
h: refs/heads/master
i:
  69449: f155375
  69447: 03c63e5
v: v3
  • Loading branch information
Pavel Emelyanov authored and J. Bruce Fields committed Oct 9, 2007
1 parent 6ddfaa7 commit f02bfcc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a16877ca9cec211708a161057a7cbfbf2cbc3a53
refs/heads/master: 7afaac6202782ec28f2039503bdaef666834d60c
4 changes: 2 additions & 2 deletions trunk/fs/gfs2/ops_file.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)

if (!(fl->fl_flags & FL_POSIX))
return -ENOLCK;
if ((ip->i_inode.i_mode & (S_ISGID | S_IXGRP)) == S_ISGID)
if (__mandatory_lock(&ip->i_inode))
return -ENOLCK;

if (sdp->sd_args.ar_localflocks) {
Expand Down Expand Up @@ -637,7 +637,7 @@ static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl)

if (!(fl->fl_flags & FL_FLOCK))
return -ENOLCK;
if ((ip->i_inode.i_mode & (S_ISGID | S_IXGRP)) == S_ISGID)
if (__mandatory_lock(&ip->i_inode))
return -ENOLCK;

if (sdp->sd_args.ar_localflocks)
Expand Down

0 comments on commit f02bfcc

Please sign in to comment.