[src/trunk]: src/sys/ufs/lfs Note more already-merged versions:

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

details:   https://anonhg.NetBSD.org/src/rev/57838dbeb498
branches:  trunk
changeset: 346018:57838dbeb498
user:      dholland <dholland%NetBSD.org@localhost>
date:      Mon Jun 20 02:25:03 2016 +0000

description:
Note more already-merged versions:

inode.h 1.68 is subsumed by ulfs_inode.h 1.19
inode.h 1.69-1.72 do not apply to lfs
ufs_extern.h 1.74 was covered when lfs was moved to the new vnode cache
ufs_extern.h 1.75 is equivalent to ulfs_extern.h 1.13
ufs_extern.h 1.76-1.77 do not apply to lfs
ufsmount.h 1.42 does not apply to lfs
ufs_inode.c 1.90 is subsumed by ulfs_inode.c 1.10
ufs_inode.c 1.91-1.92 do not apply to lfs
ufs_lookup.c 1.130 is subsumed by ulfs_lookup.c 1.24
ufs_lookup.c 1.131 is equivalent to ulfs_lookup.c 1.20
ufs_lookup.c 1.132 is equivalent to ulfs_lookup.c 1.21
ufs_lookup.c 1.133 is equivalent to ulfs_lookup.c 1.22
ufs_lookup.c 1.134 is equivalent to ulfs_lookup.c 1.23
ufs_lookup.c 1.135 is equivalent to ulfs_lookup.c 1.25
ufs_quota2.c 1.38 is equivalent to ulfs_quota2.c 1.17
ufs_quota2.c 1.39 is equivalent to ulfs_quota2.c 1.16
ufs_quota2.c 1.40 is equivalent to ulfs_quota2.c 1.18
ufs_vfsops.c 1.53 is subsumed by lfs_vfsops.c 1.324
ufs_vfsops.c 1.54 is subsumed by lfs_vfsops.c 1.324
ufs_vnops.c 1.223-1.224 do not apply to lfs

diffstat:

 sys/ufs/lfs/lfs_inode.h   |  4 ++--
 sys/ufs/lfs/lfs_vnops.c   |  6 +++---
 sys/ufs/lfs/ulfs_extern.h |  4 ++--
 sys/ufs/lfs/ulfs_inode.c  |  6 +++---
 sys/ufs/lfs/ulfs_inode.h  |  4 ++--
 sys/ufs/lfs/ulfs_lookup.c |  6 +++---
 sys/ufs/lfs/ulfs_quota2.c |  6 +++---
 sys/ufs/lfs/ulfs_vfsops.c |  6 +++---
 sys/ufs/lfs/ulfs_vnops.c  |  6 +++---
 sys/ufs/lfs/ulfsmount.h   |  4 ++--
 10 files changed, 26 insertions(+), 26 deletions(-)

diffs (172 lines):

diff -r 271d4ee60b32 -r 57838dbeb498 sys/ufs/lfs/lfs_inode.h
--- a/sys/ufs/lfs/lfs_inode.h   Mon Jun 20 02:05:25 2016 +0000
+++ b/sys/ufs/lfs/lfs_inode.h   Mon Jun 20 02:25:03 2016 +0000
@@ -1,6 +1,6 @@
-/*     $NetBSD: lfs_inode.h,v 1.14 2016/06/20 01:06:23 dholland Exp $  */
+/*     $NetBSD: lfs_inode.h,v 1.15 2016/06/20 02:25:03 dholland Exp $  */
 /*  from NetBSD: ulfs_inode.h,v 1.5 2013/06/06 00:51:50 dholland Exp  */
