[src/trunk]: src/sys/kern If lookup_fastforward() loses an intermediate searc...

[hannken <hannken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/422bbe10b3a0
branches:  trunk
changeset: 1025581:422bbe10b3a0
user:      hannken <hannken%NetBSD.org@localhost>
date:      Sat Nov 13 14:52:08 2021 +0000

description:
If lookup_fastforward() loses an intermediate searchdir, has to roll
back and retry it must use the initial searchdir from *searchdir_ret
for lookup_parsepath().

diffstat:

 sys/kern/vfs_lookup.c |  12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diffs (34 lines):

diff -r 6e048b0ffc98 -r 422bbe10b3a0 sys/kern/vfs_lookup.c
--- a/sys/kern/vfs_lookup.c     Sat Nov 13 13:36:42 2021 +0000
+++ b/sys/kern/vfs_lookup.c     Sat Nov 13 14:52:08 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_lookup.c,v 1.229 2021/06/29 22:39:21 dholland Exp $        */
+/*     $NetBSD: vfs_lookup.c,v 1.230 2021/11/13 14:52:08 hannken Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.229 2021/06/29 22:39:21 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.230 2021/11/13 14:52:08 hannken Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_magiclinks.h"
@@ -1474,13 +1474,9 @@
                        }
                        cnp->cn_nameptr = oldnameptr;
                        ndp->ni_pathlen = oldpathlen;
-                       if (searchdir == NULL) {
+                       error = lookup_parsepath(state, *searchdir_ret);
+                       if (error == 0) {
                                error = EOPNOTSUPP;
-                       } else {
-                               error = lookup_parsepath(state, searchdir);
-                               if (error == 0) {
-                                       error = EOPNOTSUPP;
-                               }
                        }
                }
        } else if (plock != NULL) {