Module Name: src
Committed By: dholland
Date: Sun Jun 19 21:58:42 UTC 2016
Modified Files:
src/sys/ufs/lfs: ulfs_extern.h ulfs_lookup.c ulfsmount.h
Log Message:
Update the ufs versions these files are synced with by 1: the
201306016 commit by hannken@ that removed references to ffs_snapgone
in ufs doesn't need to be synced into lfs.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/ufs/lfs/ulfs_extern.h
cvs rdiff -u -r1.35 -r1.36 src/sys/ufs/lfs/ulfs_lookup.c
cvs rdiff -u -r1.14 -r1.15 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_extern.h
diff -u src/sys/ufs/lfs/ulfs_extern.h:1.20 src/sys/ufs/lfs/ulfs_extern.h:1.21
--- src/sys/ufs/lfs/ulfs_extern.h:1.20 Mon Sep 21 01:24:23 2015
+++ src/sys/ufs/lfs/ulfs_extern.h Sun Jun 19 21:58:42 2016
@@ -1,5 +1,5 @@
-/* $NetBSD: ulfs_extern.h,v 1.20 2015/09/21 01:24:23 dholland Exp $ */
-/* from NetBSD: ufs_extern.h,v 1.72 2012/05/09 00:21:18 riastradh Exp */
+/* $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 */
/*-
* Copyright (c) 1991, 1993, 1994
Index: src/sys/ufs/lfs/ulfs_lookup.c
diff -u src/sys/ufs/lfs/ulfs_lookup.c:1.35 src/sys/ufs/lfs/ulfs_lookup.c:1.36
--- src/sys/ufs/lfs/ulfs_lookup.c:1.35 Sat Nov 14 22:03:54 2015
+++ src/sys/ufs/lfs/ulfs_lookup.c Sun Jun 19 21:58:42 2016
@@ -1,5 +1,5 @@
-/* $NetBSD: ulfs_lookup.c,v 1.35 2015/11/14 22:03:54 pgoyette Exp $ */
-/* from NetBSD: ufs_lookup.c,v 1.122 2013/01/22 09:39:18 dholland Exp */
+/* $NetBSD: ulfs_lookup.c,v 1.36 2016/06/19 21:58:42 dholland Exp $ */
+/* from NetBSD: ufs_lookup.c,v 1.124 2013/06/16 13:33:30 hannken Exp */
/*
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.35 2015/11/14 22:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.36 2016/06/19 21:58:42 dholland Exp $");
#ifdef _KERNEL_OPT
#include "opt_lfs.h"
Index: src/sys/ufs/lfs/ulfsmount.h
diff -u src/sys/ufs/lfs/ulfsmount.h:1.14 src/sys/ufs/lfs/ulfsmount.h:1.15
--- src/sys/ufs/lfs/ulfsmount.h:1.14 Thu Oct 15 06:15:48 2015
+++ src/sys/ufs/lfs/ulfsmount.h Sun Jun 19 21:58:42 2016
@@ -1,5 +1,5 @@
-/* $NetBSD: ulfsmount.h,v 1.14 2015/10/15 06:15:48 dholland Exp $ */
-/* from NetBSD: ufsmount.h,v 1.39 2012/10/19 17:09:08 drochner Exp */
+/* $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 */
/*
* Copyright (c) 1982, 1986, 1989, 1993
