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

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

9PFS: 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: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Ron Minnich <rminnich@sandia.gov>
Cc: Latchesar Ionkov <lucho@ionkov.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 7afaac62

fs/9p/vfs_file.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static int v9fs_file_lock(struct file *filp, int cmd, struct file_lock *fl) 
	P9_DPRINTK(P9_DEBUG_VFS, "filp: %p lock: %p\n", filp, fl);



	/* No mandatory locks */

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

	if (__mandatory_lock(inode))

		return -ENOLCK;



	if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) && fl->fl_type != F_UNLCK) {