Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7afaac62 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by J. Bruce Fields
Browse files

GFS2: clean up explicit check for mandatory locks 



The __mandatory_lock(inode) function makes the same check, but makes the code
more readable.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent a16877ca

fs/gfs2/ops_file.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {
@@ -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)