---

yaml --- r: 157285 b: refs/heads/master c: b7a437b h: refs/heads/master i: 157283: b07db60 v: v3
git-mirror · Sep 8, 2009 · dc4c858 · dc4c858
1 parent f917975
commit dc4c858
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8e66ed25b5cbeebed69c475f6c108e52078a3b3
+refs/heads/master: b7a437b08a44a3ed7e3a052eb39d2c5f618b603b
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
@@ -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;