More already-merged or equivalent changes:
ufs_dirhash.c 1.36 corresponds to ulfs_dirhash.c 1.8 ufs_extattr.c 1.43 corresponds to ulfs_extattr.c 1.7 ufs_lookup.c 1.126 does not apply to lfs ufs_lookup.c 1.127 we already have ufs_lookup.c 1.128 does not apply to lfs ufs_lookup.c 1.129 corresponds to ulfs_lookup.c 1.19 ufs_quota1.c 1.19 corresponds to ulfs_quota1.c 1.7 ufs_quota1.c 1.20 corresponds to ulfs_quota1.c 1.8 ufs_quota2.c 1.36 we have equivalent changes for ufs_rename.c 1.9 corresponds to lfs_rename.c 1.5 ufs_rename.c 1.10 corresponds to lfs_rename.c 1.6 ufs_vnops.c 1.219 corresponds to lfs_vnops.c 1.260 and ulfs_vnops.c 1.19 ufs_vnops.c 1.220 corresponds to lfs_vnops.c 1.261 and ulfs_vnops.c 1.20 ufs_vnops.c 1.221 was superseded by later changes ufs_vnops.c 1.222 got fixed independently in lfs
This commit is contained in:
dholland
parent
169fe393aa
commit
5da25affa9
|
|
@ -1,5 +1,5 @@
|
|||
/* $NetBSD: lfs_rename.c,v 1.17 2016/06/19 23:06:09 dholland Exp $ */
|
||||
/* from NetBSD: ufs_rename.c,v 1.8 2013/06/19 17:51:26 dholland Exp */
|
||||
/* $NetBSD: lfs_rename.c,v 1.18 2016/06/20 00:00:47 dholland Exp $ */
|
||||
/* from NetBSD: ufs_rename.c,v 1.10 2014/02/06 10:57:12 hannken 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.17 2016/06/19 23:06:09 dholland Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: lfs_rename.c,v 1.18 2016/06/20 00:00:47 dholland Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: lfs_vnops.c,v 1.296 2016/06/19 23:11:48 dholland Exp $ */
|
||||
/* $NetBSD: lfs_vnops.c,v 1.297 2016/06/20 00:00:47 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.218 2013/09/15 15:32:18 martin Exp */
|
||||
/* from NetBSD: ufs_vnops.c,v 1.222 2014/10/18 08:33:30 snj 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.296 2016/06/19 23:11:48 dholland Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.297 2016/06/20 00:00:47 dholland Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_compat_netbsd.h"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* $NetBSD: ulfs_dirhash.c,v 1.15 2016/06/19 23:06:09 dholland Exp $ */
|
||||
/* from NetBSD: ufs_dirhash.c,v 1.35 2013/06/09 17:57:09 dholland Exp */
|
||||
/* $NetBSD: ulfs_dirhash.c,v 1.16 2016/06/20 00:00:47 dholland Exp $ */
|
||||
/* from NetBSD: ufs_dirhash.c,v 1.36 2014/02/25 18:30:13 pooka Exp */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001, 2002 Ian Dowse. All rights reserved.
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_dirhash.c,v 1.15 2016/06/19 23:06:09 dholland Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_dirhash.c,v 1.16 2016/06/20 00:00:47 dholland Exp $");
|
||||
|
||||
/*
|
||||
* This implements a hash-based lookup scheme for ULFS directories.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* $NetBSD: ulfs_extattr.c,v 1.8 2016/06/19 23:06:09 dholland Exp $ */
|
||||
/* from NetBSD: ufs_extattr.c,v 1.42 2013/06/09 17:57:09 dholland Exp */
|
||||
/* $NetBSD: ulfs_extattr.c,v 1.9 2016/06/20 00:00:47 dholland Exp $ */
|
||||
/* from NetBSD: ufs_extattr.c,v 1.43 2014/02/07 15:29:23 hannken Exp */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999-2002 Robert N. M. Watson
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_extattr.c,v 1.8 2016/06/19 23:06:09 dholland Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_extattr.c,v 1.9 2016/06/20 00:00:47 dholland Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_lfs.h"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* $NetBSD: ulfs_lookup.c,v 1.37 2016/06/19 23:11:48 dholland Exp $ */
|
||||
/* from NetBSD: ufs_lookup.c,v 1.125 2013/09/15 15:08:09 martin Exp */
|
||||
/* $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 */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1989, 1993
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.37 2016/06/19 23:11:48 dholland Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.38 2016/06/20 00:00:47 dholland Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_lfs.h"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* $NetBSD: ulfs_quota1.c,v 1.9 2015/07/26 08:33:53 hannken Exp $ */
|
||||
/* from NetBSD: ufs_quota1.c,v 1.18 2012/02/02 03:00:48 matt Exp */
|
||||
/* $NetBSD: ulfs_quota1.c,v 1.10 2016/06/20 00:00:47 dholland Exp $ */
|
||||
/* from NetBSD: ufs_quota1.c,v 1.20 2014/05/24 16:34:04 christos Exp */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1982, 1986, 1990, 1993, 1995
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_quota1.c,v 1.9 2015/07/26 08:33:53 hannken Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_quota1.c,v 1.10 2016/06/20 00:00:47 dholland Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/kernel.h>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* $NetBSD: ulfs_quota2.c,v 1.22 2015/11/14 22:03:54 pgoyette Exp $ */
|
||||
/* from NetBSD: ufs_quota2.c,v 1.35 2012/09/27 07:47:56 bouyer Exp */
|
||||
/* $NetBSD: ulfs_quota2.c,v 1.23 2016/06/20 00:00:47 dholland Exp $ */
|
||||
/* from NetBSD: ufs_quota2.c,v 1.36 2013/10/20 00:29:10 htodd Exp */
|
||||
/* from NetBSD: ffs_quota2.c,v 1.4 2011/06/12 03:36:00 rmind Exp */
|
||||
|
||||
/*-
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.22 2015/11/14 22:03:54 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.23 2016/06/20 00:00:47 dholland Exp $");
|
||||
|
||||
#include <sys/buf.h>
|
||||
#include <sys/param.h>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* $NetBSD: ulfs_vnops.c,v 1.39 2016/06/19 23:11:48 dholland Exp $ */
|
||||
/* from NetBSD: ufs_vnops.c,v 1.218 2013/09/15 15:32:18 martin Exp */
|
||||
/* $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 */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2008 The NetBSD Foundation, Inc.
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.39 2016/06/19 23:11:48 dholland Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.40 2016/06/20 00:00:47 dholland Exp $");
|
||||
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "opt_lfs.h"
|
||||
|
|
|
|||
Loading…
Reference in New Issue