Module Name: src
Committed By: tkusumi
Date: Tue Dec 3 15:47:38 UTC 2019
Modified Files:
src/sys/dev/dm: dm.h dm_ioctl.c dm_pdev.c dm_target_linear.c
dm_target_snapshot.c dm_target_stripe.c
Log Message:
dm: Include <sys/vnode.h> in dm.h
dm.h already depends on vnode, so have dm.h include <sys/vnode.h>
instead of other .c files.
taken-from: DragonFlyBSD
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/dm/dm.h
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/dm/dm_ioctl.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/dm/dm_pdev.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/dm/dm_target_linear.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/dm/dm_target_snapshot.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/dm/dm_target_stripe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/dm/dm.h
diff -u src/sys/dev/dm/dm.h:1.29 src/sys/dev/dm/dm.h:1.30
--- src/sys/dev/dm/dm.h:1.29 Tue Dec 3 15:36:00 2019
+++ src/sys/dev/dm/dm.h Tue Dec 3 15:47:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm.h,v 1.29 2019/12/03 15:36:00 tkusumi Exp $ */
+/* $NetBSD: dm.h,v 1.30 2019/12/03 15:47:38 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -44,6 +44,7 @@
#include <sys/mutex.h>
#include <sys/rwlock.h>
#include <sys/queue.h>
+#include <sys/vnode.h>
#include <sys/device.h>
#include <sys/disk.h>
Index: src/sys/dev/dm/dm_ioctl.c
diff -u src/sys/dev/dm/dm_ioctl.c:1.35 src/sys/dev/dm/dm_ioctl.c:1.36
--- src/sys/dev/dm/dm_ioctl.c:1.35 Sun Dec 1 06:53:31 2019
+++ src/sys/dev/dm/dm_ioctl.c Tue Dec 3 15:47:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_ioctl.c,v 1.35 2019/12/01 06:53:31 tkusumi Exp $ */
+/* $NetBSD: dm_ioctl.c,v 1.36 2019/12/03 15:47:38 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.35 2019/12/01 06:53:31 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.36 2019/12/03 15:47:38 tkusumi Exp $");
/*
* Locking is used to synchronise between ioctl calls and between dm_table's
@@ -88,7 +88,6 @@ __KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v
#include <sys/disklabel.h>
#include <sys/kmem.h>
#include <sys/malloc.h>
-#include <sys/vnode.h>
#include <machine/int_fmtio.h>
Index: src/sys/dev/dm/dm_pdev.c
diff -u src/sys/dev/dm/dm_pdev.c:1.11 src/sys/dev/dm/dm_pdev.c:1.12
--- src/sys/dev/dm/dm_pdev.c:1.11 Sun Dec 1 16:33:33 2019
+++ src/sys/dev/dm/dm_pdev.c Tue Dec 3 15:47:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_pdev.c,v 1.11 2019/12/01 16:33:33 tkusumi Exp $ */
+/* $NetBSD: dm_pdev.c,v 1.12 2019/12/03 15:47:38 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_pdev.c,v 1.11 2019/12/01 16:33:33 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_pdev.c,v 1.12 2019/12/03 15:47:38 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: dm_pdev.c,v
#include <sys/fcntl.h>
#include <sys/kmem.h>
#include <sys/namei.h>
-#include <sys/vnode.h>
#include <dev/dkvar.h>
Index: src/sys/dev/dm/dm_target_linear.c
diff -u src/sys/dev/dm/dm_target_linear.c:1.20 src/sys/dev/dm/dm_target_linear.c:1.21
--- src/sys/dev/dm/dm_target_linear.c:1.20 Mon Dec 2 16:10:34 2019
+++ src/sys/dev/dm/dm_target_linear.c Tue Dec 3 15:47:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_linear.c,v 1.20 2019/12/02 16:10:34 tkusumi Exp $ */
+/* $NetBSD: dm_target_linear.c,v 1.21 2019/12/03 15:47:38 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target_linear.c,v 1.20 2019/12/02 16:10:34 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_linear.c,v 1.21 2019/12/03 15:47:38 tkusumi Exp $");
/*
* This file implements initial version of device-mapper dklinear target.
@@ -40,7 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: dm_target_li
#include <sys/buf.h>
#include <sys/kmem.h>
-#include <sys/vnode.h>
#include <sys/lwp.h>
#include <machine/int_fmtio.h>
Index: src/sys/dev/dm/dm_target_snapshot.c
diff -u src/sys/dev/dm/dm_target_snapshot.c:1.21 src/sys/dev/dm/dm_target_snapshot.c:1.22
--- src/sys/dev/dm/dm_target_snapshot.c:1.21 Sun Dec 1 06:53:31 2019
+++ src/sys/dev/dm/dm_target_snapshot.c Tue Dec 3 15:47:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_snapshot.c,v 1.21 2019/12/01 06:53:31 tkusumi Exp $ */
+/* $NetBSD: dm_target_snapshot.c,v 1.22 2019/12/03 15:47:38 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target_snapshot.c,v 1.21 2019/12/01 06:53:31 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_snapshot.c,v 1.22 2019/12/03 15:47:38 tkusumi Exp $");
/*
* 1. Suspend my_data to temporarily stop any I/O while the snapshot is being
@@ -83,7 +83,6 @@ __KERNEL_RCSID(0, "$NetBSD: dm_target_sn
#include <sys/buf.h>
#include <sys/kmem.h>
-#include <sys/vnode.h>
#include "dm.h"
Index: src/sys/dev/dm/dm_target_stripe.c
diff -u src/sys/dev/dm/dm_target_stripe.c:1.25 src/sys/dev/dm/dm_target_stripe.c:1.26
--- src/sys/dev/dm/dm_target_stripe.c:1.25 Sun Dec 1 06:53:31 2019
+++ src/sys/dev/dm/dm_target_stripe.c Tue Dec 3 15:47:38 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_stripe.c,v 1.25 2019/12/01 06:53:31 tkusumi Exp $*/
+/*$NetBSD: dm_target_stripe.c,v 1.26 2019/12/03 15:47:38 tkusumi Exp $*/
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target_stripe.c,v 1.25 2019/12/01 06:53:31 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_stripe.c,v 1.26 2019/12/03 15:47:38 tkusumi Exp $");
/*
* This file implements initial version of device-mapper stripe target.
@@ -39,7 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: dm_target_st
#include <sys/buf.h>
#include <sys/kmem.h>
-#include <sys/vnode.h>
#include <sys/lwp.h>
#include "dm.h"
