From 15d51bd6d05e1855f89408835feddf2387aebec9 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Fri, 16 Nov 2018 15:58:16 +0100 Subject: [PATCH] libdm: add DM_DEVICE_ARM_POLL Expose DM_DEVICE_ARM_POLL via standard API enum. (cherry picked from commit 1ae5bf2b833a5d55cf97de1619cc820d4e8c394f) --- WHATS_NEW_DM | 1 + device_mapper/all.h | 6 ++++-- device_mapper/ioctl/libdm-iface.c | 3 +++ libdm/ioctl/libdm-iface.c | 3 +++ libdm/libdevmapper.h | 4 +++- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index d0088c448..c19d9a8a0 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.155 - ==================================== + Add DM_DEVICE_ARM_POLL for API completness matching kernel. Do not add parameters for RESUME with DM_DEVICE_CREATE dm task. Version 1.02.153 - 31st October 2018 diff --git a/device_mapper/all.h b/device_mapper/all.h index e56bae979..bf84aa08b 100644 --- a/device_mapper/all.h +++ b/device_mapper/all.h @@ -116,10 +116,12 @@ enum { DM_DEVICE_MKNODES, DM_DEVICE_LIST_VERSIONS, - + DM_DEVICE_TARGET_MSG, - DM_DEVICE_SET_GEOMETRY + DM_DEVICE_SET_GEOMETRY, + + DM_DEVICE_ARM_POLL }; /* diff --git a/device_mapper/ioctl/libdm-iface.c b/device_mapper/ioctl/libdm-iface.c index 2920343af..11f5b15a0 100644 --- a/device_mapper/ioctl/libdm-iface.c +++ b/device_mapper/ioctl/libdm-iface.c @@ -117,6 +117,9 @@ static struct cmd_data _cmd_data_v4[] = { #ifdef DM_DEV_SET_GEOMETRY {"setgeometry", DM_DEV_SET_GEOMETRY, {4, 6, 0}}, #endif +#ifdef DM_DEV_ARM_POLL + {"armpoll", DM_DEV_ARM_POLL, {4, 36, 0}}, +#endif }; /* *INDENT-ON* */ diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c index 5844029ce..d1eedf6bd 100644 --- a/libdm/ioctl/libdm-iface.c +++ b/libdm/ioctl/libdm-iface.c @@ -115,6 +115,9 @@ static struct cmd_data _cmd_data_v4[] = { #ifdef DM_DEV_SET_GEOMETRY {"setgeometry", DM_DEV_SET_GEOMETRY, {4, 6, 0}}, #endif +#ifdef DM_DEV_ARM_POLL + {"armpoll", DM_DEV_ARM_POLL, {4, 36, 0}}, +#endif }; /* *INDENT-ON* */ diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index 2438f74c1..19032d775 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -119,7 +119,9 @@ enum { DM_DEVICE_TARGET_MSG, - DM_DEVICE_SET_GEOMETRY + DM_DEVICE_SET_GEOMETRY, + + DM_DEVICE_ARM_POLL }; /*