-/*  from NetBSD: inode.h,v 1.67 2014/05/14 13:46:19 martin Exp  */
+/*  from NetBSD: inode.h,v 1.72 2016/06/03 15:36:03 christos Exp  */
 
 /*
  * Copyright (c) 1982, 1989, 1993
diff -r 271d4ee60b32 -r 57838dbeb498 sys/ufs/lfs/lfs_vnops.c
--- a/sys/ufs/lfs/lfs_vnops.c   Mon Jun 20 02:05:25 2016 +0000
+++ b/sys/ufs/lfs/lfs_vnops.c   Mon Jun 20 02:25:03 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_vnops.c,v 1.297 2016/06/20 00:00:47 dholland Exp $ */
+/*     $NetBSD: lfs_vnops.c,v 1.298 2016/06/20 02:25:03 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.222 2014/10/18 08:33:30 snj Exp  */
+/*  from NetBSD: ufs_vnops.c,v 1.224 2014/10/29 01:13:28 christos Exp  */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -125,7 +125,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.297 2016/06/20 00:00:47 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.298 2016/06/20 02:25:03 dholland Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
diff -r 271d4ee60b32 -r 57838dbeb498 sys/ufs/lfs/ulfs_extern.h
--- a/sys/ufs/lfs/ulfs_extern.h Mon Jun 20 02:05:25 2016 +0000
+++ b/sys/ufs/lfs/ulfs_extern.h Mon Jun 20 02:25:03 2016 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ulfs_extern.h,v 1.21 2016/06/19 21:58:42 dholland Exp $        */
-/*  from NetBSD: ufs_extern.h,v 1.73 2013/06/16 13:33:30 hannken Exp   */
+/*     $NetBSD: ulfs_extern.h,v 1.22 2016/06/20 02:25:03 dholland Exp $        */
+/*  from NetBSD: ufs_extern.h,v 1.77 2014/10/29 01:13:28 christos Exp   */
 
 /*-
  * Copyright (c) 1991, 1993, 1994
diff -r 271d4ee60b32 -r 57838dbeb498 sys/ufs/lfs/ulfs_inode.c
--- a/sys/ufs/lfs/ulfs_inode.c  Mon Jun 20 02:05:25 2016 +0000
+++ b/sys/ufs/lfs/ulfs_inode.c  Mon Jun 20 02:25:03 2016 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ulfs_inode.c,v 1.12 2015/11/14 22:03:54 pgoyette Exp $ */
-/*  from NetBSD: ufs_inode.c,v 1.89 2013/01/22 09:39:18 dholland Exp  */
+/*     $NetBSD: ulfs_inode.c,v 1.13 2016/06/20 02:25:03 dholland Exp $ */
+/*  from NetBSD: ufs_inode.c,v 1.92 2014/10/29 01:13:28 christos Exp  */
 
 /*
  * Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.12 2015/11/14 22:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.13 2016/06/20 02:25:03 dholland Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_lfs.h"
diff -r 271d4ee60b32 -r 57838dbeb498 sys/ufs/lfs/ulfs_inode.h
--- a/sys/ufs/lfs/ulfs_inode.h  Mon Jun 20 02:05:25 2016 +0000
+++ b/sys/ufs/lfs/ulfs_inode.h  Mon Jun 20 02:25:03 2016 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ulfs_inode.h,v 1.19 2016/06/20 01:05:36 dholland Exp $ */
-/*  from NetBSD: inode.h,v 1.67 2014/05/14 13:46:19 martin Exp  */
+/*     $NetBSD: ulfs_inode.h,v 1.20 2016/06/20 02:25:03 dholland Exp $ */
+/*  from NetBSD: inode.h,v 1.72 2016/06/03 15:36:03 christos Exp  */
 
 /*
  * Copyright (c) 1982, 1989, 1993
diff -r 271d4ee60b32 -r 57838dbeb498 sys/ufs/lfs/ulfs_lookup.c
--- a/sys/ufs/lfs/ulfs_lookup.c Mon Jun 20 02:05:25 2016 +0000
+++ b/sys/ufs/lfs/ulfs_lookup.c Mon Jun 20 02:25:03 2016 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ulfs_lookup.c,v 1.38 2016/06/20 00:00:47 dholland Exp $        */
-/*  from NetBSD: ufs_lookup.c,v 1.129 2014/02/07 15:29:23 hannken Exp  */
+/*     $NetBSD: ulfs_lookup.c,v 1.39 2016/06/20 02:25:03 dholland Exp $        */
+/*  from NetBSD: ufs_lookup.c,v 1.135 2015/07/11 11:04:48 mlelstv  */
 
 /*
  * Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.38 2016/06/20 00:00:47 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.39 2016/06/20 02:25:03 dholland Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_lfs.h"
diff -r 271d4ee60b32 -r 57838dbeb498 sys/ufs/lfs/ulfs_quota2.c
--- a/sys/ufs/lfs/ulfs_quota2.c Mon Jun 20 02:05:25 2016 +0000
+++ b/sys/ufs/lfs/ulfs_quota2.c Mon Jun 20 02:25:03 2016 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ulfs_quota2.c,v 1.26 2016/06/20 02:03:32 dholland Exp $        */
-/*  from NetBSD: ufs_quota2.c,v 1.37 2014/01/29 20:13:04 bouyer Exp  */
+/*     $NetBSD: ulfs_quota2.c,v 1.27 2016/06/20 02:25:03 dholland Exp $        */
+/*  from NetBSD: ufs_quota2.c,v 1.40 2015/03/28 19:24:05 maxv Exp Exp  */
 /*  from NetBSD: ffs_quota2.c,v 1.5 2015/02/22 14:12:48 maxv Exp  */
 
 /*-
@@ -29,7 +29,7 @@
   */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.26 2016/06/20 02:03:32 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.27 2016/06/20 02:25:03 dholland Exp $");
 
 #include <sys/buf.h>
 #include <sys/param.h>
