enable passing fast relative symlinks without dropping out of RCU mode

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/namei.c b/fs/namei.c
index d9f77ff60b557de0edb575b760781bf1418fc20c..bf46e1010a744aaa50e686f46a3c913246de1b31 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -975,11 +975,6 @@ const char *get_link(struct nameidata *nd)
                touch_atime(&last->link);
        }
 
-       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);
        if (unlikely(error))
@@ -988,6 +983,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;
@@ -995,6 +994,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);