Module Name: src
Committed By: dholland
Date: Wed Aug 10 05:42:32 UTC 2011
Modified Files:
src/sys/kern: vfs_lookup.c
Log Message:
Revert previous, it breaks nullfs. (And I guess there are no tests for
nullfs?)
To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.188 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.187 src/sys/kern/vfs_lookup.c:1.188
--- src/sys/kern/vfs_lookup.c:1.187 Tue Aug 9 23:46:05 2011
+++ src/sys/kern/vfs_lookup.c Wed Aug 10 05:42:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lookup.c,v 1.187 2011/08/09 23:46:05 dholland Exp $ */
+/* $NetBSD: vfs_lookup.c,v 1.188 2011/08/10 05:42:32 dholland Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.187 2011/08/09 23:46:05 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.188 2011/08/10 05:42:32 dholland Exp $");
#include "opt_magiclinks.h"
@@ -1123,10 +1123,11 @@
for (;;) {
/*
- * If the directory we're on is unmounted, or has been
- * rmdir'd, bail out.
+ * If the directory we're on is unmounted, bail out.
+ * XXX: should this also check if it's unlinked?
+ * XXX: yes it should... but how?
*/
- if (searchdir->v_mount == NULL || searchdir->v_size == 0) {
+ if (searchdir->v_mount == NULL) {
vput(searchdir);
ndp->ni_dvp = NULL;
ndp->ni_vp = NULL;
