projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.34-rc1' into perf/urgent
[deliverable/linux.git]
/
include
/
linux
/
dm-ioctl.h
diff --git
a/include/linux/dm-ioctl.h
b/include/linux/dm-ioctl.h
index aa95508d2f9547e23722d9b67f91b9705fe95033..2c445e11379026041cb795844711379546da2a20 100644
(file)
--- a/
include/linux/dm-ioctl.h
+++ b/
include/linux/dm-ioctl.h
@@
-266,9
+266,9
@@
enum {
#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
#define DM_VERSION_MAJOR 4
#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
#define DM_VERSION_MAJOR 4
-#define DM_VERSION_MINOR 1
6
+#define DM_VERSION_MINOR 1
7
#define DM_VERSION_PATCHLEVEL 0
#define DM_VERSION_PATCHLEVEL 0
-#define DM_VERSION_EXTRA "-ioctl (20
09-11
-05)"
+#define DM_VERSION_EXTRA "-ioctl (20
10-03
-05)"
/* Status bits */
#define DM_READONLY_FLAG (1 << 0) /* In/Out */
/* Status bits */
#define DM_READONLY_FLAG (1 << 0) /* In/Out */
@@
-316,4
+316,9
@@
enum {
*/
#define DM_QUERY_INACTIVE_TABLE_FLAG (1 << 12) /* In */
*/
#define DM_QUERY_INACTIVE_TABLE_FLAG (1 << 12) /* In */
+/*
+ * If set, a uevent was generated for which the caller may need to wait.
+ */
+#define DM_UEVENT_GENERATED_FLAG (1 << 13) /* Out */
+
#endif /* _LINUX_DM_IOCTL_H */
#endif /* _LINUX_DM_IOCTL_H */
This page took
0.026138 seconds
and
5
git commands to generate.