Module Name: src
Committed By: chs
Date: Thu Jun 8 22:23:56 UTC 2017
Modified Files:
src/sys/dev: ccdvar.h
Log Message:
do not expose kernel-internal structure definitions to userland.
needed due to upcoming sys/disk.h changes needed for ZFS.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/ccdvar.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/dev/ccdvar.h
diff -u src/sys/dev/ccdvar.h:1.35 src/sys/dev/ccdvar.h:1.36
--- src/sys/dev/ccdvar.h:1.35 Sun Sep 6 06:00:59 2015
+++ src/sys/dev/ccdvar.h Thu Jun 8 22:23:56 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ccdvar.h,v 1.35 2015/09/06 06:00:59 dholland Exp $ */
+/* $NetBSD: ccdvar.h,v 1.36 2017/06/08 22:23:56 chs Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -70,11 +70,13 @@
#ifndef _DEV_CCDVAR_H_
#define _DEV_CCDVAR_H_
-#include <sys/buf.h>
#include <sys/ioccom.h>
+#ifdef _KERNEL
+#include <sys/buf.h>
#include <sys/mutex.h>
#include <sys/queue.h>
#include <sys/condvar.h>
+#endif
/*
* Dynamic configuration and disklabel support by:
@@ -97,6 +99,7 @@ struct ccd_ioctl {
uint64_t ccio_size; /* (returned) size of ccd */
};
+#ifdef _KERNEL
/*
* Component info table.
@@ -181,6 +184,8 @@ struct ccd_softc {
LIST_ENTRY(ccd_softc) sc_link;
};
+#endif /* _KERNEL */
+
/* sc_flags */
#define CCDF_UNIFORM 0x002 /* use LCCD of sizes for uniform interleave */
#define CCDF_NOLABEL 0x004 /* ignore on-disk (raw) disklabel */
@@ -221,6 +226,7 @@ struct ccd_ioctl_60 {
#define CCDIOCSET_60 _IOWR('F', 16, struct ccd_ioctl_60) /* enable ccd */
#define CCDIOCCLR_60 _IOW('F', 17, struct ccd_ioctl_60) /* disable ccd */
#endif /* COMPAT_60 && !LP64*/
+
/*
* Sysctl information
*/
