---

yaml --- r: 258893 b: refs/heads/master c: 14067ff h: refs/heads/master i: 258891: e3e1df5 v: v3
git-mirror · Jul 26, 2011 · 644396f · 644396f
1 parent 099823f
commit 644396f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 750e06992d49666a7589aac555eb3bb68e4dbb88
+refs/heads/master: 14067ff536286bd2f7f79d46337d2228b12ef880
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
@@ -235,7 +235,7 @@ static int acl_permission_check(struct inode *inode, int mask)
 	if (current_user_ns() != inode_userns(inode))
 		goto other_perms;
 
-	if (current_fsuid() == inode->i_uid)
+	if (likely(current_fsuid() == inode->i_uid))
 		mode >>= 6;
 	else {
 		if (IS_POSIXACL(inode) && (mode & S_IRWXG)) {