diff options
-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 94d76ace0b95..28773cab4a3d 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) { |
@@ -637,7 +637,7 @@ static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl) | |||
637 | 637 | ||
638 | if (!(fl->fl_flags & FL_FLOCK)) | 638 | if (!(fl->fl_flags & FL_FLOCK)) |
639 | return -ENOLCK; | 639 | return -ENOLCK; |
640 | if ((ip->i_inode.i_mode & (S_ISGID | S_IXGRP)) == S_ISGID) | 640 | if (__mandatory_lock(&ip->i_inode)) |
641 | return -ENOLCK; | 641 | return -ENOLCK; |
642 | 642 | ||
643 | if (sdp->sd_args.ar_localflocks) | 643 | if (sdp->sd_args.ar_localflocks) |