From d3a125a547604c7bdb1cf07d5ad5cca5fb70f1b2 Mon Sep 17 00:00:00 2001 From: dholland Date: Mon, 20 Jun 2016 02:42:08 +0000 Subject: [PATCH] With the previous we seem to have the changes from -r1.225 of ufs_vnops.c. (as that was stuff from moving ffs to the new vcache and lfs has also been moved, this is not surprising) --- sys/ufs/lfs/lfs_vnops.c | 6 +++--- sys/ufs/lfs/ulfs_vnops.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c index ec2135047c72..0397d26b7d5b 100644 --- a/sys/ufs/lfs/lfs_vnops.c +++ b/sys/ufs/lfs/lfs_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: lfs_vnops.c,v 1.300 2016/06/20 02:33:01 dholland Exp $ */ +/* $NetBSD: lfs_vnops.c,v 1.301 2016/06/20 02:42:08 dholland Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ * @(#)lfs_vnops.c 8.13 (Berkeley) 6/10/95 */ -/* from NetBSD: ufs_vnops.c,v 1.224 2014/10/29 01:13:28 christos Exp */ +/* from NetBSD: ufs_vnops.c,v 1.225 2015/03/17 09:39:29 hannken Exp */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. * All rights reserved. @@ -125,7 +125,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.300 2016/06/20 02:33:01 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.301 2016/06/20 02:42:08 dholland Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" diff --git a/sys/ufs/lfs/ulfs_vnops.c b/sys/ufs/lfs/ulfs_vnops.c index c46db3523e0a..a733ba3fc2ac 100644 --- a/sys/ufs/lfs/ulfs_vnops.c +++ b/sys/ufs/lfs/ulfs_vnops.c @@ -1,5 +1,5 @@ -/* $NetBSD: ulfs_vnops.c,v 1.42 2016/06/20 02:31:47 dholland Exp $ */ -/* from NetBSD: ufs_vnops.c,v 1.224 2014/10/29 01:13:28 christos Exp */ +/* $NetBSD: ulfs_vnops.c,v 1.43 2016/06/20 02:42:08 dholland Exp $ */ +/* from NetBSD: ufs_vnops.c,v 1.225 2015/03/17 09:39:29 hannken Exp */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.42 2016/06/20 02:31:47 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.43 2016/06/20 02:42:08 dholland Exp $"); #if defined(_KERNEL_OPT) #include "opt_lfs.h"