On 2019-07-12, Aleksa Sarai <cyphar@xxxxxxxxxx> wrote:
On 2019-07-12, Al Viro <viro@xxxxxxxxxxxxxxxxxx> wrote:On Sun, Jul 07, 2019 at 12:57:31AM +1000, Aleksa Sarai wrote:Previously, path_init's handling of *at(dfd, ...) was only done once, but with LOOKUP_BENEATH (and LOOKUP_IN_ROOT) we have to parse the initial nd->path at different times (before or after absolute path handling) depending on whether we have been asked to scope resolution within a root.if (*s == '/') { - set_root(nd); - if (likely(!nd_jump_root(nd))) - return s; - return ERR_PTR(-ECHILD);+ if (likely(!nd->root.mnt)) + set_root(nd);How can we get there with non-NULL nd->root.mnt, when LOOKUP_ROOT case has been already handled by that point?Yup, you're completely right. I will remove the if (!nd->root.mnt) in the next version.
Ah sorry, there is a reason for it -- later in the series the LOOKUP_BENEATH case means that you might end up with a non-NULL nd->root.mnt. If you want, I can move the addition of the conditional to later in the series (it was easier to split the patch by-hunk back when you originally asked me to split out dirfd_path_init()). -- Aleksa Sarai Senior Software Engineer (Containers) SUSE Linux GmbH <https://www.cyphar.com/>
Attachment:
signature.asc
Description: PGP signature
