Module Name: src
Committed By: dholland
Date: Mon Jun 20 03:36:09 UTC 2016
Modified Files:
src/sys/ufs/lfs: lfs_rename.c lfs_vnops.c ulfs_extern.h ulfs_inode.c
ulfs_readwrite.c ulfs_vnops.c ulfsmount.h
Log Message:
One more batch of already-synced ufs changes:
ufs_extern.h 1.79 is equivalent to ulfs_extern.h 1.14
ufsmount.h 1.43 is (roughly) equivalent to lfs_extern.h 1.102
ufs_inode.c 1.94 does not apply to lfs
ufs_inode.c 1.95 does not apply to lfs either
ufs_readwrite.c 1.108 is equivalent to ulfs_readwrite.c 1.8
ufs_readwrite.c 1.109 is equivalent to ulfs_readwrite.c 1.9
ufs_readwrite.c 1.110 is equivalent to ulfs_readwrite.c 1.10
ufs_readwrite.c 1.111 does not apply to lfs
ufs_readwrite.c 1.112 is equivalent to ulfs_readwrite.c 1.11
ufs_readwrite.c 1.113 is equivalent to ulfs_readwrite.c 1.13
ufs_readwrite.c 1.114 is equivalent to ulfs_readwrite.c 1.14
ufs_readwrite.c 1.115 is equivalent to ulfs_readwrite.c 1.15
ufs_readwrite.c 1.116-1.118 does not apply to lfs
ufs_readwrite.c 1.119-1.120 are equivalent to ulfs_readwrite.c 1.16
ufs_rename.c 1.12 is equivalent to lfs_rename.c 1.8
ufs_vnops.c 1.226 is equivalent to ulfs_vnops.c 1.22 and lfs_vnops.c 1.270
ufs_vnops.c 1.227 is equivalent to ulfs_vnops.c 1.23
ufs_vnops.c 1.228-1.229 are equivalent to ulfs_vnops.c 1.24
ufs_vnops.c 1.230 is equivalent to ulfs_vnops.c 1.25 and lfs_vnops.c 1.271
ufs_vnops.c 1.231 originated in lfs
ufs_vnops.c 1.232 does not apply to lfs
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/ufs/lfs/lfs_rename.c
cvs rdiff -u -r1.301 -r1.302 src/sys/ufs/lfs/lfs_vnops.c
cvs rdiff -u -r1.23 -r1.24 src/sys/ufs/lfs/ulfs_extern.h
cvs rdiff -u -r1.14 -r1.15 src/sys/ufs/lfs/ulfs_inode.c
cvs rdiff -u -r1.21 -r1.22 src/sys/ufs/lfs/ulfs_readwrite.c
cvs rdiff -u -r1.43 -r1.44 src/sys/ufs/lfs/ulfs_vnops.c
cvs rdiff -u -r1.17 -r1.18 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/lfs_rename.c
diff -u src/sys/ufs/lfs/lfs_rename.c:1.20 src/sys/ufs/lfs/lfs_rename.c:1.21
--- src/sys/ufs/lfs/lfs_rename.c:1.20 Mon Jun 20 02:05:25 2016
+++ src/sys/ufs/lfs/lfs_rename.c Mon Jun 20 03:36:09 2016
@@ -1,5 +1,5 @@
-/* $NetBSD: lfs_rename.c,v 1.20 2016/06/20 02:05:25 dholland Exp $ */
-/* from NetBSD: ufs_rename.c,v 1.11 2014/05/25 13:45:39 hannken Exp */
+/* $NetBSD: lfs_rename.c,v 1.21 2016/06/20 03:36:09 dholland Exp $ */
+/* from NetBSD: ufs_rename.c,v 1.12 2015/03/27 17:27:56 riastradh Exp */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_rename.c,v 1.20 2016/06/20 02:05:25 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_rename.c,v 1.21 2016/06/20 03:36:09 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/ufs/lfs/lfs_vnops.c
diff -u src/sys/ufs/lfs/lfs_vnops.c:1.301 src/sys/ufs/lfs/lfs_vnops.c:1.302
--- src/sys/ufs/lfs/lfs_vnops.c:1.301 Mon Jun 20 02:42:08 2016
+++ src/sys/ufs/lfs/lfs_vnops.c Mon Jun 20 03:36:09 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vnops.c,v 1.301 2016/06/20 02:42:08 dholland Exp $ */
+/* $NetBSD: lfs_vnops.c,v 1.302 2016/06/20 03:36:09 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.225 2015/03/17 09:39:29 hannken Exp */
+/* from NetBSD: ufs_vnops.c,v 1.232 2016/05/19 18:32:03 riastradh 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.301 2016/06/20 02:42:08 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.302 2016/06/20 03:36:09 dholland Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
Index: src/sys/ufs/lfs/ulfs_extern.h
diff -u src/sys/ufs/lfs/ulfs_extern.h:1.23 src/sys/ufs/lfs/ulfs_extern.h:1.24
--- src/sys/ufs/lfs/ulfs_extern.h:1.23 Mon Jun 20 02:31:47 2016
+++ src/sys/ufs/lfs/ulfs_extern.h Mon Jun 20 03:36:09 2016
@@ -1,5 +1,5 @@
-/* $NetBSD: ulfs_extern.h,v 1.23 2016/06/20 02:31:47 dholland Exp $ */
-/* from NetBSD: ufs_extern.h,v 1.78 2015/03/17 09:39:29 hannken Exp */
+/* $NetBSD: ulfs_extern.h,v 1.24 2016/06/20 03:36:09 dholland Exp $ */
+/* from NetBSD: ufs_extern.h,v 1.79 2015/03/27 17:27:56 riastradh Exp */
/*-
* Copyright (c) 1991, 1993, 1994
Index: src/sys/ufs/lfs/ulfs_inode.c
diff -u src/sys/ufs/lfs/ulfs_inode.c:1.14 src/sys/ufs/lfs/ulfs_inode.c:1.15
--- src/sys/ufs/lfs/ulfs_inode.c:1.14 Mon Jun 20 03:11:21 2016
+++ src/sys/ufs/lfs/ulfs_inode.c Mon Jun 20 03:36:09 2016
@@ -1,5 +1,5 @@
-/* $NetBSD: ulfs_inode.c,v 1.14 2016/06/20 03:11:21 dholland Exp $ */
-/* from NetBSD: ufs_inode.c,v 1.93 2015/04/15 14:39:24 riastradh */
+/* $NetBSD: ulfs_inode.c,v 1.15 2016/06/20 03:36:09 dholland Exp $ */
+/* from NetBSD: ufs_inode.c,v 1.95 2015/06/13 14:56:45 hannken Exp */
/*
* Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.14 2016/06/20 03:11:21 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.15 2016/06/20 03:36:09 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
Index: src/sys/ufs/lfs/ulfs_readwrite.c
diff -u src/sys/ufs/lfs/ulfs_readwrite.c:1.21 src/sys/ufs/lfs/ulfs_readwrite.c:1.22
--- src/sys/ufs/lfs/ulfs_readwrite.c:1.21 Sun Jun 19 23:06:09 2016
+++ src/sys/ufs/lfs/ulfs_readwrite.c Mon Jun 20 03:36:09 2016
@@ -1,5 +1,5 @@
-/* $NetBSD: ulfs_readwrite.c,v 1.21 2016/06/19 23:06:09 dholland Exp $ */
-/* from NetBSD: ufs_readwrite.c,v 1.107 2013/06/23 07:28:37 dholland Exp */
+/* $NetBSD: ulfs_readwrite.c,v 1.22 2016/06/20 03:36:09 dholland Exp $ */
+/* from NetBSD: ufs_readwrite.c,v 1.120 2015/04/12 22:48:38 riastradh Exp */
/*-
* Copyright (c) 1993
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: ulfs_readwrite.c,v 1.21 2016/06/19 23:06:09 dholland Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ulfs_readwrite.c,v 1.22 2016/06/20 03:36:09 dholland Exp $");
#ifdef LFS_READWRITE
#define FS struct lfs
Index: src/sys/ufs/lfs/ulfs_vnops.c
diff -u src/sys/ufs/lfs/ulfs_vnops.c:1.43 src/sys/ufs/lfs/ulfs_vnops.c:1.44
--- src/sys/ufs/lfs/ulfs_vnops.c:1.43 Mon Jun 20 02:42:08 2016
+++ src/sys/ufs/lfs/ulfs_vnops.c Mon Jun 20 03:36:09 2016
@@ -1,5 +1,5 @@
-/* $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 */
+/* $NetBSD: ulfs_vnops.c,v 1.44 2016/06/20 03:36:09 dholland Exp $ */
+/* from NetBSD: ufs_vnops.c,v 1.232 2016/05/19 18:32:03 riastradh 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.43 2016/06/20 02:42:08 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.44 2016/06/20 03:36:09 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.17 src/sys/ufs/lfs/ulfsmount.h:1.18
--- src/sys/ufs/lfs/ulfsmount.h:1.17 Mon Jun 20 02:25:03 2016
+++ src/sys/ufs/lfs/ulfsmount.h Mon Jun 20 03:36:09 2016
@@ -1,5 +1,5 @@
-/* $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 */
+/* $NetBSD: ulfsmount.h,v 1.18 2016/06/20 03:36:09 dholland Exp $ */
+/* from NetBSD: ufsmount.h,v 1.43 2015/03/27 17:27:56 riastradh Exp */
/*
* Copyright (c) 1982, 1986, 1989, 1993