diff -r 271d4ee60b32 -r 57838dbeb498 sys/ufs/lfs/ulfs_vfsops.c
--- a/sys/ufs/lfs/ulfs_vfsops.c Mon Jun 20 02:05:25 2016 +0000
+++ b/sys/ufs/lfs/ulfs_vfsops.c Mon Jun 20 02:25:03 2016 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ulfs_vfsops.c,v 1.11 2015/09/15 15:01:03 dholland Exp $        */
-/*  from NetBSD: ufs_vfsops.c,v 1.52 2013/01/22 09:39:18 dholland Exp  */
+/*     $NetBSD: ulfs_vfsops.c,v 1.12 2016/06/20 02:25:03 dholland Exp $        */
+/*  from NetBSD: ufs_vfsops.c,v 1.54 2015/03/17 09:39:29 hannken Exp  */
 
 /*
  * Copyright (c) 1991, 1993, 1994
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_vfsops.c,v 1.11 2015/09/15 15:01:03 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_vfsops.c,v 1.12 2016/06/20 02:25:03 dholland Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_lfs.h"
diff -r 271d4ee60b32 -r 57838dbeb498 sys/ufs/lfs/ulfs_vnops.c
--- a/sys/ufs/lfs/ulfs_vnops.c  Mon Jun 20 02:05:25 2016 +0000
+++ b/sys/ufs/lfs/ulfs_vnops.c  Mon Jun 20 02:25:03 2016 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ulfs_vnops.c,v 1.40 2016/06/20 00:00:47 dholland Exp $ */
-/*  from NetBSD: ufs_vnops.c,v 1.222 2014/10/18 08:33:30 snj Exp  */
+/*     $NetBSD: ulfs_vnops.c,v 1.41 2016/06/20 02:25:03 dholland Exp $ */
+/*  from NetBSD: ufs_vnops.c,v 1.224 2014/10/29 01:13:28 christos 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.40 2016/06/20 00:00:47 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.41 2016/06/20 02:25:03 dholland Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_lfs.h"
diff -r 271d4ee60b32 -r 57838dbeb498 sys/ufs/lfs/ulfsmount.h
--- a/sys/ufs/lfs/ulfsmount.h   Mon Jun 20 02:05:25 2016 +0000
+++ b/sys/ufs/lfs/ulfsmount.h   Mon Jun 20 02:25:03 2016 +0000
@@ -1,5 +1,5 @@
-/*     $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  */
+/*     $NetBSD: ulfsmount.h,v 1.17 2016/06/20 02:25:03 dholland Exp $  */
+/*  from NetBSD: ufsmount.h,v 1.42 2015/03/17 09:39:29 hannken Exp  */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993