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

Commit b7a437b0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Simplify exec_permission_lite() logic 



Instead of returning EAGAIN and having the caller do something
special for that case,  just do the special case directly.

Reviewed-by: default avatarJames Morris <jmorris@namei.org>
Acked-by: default avatarSerge Hallyn <serue@us.ibm.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e8e66ed2

fs/namei.c

+1 −4
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static int exec_permission_lite(struct inode *inode) 
	umode_t	mode = inode->i_mode;



	if (inode->i_op->permission)

		return -EAGAIN;

		return inode_permission(inode, MAY_EXEC);



	if (current_fsuid() == inode->i_uid)

		mode >>= 6;
@@ -853,9 +853,6 @@ static int __link_path_walk(const char *name, struct nameidata *nd) 


		nd->flags |= LOOKUP_CONTINUE;

		err = exec_permission_lite(inode);

		if (err == -EAGAIN)

			err = inode_permission(nd->path.dentry->d_inode,

					       MAY_EXEC);

 		if (err)

			break;