diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-23 12:06:48 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-23 12:06:51 +1000 |
| commit | 0f0abf45daaf8ab1ea4bf5c80c068c8ae5a03108 (patch) | |
| tree | 2dee346159db6f89a1c75cf8fa63feeda4987bbb /include | |
| parent | 4882198da95254667a0143fd2ca7bc7aaa060150 (diff) | |
| parent | 632c4531dd3e25ac5e1d0c96dc5dbcee6f9434a3 (diff) | |
Merge branch 'quilt/device-mapper'
Conflicts:
drivers/md/dm.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/device-mapper.h | 1 | ||||
| -rw-r--r-- | include/linux/dm-ioctl.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h index 1381cd97b4ed..e44cbcb647e9 100644 --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h @@ -130,6 +130,7 @@ void dm_put_device(struct dm_target *ti, struct dm_dev *d); /* * Target features */ +#define DM_TARGET_SUPPORTS_DISCARDS 0x00000001 struct target_type { uint64_t features; diff --git a/include/linux/dm-ioctl.h b/include/linux/dm-ioctl.h index 2c445e113790..43b2de17449b 100644 --- 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_VERSION_MINOR 17 +#define DM_VERSION_MINOR 18 #define DM_VERSION_PATCHLEVEL 0 -#define DM_VERSION_EXTRA "-ioctl (2010-03-05)" +#define DM_VERSION_EXTRA "-ioctl (2010-06-29)" /* Status bits */ #define DM_READONLY_FLAG (1 << 0) /* In/Out */ |