CVS commit: src/sys/kern

[Andrew Doran]

Module Name:    src
Committed By:   ad
Date:           Tue Apr  7 18:28:32 UTC 2020

Modified Files:
        src/sys/kern: vfs_lookup.c

Log Message:
PR kern/55146 (100+ file system test cases failing)

- namei_oneroot(): key on negative return from lookup_fastforward()
  (EOPNOTSUPP), not positive.

- lookup_crossmount(): don't lose track of founddir.

>From hannken@, with a couple of tweaks.


To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.216 src/sys/kern/vfs_lookup.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/kern/vfs_lookup.c
diff -u src/sys/kern/vfs_lookup.c:1.215 src/sys/kern/vfs_lookup.c:1.216
--- src/sys/kern/vfs_lookup.c:1.215	Sat Apr  4 20:49:30 2020
+++ src/sys/kern/vfs_lookup.c	Tue Apr  7 18:28:31 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_lookup.c,v 1.215 2020/04/04 20:49:30 ad Exp $	*/
+/*	$NetBSD: vfs_lookup.c,v 1.216 2020/04/07 18:28:31 ad Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.215 2020/04/04 20:49:30 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.216 2020/04/07 18:28:31 ad Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_magiclinks.h"
@@ -961,7 +961,7 @@ lookup_crossmount(struct namei_state *st
 		error = vn_lock(foundobj, LK_SHARED);
 		if (error != 0) {
 			vrele(foundobj);
-			*foundobj_ret = NULL;
+			foundobj = NULL;
 			break;
 		}
 
@@ -975,7 +975,7 @@ lookup_crossmount(struct namei_state *st
 		error = vfs_busy(mp);
 		vput(foundobj);
 		if (error != 0) {
-			*foundobj_ret = NULL;
+			foundobj = NULL;
 			break;
 		}
 
@@ -983,7 +983,7 @@ lookup_crossmount(struct namei_state *st
 		error = VFS_ROOT(mp, LK_NONE, &foundobj);
 		vfs_unbusy(mp);
 		if (error) {
-			*foundobj_ret = NULL;
+			foundobj = NULL;
 			break;
 		}
 
@@ -1005,7 +1005,6 @@ lookup_crossmount(struct namei_state *st
 		} else if (foundobj->v_type == VDIR) {
 			vrele(searchdir);
 			*searchdir_ret = searchdir = NULL;
-			*foundobj_ret = foundobj;
 			lktype = LK_NONE;
 		}
 	}
@@ -1015,6 +1014,7 @@ lookup_crossmount(struct namei_state *st
 		vn_lock(searchdir, lktype | LK_RETRY);
 		*searchdir_locked = true;
 	}
+	*foundobj_ret = foundobj;
 	return error;
 }
 
@@ -1472,7 +1472,7 @@ namei_oneroot(struct namei_state *state,
 		 * If we didn't get a good answer from the namecache, then
 		 * go directly to the file system.
 		 */
-		if (error != 0 && error != ENOENT) {
+		if (error == EOPNOTSUPP) {
 			error = lookup_once(state, searchdir, &searchdir,
 			    &foundobj, &searchdir_locked);
 		}