| From | Al Viro <> | Subject | [PATCH v3 108/110] enable passing fast relative symlinks without dropping out of RCU mode | Date | Mon, 11 May 2015 19:08:08 +0100 |
| |
From: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> --- fs/namei.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c index 9ef8c50..1771143 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -967,10 +967,6 @@ const char *get_link(struct nameidata *nd) } _cond_resched(); - if (nd->flags & LOOKUP_RCU) { - if (unlikely(unlazy_walk(nd, NULL, 0))) - return ERR_PTR(-ECHILD); - } error = security_inode_follow_link(dentry, inode, nd->flags & LOOKUP_RCU); @@ -980,6 +976,10 @@ const char *get_link(struct nameidata *nd) nd->last_type = LAST_BIND; res = inode->i_link; if (!res) { + if (nd->flags & LOOKUP_RCU) { + if (unlikely(unlazy_walk(nd, NULL, 0))) + return ERR_PTR(-ECHILD); + } res = inode->i_op->follow_link(dentry, &last->cookie); if (IS_ERR_OR_NULL(res)) { last->cookie = NULL; @@ -987,6 +987,10 @@ const char *get_link(struct nameidata *nd) } } if (*res == '/') { + if (nd->flags & LOOKUP_RCU) { + if (unlikely(unlazy_walk(nd, NULL, 0))) + return ERR_PTR(-ECHILD); + } if (!nd->root.mnt) set_root(nd); path_put(&nd->path); -- 2.1.4
|