projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/~kmpark/onenand-mtd-2.6
[cascardo/linux.git]
/
include
/
linux
/
dm-ioctl.h
diff --git
a/include/linux/dm-ioctl.h
b/include/linux/dm-ioctl.h
index
9623bb6
..
523281c
100644
(file)
--- a/
include/linux/dm-ioctl.h
+++ b/
include/linux/dm-ioctl.h
@@
-131,6
+131,7
@@
struct dm_ioctl {
char name[DM_NAME_LEN]; /* device name */
char uuid[DM_UUID_LEN]; /* unique identifier for
* the block device */
char name[DM_NAME_LEN]; /* device name */
char uuid[DM_UUID_LEN]; /* unique identifier for
* the block device */
+ char data[7]; /* padding or data */
};
/*
};
/*
@@
-285,9
+286,9
@@
typedef char ioctl_struct[308];
#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
7
+#define DM_VERSION_MINOR
12
#define DM_VERSION_PATCHLEVEL 0
#define DM_VERSION_PATCHLEVEL 0
-#define DM_VERSION_EXTRA "-ioctl (200
6-06-24
)"
+#define DM_VERSION_EXTRA "-ioctl (200
7-10-02
)"
/* Status bits */
#define DM_READONLY_FLAG (1 << 0) /* In/Out */
/* Status bits */
#define DM_READONLY_FLAG (1 << 0) /* In/Out */
@@
-323,4
+324,9
@@
typedef char ioctl_struct[308];
*/
#define DM_SKIP_LOCKFS_FLAG (1 << 10) /* In */
*/
#define DM_SKIP_LOCKFS_FLAG (1 << 10) /* In */
+/*
+ * Set this to suspend without flushing queued ios.
+ */
+#define DM_NOFLUSH_FLAG (1 << 11) /* In */
+
#endif /* _LINUX_DM_IOCTL_H */
#endif /* _LINUX_DM_IOCTL_H */