Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/kern Oops. Fix merge error.
details: https://anonhg.NetBSD.org/src/rev/5512317bfc60
branches: trunk
changeset: 850075:5512317bfc60
user: ad <ad%NetBSD.org@localhost>
date: Mon Mar 23 19:45:11 2020 +0000
description:
Oops. Fix merge error.
diffstat:
sys/kern/vfs_cache.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diffs (50 lines):
diff -r 2945bb4ede7a -r 5512317bfc60 sys/kern/vfs_cache.c
--- a/sys/kern/vfs_cache.c Mon Mar 23 19:14:06 2020 +0000
+++ b/sys/kern/vfs_cache.c Mon Mar 23 19:45:11 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_cache.c,v 1.132 2020/03/23 18:56:14 ad Exp $ */
+/* $NetBSD: vfs_cache.c,v 1.133 2020/03/23 19:45:11 ad Exp $ */
/*-
* Copyright (c) 2008, 2019, 2020 The NetBSD Foundation, Inc.
@@ -172,7 +172,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.132 2020/03/23 18:56:14 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.133 2020/03/23 19:45:11 ad Exp $");
#define __NAMECACHE_PRIVATE
#ifdef _KERNEL_OPT
@@ -621,6 +621,7 @@
* names in the cache. The node locks are chained along the way: a parent's
* lock is not dropped until the child's is acquired.
*/
+#ifdef notyet
bool
cache_lookup_linked(struct vnode *dvp, const char *name, size_t namelen,
struct vnode **vn_ret, krwlock_t **plock,
@@ -717,6 +718,7 @@
*vn_ret = ncp->nc_vp;
return true;
}
+#endif /* notyet */
/*
* Scan cache looking for name of directory entry pointing at vp.
@@ -957,6 +959,7 @@
* information, missing some updates, so always check the mount flag
* instead of looking for !VNOVAL.
*/
+#ifdef notyet
bool
cache_have_id(struct vnode *vp)
{
@@ -971,6 +974,7 @@
return false;
}
}
+#endif /* notyet */
/*
* Name cache initialization, from vfs_init() when the system is booting.
Home |
Main Index |
Thread Index |
Old Index