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

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

NFS: clean up explicit check for mandatory locks 



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

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent fc5846e5

fs/nfs/file.c

+1 −2
Original line number Diff line number Diff line
@@ -522,8 +522,7 @@ static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl) 
	nfs_inc_stats(inode, NFSIOS_VFSLOCK);



	/* No mandatory locks over NFS */

	if ((inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID &&

	    fl->fl_type != F_UNLCK)

	if (__mandatory_lock(inode) && fl->fl_type != F_UNLCK)

		return -ENOLCK;



	if (IS_GETLK(cmd))