Module Name: src
Committed By: haad
Date: Sat Dec 5 11:30:26 UTC 2009
Modified Files:
src/sys/dev/dm: netbsd-dm.h
Log Message:
Include only user-kernel communication protocol related information in this
header.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/dm/netbsd-dm.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/dm/netbsd-dm.h
diff -u src/sys/dev/dm/netbsd-dm.h:1.5 src/sys/dev/dm/netbsd-dm.h:1.6
--- src/sys/dev/dm/netbsd-dm.h:1.5 Tue Dec 1 23:12:10 2009
+++ src/sys/dev/dm/netbsd-dm.h Sat Dec 5 11:30:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd-dm.h,v 1.5 2009/12/01 23:12:10 haad Exp $ */
+/* $NetBSD: netbsd-dm.h,v 1.6 2009/12/05 11:30:26 haad Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -255,29 +255,11 @@
*/
#define DM_NOFLUSH_FLAG (1 << 11) /* In */
-#ifdef __LIB_DEVMAPPER__
-
-# define MAJOR(x) major((x))
-# define MINOR(x) minor((x))
-# define MKDEV(x,y) makedev((x),(y))
-
-/* Name of device-mapper driver in kernel */
-#define DM_NAME "dm"
-
-/* Types for nbsd_get_dm_major */
-#define DM_CHAR_MAJOR 1
-#define DM_BLOCK_MAJOR 2
-
-/* libdm_netbsd.c */
-int nbsd_get_dm_major(uint32_t *, int); /* Get dm device major numbers */
-
-int nbsd_dmi_add_cmd(const char *, prop_dictionary_t);
-int nbsd_dmi_add_version(const int [3], prop_dictionary_t);
-int nbsd_dm_add_uint(const char *, uint64_t, prop_dictionary_t);
-int nbsd_dm_add_str(const char *, char *, prop_dictionary_t );
-
-struct dm_ioctl* nbsd_dm_dict_to_dmi(prop_dictionary_t, const int);
-
-#endif /* __LIB_DEVMAPPER__ */
+/*
+ * If set, any table information returned will relate to the inactive
+ * table instead of the live one. Always check DM_INACTIVE_PRESENT_FLAG
+ * is set before using the data returned.
+ */
+#define DM_QUERY_INACTIVE_TABLE_FLAG (1 << 12) /* In */
#endif /* __NETBSD_DM_H__ */
