From ade7e8cb58a40fa8240b9c12297cf9ab5e0f1ea1 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 7 Aug 2011 09:53:20 -0700
Subject: [PATCH] --- yaml --- r: 262652 b: refs/heads/master c:
 7813b94a54987571082ff19e9d87eabbfec23b4e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4a743c8f80a7..2a2b29f725ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 206b1d09a56dcd2db1052245c4131879c410eaf8
+refs/heads/master: 7813b94a54987571082ff19e9d87eabbfec23b4e
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index fc13609a354a..2826db35dc25 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -1267,7 +1267,7 @@ static void terminate_walk(struct nameidata *nd)
  * so we keep a cache of "no, this doesn't need follow_link"
  * for the common case.
  */
-static inline int do_follow_link(struct inode *inode, int follow)
+static inline int should_follow_link(struct inode *inode, int follow)
 {
 	if (unlikely(!(inode->i_opflags & IOP_NOFOLLOW))) {
 		if (likely(inode->i_op->follow_link))
@@ -1303,7 +1303,7 @@ static inline int walk_component(struct nameidata *nd, struct path *path,
 		terminate_walk(nd);
 		return -ENOENT;
 	}
-	if (do_follow_link(inode, follow)) {
+	if (should_follow_link(inode, follow)) {
 		if (nd->flags & LOOKUP_RCU) {
 			if (unlikely(unlazy_walk(nd, path->dentry))) {
 				terminate_walk(nd);