diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 14:19:10 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 14:19:10 +1100 |
| commit | d075a9bbfc738da2606b61f9427f7cd9c3eff7d1 (patch) | |
| tree | c8b6c95e73a86b41e0cb9e4c2b03e73319b25325 /include | |
| parent | b99548a796a5650631742c3a7c2dd535c89ae9e5 (diff) | |
| parent | de0fe84496af2fb104d5623937b1b6c0605f8273 (diff) | |
Merge branch 'quilt/device-mapper'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dm-ioctl.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/linux/dm-ioctl.h b/include/linux/dm-ioctl.h index 78bbf47bbb96..3708455ee6c3 100644 --- a/include/linux/dm-ioctl.h +++ b/include/linux/dm-ioctl.h @@ -267,9 +267,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_VERSION_MINOR 19 -#define DM_VERSION_PATCHLEVEL 1 -#define DM_VERSION_EXTRA "-ioctl (2011-01-07)" +#define DM_VERSION_MINOR 20 +#define DM_VERSION_PATCHLEVEL 0 +#define DM_VERSION_EXTRA "-ioctl (2011-02-02)" /* Status bits */ #define DM_READONLY_FLAG (1 << 0) /* In/Out */ @@ -328,4 +328,10 @@ enum { */ #define DM_UUID_FLAG (1 << 14) /* In */ +/* + * If set, all buffers are wiped after use. Use when sending + * or requesting sensitive data such as an encryption key. + */ +#define DM_SECURE_DATA_FLAG (1 << 15) /* In */ + #endif /* _LINUX_DM_IOCTL_H */ |