diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2018-02-28 15:59:59 -0500 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2018-04-03 15:04:10 -0400 |
| commit | 1eb5fa849f2bf9186a618e85bea23f02e527540a (patch) | |
| tree | b0f5e85395f06f86e7db283155c5f73a5b942c8b /include | |
| parent | da5dadb4f11660ca67580cd4a7420161266d6254 (diff) | |
| download | linux-stable-1eb5fa849f2bf9186a618e85bea23f02e527540a.tar.gz linux-stable-1eb5fa849f2bf9186a618e85bea23f02e527540a.tar.bz2 linux-stable-1eb5fa849f2bf9186a618e85bea23f02e527540a.zip | |
dm: allow targets to return output from messages they are sent
Could be useful for a target to return stats or other information.
If a target does DMEMIT() anything to @result from its .message method
then it must return 1 to the caller.
Signed-off-By: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/device-mapper.h | 3 | ||||
| -rw-r--r-- | include/uapi/linux/dm-ioctl.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h index da83f64952e7..1e2426c18eb4 100644 --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h @@ -87,7 +87,8 @@ typedef void (*dm_resume_fn) (struct dm_target *ti); typedef void (*dm_status_fn) (struct dm_target *ti, status_type_t status_type, unsigned status_flags, char *result, unsigned maxlen); -typedef int (*dm_message_fn) (struct dm_target *ti, unsigned argc, char **argv); +typedef int (*dm_message_fn) (struct dm_target *ti, unsigned argc, char **argv, + char *result, unsigned maxlen); typedef int (*dm_prepare_ioctl_fn) (struct dm_target *ti, struct block_device **bdev, fmode_t *mode); diff --git a/include/uapi/linux/dm-ioctl.h b/include/uapi/linux/dm-ioctl.h index 14c44ec8b622..5108da02cd32 100644 --- a/include/uapi/linux/dm-ioctl.h +++ b/include/uapi/linux/dm-ioctl.h @@ -270,9 +270,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 37 +#define DM_VERSION_MINOR 38 #define DM_VERSION_PATCHLEVEL 0 -#define DM_VERSION_EXTRA "-ioctl (2017-09-20)" +#define DM_VERSION_EXTRA "-ioctl (2018-02-28)" /* Status bits */ #define DM_READONLY_FLAG (1 << 0) /* In/Out */ |