[src/trunk]: src/sys/ufs/lfs note that we're synced with ufs_vnops.c -r1.217 ...

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

details:   https://anonhg.NetBSD.org/src/rev/a5ce3faab9f6
branches:  trunk
changeset: 345993:a5ce3faab9f6
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sun Jun 19 22:11:55 2016 +0000

description:
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)

diffstat:

 sys/ufs/lfs/ulfs_vnops.c |  6 +++---
 sys/ufs/lfs/ulfsmount.h  |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r d92e6deec319 -r a5ce3faab9f6 sys/ufs/lfs/ulfs_vnops.c
--- a/sys/ufs/lfs/ulfs_vnops.c  Sun Jun 19 22:07:17 2016 +0000
+++ b/sys/ufs/lfs/ulfs_vnops.c  Sun Jun 19 22:11:55 2016 +0000
@@ -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"
diff -r d92e6deec319 -r a5ce3faab9f6 sys/ufs/lfs/ulfsmount.h
--- a/sys/ufs/lfs/ulfsmount.h   Sun Jun 19 22:07:17 2016 +0000
+++ b/sys/ufs/lfs/ulfsmount.h   Sun Jun 19 22:11:55 2016 +0000
@@ -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