From 644396f94f0b440f0bf8c5957f53de17e0ca533c Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Jul 2011 19:55:52 -0700
Subject: [PATCH] --- yaml --- r: 258893 b: refs/heads/master c:
 14067ff536286bd2f7f79d46337d2228b12ef880 h: refs/heads/master i:   258891:
 e3e1df5c2771ce400ea3c72f59b067438b99f5c4 v: v3

---
 [refs]           | 2 +-
 trunk/fs/namei.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f77a4472725b..a44803d49785 100644
--- 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
index ec2e5656b444..ef00b984fb20 100644
--- 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)) {