Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'pull-18-rc1-work.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
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()
+2
-9
+2
-9
fs/namei.c
+2
-9
fs/namei.c
···
730
730
731
731
static bool legitimize_root(struct nameidata *nd)
732
732
{
733
-
/*
734
-
* For scoped-lookups (where nd->root has been zeroed), we need to
735
-
* restart the whole lookup from scratch -- because set_root() is wrong
736
-
* for these lookups (nd->dfd is the root, not the filesystem root).
737
-
*/
738
-
if (!nd->root.mnt && (nd->flags & LOOKUP_IS_SCOPED))
739
-
return false;
740
733
/* Nothing to do if nd->root is zero or is managed by the VFS user. */
741
734
if (!nd->root.mnt || (nd->state & ND_ROOT_PRESET))
742
735
return true;
···
791
798
* @seq: seq number to check @dentry against
792
799
* Returns: true on success, false on failure
793
800
*
794
-
* Similar to to try_to_unlazy(), but here we have the next dentry already
801
+
* Similar to try_to_unlazy(), but here we have the next dentry already
795
802
* picked by rcu-walk and want to legitimize that in addition to the current
796
803
* nd->path and nd->root for ref-walk mode. Must be called from rcu-walk context.
797
804
* Nothing should touch nameidata between try_to_unlazy_next() failure and
···
1748
1755
// unlazy even if we fail to grab the link - cleanup needs it
1749
1756
bool grabbed_link = legitimize_path(nd, link, seq);
1750
1757
1751
-
if (!try_to_unlazy(nd) != 0 || !grabbed_link)
1758
+
if (!try_to_unlazy(nd) || !grabbed_link)
1752
1759
return -ECHILD;
1753
1760
1754
1761
if (nd_alloc_stack(nd))