---

yaml --- r: 157287 b: refs/heads/master c: cb9179e h: refs/heads/master i: 157285: dc4c858 157283: b07db60 157279: a754a67 v: v3
git-mirror · Sep 8, 2009 · 17e7a72 · 17e7a72
1 parent 1e10f66
commit 17e7a72
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1ac9f6bfea6f21e8ab6dbbe46879d62a6fba8c0
+refs/heads/master: cb9179ead0aa0e3b7b4087cdba59baf16bbeef6d
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
@@ -434,8 +434,12 @@ static int exec_permission_lite(struct inode *inode)
 {
 	umode_t	mode = inode->i_mode;
 
-	if (inode->i_op->permission)
-		return inode_permission(inode, MAY_EXEC);
+	if (inode->i_op->permission) {
+		int ret = inode->i_op->permission(inode, MAY_EXEC);
+		if (!ret)
+			goto ok;
+		return ret;
+	}
 
 	if (current_fsuid() == inode->i_uid)
 		mode >>= 6;