aboutsummaryrefslogtreecommitdiffstats
path: root/fs/namei.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-07 12:53:20 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-07 16:42:25 -0400
commit7813b94a54987571082ff19e9d87eabbfec23b4e (patch)
treef0c6b3325adba97b2af15d7bae55b4babb812f76 /fs/namei.c
parent206b1d09a56dcd2db1052245c4131879c410eaf8 (diff)
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 <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/namei.c')
-rw-r--r--fs/namei.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/namei.c b/fs/namei.c
index fc13609a354a..2826db35dc25 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1267,7 +1267,7 @@ static void terminate_walk(struct nameidata *nd)
1267 * so we keep a cache of "no, this doesn't need follow_link" 1267 * so we keep a cache of "no, this doesn't need follow_link"
1268 * for the common case. 1268 * for the common case.
1269 */ 1269 */
1270static inline int do_follow_link(struct inode *inode, int follow) 1270static inline int should_follow_link(struct inode *inode, int follow)
1271{ 1271{
1272 if (unlikely(!(inode->i_opflags & IOP_NOFOLLOW))) { 1272 if (unlikely(!(inode->i_opflags & IOP_NOFOLLOW))) {
1273 if (likely(inode->i_op->follow_link)) 1273 if (likely(inode->i_op->follow_link))
@@ -1303,7 +1303,7 @@ static inline int walk_component(struct nameidata *nd, struct path *path,
1303 terminate_walk(nd); 1303 terminate_walk(nd);
1304 return -ENOENT; 1304 return -ENOENT;
1305 } 1305 }
1306 if (do_follow_link(inode, follow)) { 1306 if (should_follow_link(inode, follow)) {
1307 if (nd->flags & LOOKUP_RCU) { 1307 if (nd->flags & LOOKUP_RCU) {
1308 if (unlikely(unlazy_walk(nd, path->dentry))) { 1308 if (unlikely(unlazy_walk(nd, path->dentry))) {
1309 terminate_walk(nd); 1309 terminate_walk(nd);