diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2020-01-19 18:44:18 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2020-03-14 02:09:09 +0100 |
| commit | 8c4efe22e7c4de1d44f624120a979e31e3a584b8 (patch) | |
| tree | 40de15150a1de5a68afe9269a8d36580a2c6059a /fs/namei.c | |
| parent | sanitize handling of nd->last_type, kill LAST_BIND (diff) | |
| download | linux-8c4efe22e7c4de1d44f624120a979e31e3a584b8.tar.xz linux-8c4efe22e7c4de1d44f624120a979e31e3a584b8.zip | |
namei: invert the meaning of WALK_FOLLOW
old flags & WALK_FOLLOW <=> new !(flags & WALK_TRAILING)
That's what that flag had really been used for.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/namei.c b/fs/namei.c index 1a83641e95e6..5d25a3874a5b 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1819,7 +1819,7 @@ all_done: // pure jump return NULL; } -enum {WALK_FOLLOW = 1, WALK_MORE = 2, WALK_NOFOLLOW = 4}; +enum {WALK_TRAILING = 1, WALK_MORE = 2, WALK_NOFOLLOW = 4}; /* * Do we need to follow links? We _really_ want to be able @@ -1836,7 +1836,7 @@ static const char *step_into(struct nameidata *nd, int flags, if (err < 0) return ERR_PTR(err); if (likely(!d_is_symlink(path.dentry)) || - !((flags & WALK_FOLLOW) || (nd->flags & LOOKUP_FOLLOW)) || + ((flags & WALK_TRAILING) && !(nd->flags & LOOKUP_FOLLOW)) || (flags & WALK_NOFOLLOW)) { /* not a symlink or should not follow */ path_to_nameidata(&path, nd); @@ -2190,10 +2190,10 @@ OK: if (!name) return 0; /* last component of nested symlink */ - link = walk_component(nd, WALK_FOLLOW); + link = walk_component(nd, 0); } else { /* not the last component */ - link = walk_component(nd, WALK_FOLLOW | WALK_MORE); + link = walk_component(nd, WALK_MORE); } if (unlikely(link)) { if (IS_ERR(link)) @@ -2321,7 +2321,7 @@ static inline const char *lookup_last(struct nameidata *nd) nd->flags |= LOOKUP_FOLLOW | LOOKUP_DIRECTORY; nd->flags &= ~LOOKUP_PARENT; - link = walk_component(nd, 0); + link = walk_component(nd, WALK_TRAILING); if (link) { nd->flags |= LOOKUP_PARENT; nd->stack[0].name = NULL; @@ -3276,7 +3276,7 @@ static const char *do_last(struct nameidata *nd, finish_lookup: if (nd->depth) put_link(nd); - res = step_into(nd, 0, dentry, inode, seq); + res = step_into(nd, WALK_TRAILING, dentry, inode, seq); if (unlikely(res)) { nd->flags |= LOOKUP_PARENT; nd->flags &= ~(LOOKUP_OPEN|LOOKUP_CREATE|LOOKUP_EXCL); |