From 7813b94a54987571082ff19e9d87eabbfec23b4e Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 7 Aug 2011 09:53:20 -0700 Subject: vfs: rename 'do_follow_link' to 'should_follow_link' Al points out that the do_follow_link() helper function really is misnamed - it's about whether we should try to follow a symlink or not, not about actually doing the following. Signed-off-by: Linus Torvalds --- fs/namei.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index fc13609a354..2826db35dc2 100644 --- a/fs/namei.c +++ b/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); -- cgit v1.2.3-18-g5258