From 2207d3771858119b3c4c782b607bd484f9794c07 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 21 Feb 2011 21:34:47 -0500
Subject: [PATCH] --- yaml --- r: 234241 b: refs/heads/master c:
 52094c8a0610cf57920ad4c6c57470ae2ccbbd25 h: refs/heads/master i:   234239:
 c36f953c61472c01e8877eb1b9a0847441a90f60 v: v3

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

diff --git a/[refs] b/[refs]
index 19352456b92d..1604486e745e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9c6cac0c2bdbda42e7b804838648d0bc60ddb13
+refs/heads/master: 52094c8a0610cf57920ad4c6c57470ae2ccbbd25
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index 1d6bc8151553..8c704465f6ce 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -1322,6 +1322,18 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
 	return PTR_ERR(dentry);
 }
 
+static inline int may_lookup(struct nameidata *nd)
+{
+	if (nd->flags & LOOKUP_RCU) {
+		int err = exec_permission(nd->inode, IPERM_FLAG_RCU);
+		if (err != -ECHILD)
+			return err;
+		if (nameidata_drop_rcu(nd))
+			return -ECHILD;
+	}
+	return exec_permission(nd->inode, 0);
+}
+
 /*
  * Name resolution.
  * This is the basic name resolution function, turning a pathname into
@@ -1352,17 +1364,8 @@ static int link_path_walk(const char *name, struct nameidata *nd)
 		unsigned int c;
 
 		nd->flags |= LOOKUP_CONTINUE;
-		if (nd->flags & LOOKUP_RCU) {
-			err = exec_permission(nd->inode, IPERM_FLAG_RCU);
-			if (err == -ECHILD) {
-				if (nameidata_drop_rcu(nd))
-					return -ECHILD;
-				goto exec_again;
-			}
-		} else {
-exec_again:
-			err = exec_permission(nd->inode, 0);
-		}
+
+		err = may_lookup(nd);
  		if (err)
 			break;