Module Name: src
Committed By: dholland
Date: Sun Jun 19 22:11:55 UTC 2016
Modified Files:
src/sys/ufs/lfs: ulfs_vnops.c ulfsmount.h
Log Message:
note that we're synced with ufs_vnops.c -r1.217 and ufsmount.h -r1.41
(those changes removed lfs hooks from ufs so shouldn't be merged across)
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/ufs/lfs/ulfs_vnops.c
cvs rdiff -u -r1.15 -r1.16 src/sys/ufs/lfs/ulfsmount.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/lfs/ulfs_vnops.c
diff -u src/sys/ufs/lfs/ulfs_vnops.c:1.37 src/sys/ufs/lfs/ulfs_vnops.c:1.38
--- src/sys/ufs/lfs/ulfs_vnops.c:1.37 Sun Jun 19 22:07:17 2016
+++ src/sys/ufs/lfs/ulfs_vnops.c Sun Jun 19 22:11:55 2016
@@ -1,5 +1,5 @@
-/* $NetBSD: ulfs_vnops.c,v 1.37 2016/06/19 22:07:17 dholland Exp $ */
-/* from NetBSD: ufs_vnops.c,v 1.216 2013/06/16 00:13:58 dholland Exp */
+/* $NetBSD: ulfs_vnops.c,v 1.38 2016/06/19 22:11:55 dholland Exp $ */
+/* from NetBSD: ufs_vnops.c,v 1.217 2013/08/11 04:36:17 dholland Exp */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.37 2016/06/19 22:07:17 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.38 2016/06/19 22:11:55 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
Index: src/sys/ufs/lfs/ulfsmount.h
diff -u src/sys/ufs/lfs/ulfsmount.h:1.15 src/sys/ufs/lfs/ulfsmount.h:1.16
--- src/sys/ufs/lfs/ulfsmount.h:1.15 Sun Jun 19 21:58:42 2016
+++ src/sys/ufs/lfs/ulfsmount.h Sun Jun 19 22:11:55 2016
@@ -1,5 +1,5 @@
-/* $NetBSD: ulfsmount.h,v 1.15 2016/06/19 21:58:42 dholland Exp $ */
-/* from NetBSD: ufsmount.h,v 1.40 2013/06/16 13:33:30 hannken Exp */
+/* $NetBSD: ulfsmount.h,v 1.16 2016/06/19 22:11:55 dholland Exp $ */
+/* from NetBSD: ufsmount.h,v 1.41 2013/08/11 04:36:17 dholland Exp */
/*
* Copyright (c) 1982, 1986, 1989, 1993
