Merge tag 'pull-18-rc1-work.namei' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull vfs pathname updates from Al Viro:
 "Several cleanups in fs/namei.c"

* tag 'pull-18-rc1-work.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  namei: cleanup double word in comment
  get rid of dead code in legitimize_root()
  fs/namei.c:reserve_stack(): tidy up the call of try_to_unlazy()

diff --git a/fs/namei.c b/fs/namei.c
index 776ecf6799650c28702780749cf5102ebe7a0f4c..1f28d3f463c3b0418492f823809977e3d96aa7eb 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -730,13 +730,6 @@ static bool legitimize_links(struct nameidata *nd)
 
 static bool legitimize_root(struct nameidata *nd)
 {
-       /*
-        * For scoped-lookups (where nd->root has been zeroed), we need to
-        * restart the whole lookup from scratch -- because set_root() is wrong
-        * for these lookups (nd->dfd is the root, not the filesystem root).
-        */
-       if (!nd->root.mnt && (nd->flags & LOOKUP_IS_SCOPED))
-               return false;
        /* Nothing to do if nd->root is zero or is managed by the VFS user. */
        if (!nd->root.mnt || (nd->state & ND_ROOT_PRESET))
                return true;
@@ -798,7 +791,7 @@ out:
  * @seq: seq number to check @dentry against
  * Returns: true on success, false on failure
  *
- * Similar to to try_to_unlazy(), but here we have the next dentry already
+ * Similar to try_to_unlazy(), but here we have the next dentry already
  * picked by rcu-walk and want to legitimize that in addition to the current
  * nd->path and nd->root for ref-walk mode.  Must be called from rcu-walk context.
  * Nothing should touch nameidata between try_to_unlazy_next() failure and
@@ -1755,7 +1748,7 @@ static int reserve_stack(struct nameidata *nd, struct path *link, unsigned seq)
                // unlazy even if we fail to grab the link - cleanup needs it
                bool grabbed_link = legitimize_path(nd, link, seq);
 
-               if (!try_to_unlazy(nd) != 0 || !grabbed_link)
+               if (!try_to_unlazy(nd) || !grabbed_link)
                        return -ECHILD;
 
                if (nd_alloc_stack(nd))