|
 |
146ac4 |
daemons/dmeventd/plugins/vdo/dmeventd_vdo.c | 4 +++-
|
|
|
146ac4 |
device_mapper/vdo/status.c | 22 ++++++++++++++++++++--
|
|
|
146ac4 |
2 files changed, 23 insertions(+), 3 deletions(-)
|
|
|
146ac4 |
|
|
|
146ac4 |
diff --git a/daemons/dmeventd/plugins/vdo/dmeventd_vdo.c b/daemons/dmeventd/plugins/vdo/dmeventd_vdo.c
|
|
|
146ac4 |
index b5e2766..d5156cd 100644
|
|
|
146ac4 |
--- a/daemons/dmeventd/plugins/vdo/dmeventd_vdo.c
|
|
|
146ac4 |
+++ b/daemons/dmeventd/plugins/vdo/dmeventd_vdo.c
|
|
|
146ac4 |
@@ -15,7 +15,9 @@
|
|
|
146ac4 |
#include "lib/misc/lib.h"
|
|
|
146ac4 |
#include "daemons/dmeventd/plugins/lvm2/dmeventd_lvm.h"
|
|
|
146ac4 |
#include "daemons/dmeventd/libdevmapper-event.h"
|
|
|
146ac4 |
-#include "device_mapper/vdo/target.h"
|
|
|
146ac4 |
+
|
|
|
146ac4 |
+/* Use parser from new device_mapper library */
|
|
|
146ac4 |
+#include "device_mapper/vdo/status.c"
|
|
|
146ac4 |
|
|
|
146ac4 |
#include <sys/wait.h>
|
|
|
146ac4 |
#include <stdarg.h>
|
|
|
146ac4 |
diff --git a/device_mapper/vdo/status.c b/device_mapper/vdo/status.c
|
|
|
146ac4 |
index 40e69ba..a34029d 100644
|
|
|
146ac4 |
--- a/device_mapper/vdo/status.c
|
|
|
146ac4 |
+++ b/device_mapper/vdo/status.c
|
|
|
146ac4 |
@@ -1,8 +1,26 @@
|
|
|
146ac4 |
+/*
|
|
|
146ac4 |
+ * Copyright (C) 2018 Red Hat, Inc. All rights reserved.
|
|
|
146ac4 |
+ *
|
|
|
146ac4 |
+ * This file is part of the device-mapper userspace tools.
|
|
|
146ac4 |
+ *
|
|
|
146ac4 |
+ * This copyrighted material is made available to anyone wishing to use,
|
|
|
146ac4 |
+ * modify, copy, or redistribute it subject to the terms and conditions
|
|
|
146ac4 |
+ * of the GNU Lesser General Public License v.2.1.
|
|
|
146ac4 |
+ *
|
|
|
146ac4 |
+ * You should have received a copy of the GNU Lesser General Public License
|
|
|
146ac4 |
+ * along with this program; if not, write to the Free Software Foundation,
|
|
|
146ac4 |
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
146ac4 |
+ */
|
|
|
146ac4 |
+
|
|
|
146ac4 |
+/* Note: this object is also used by VDO dmeventd plugin for parsing status */
|
|
|
146ac4 |
+/* File could be included by VDO plugin and can use original libdm library */
|
|
|
146ac4 |
+#ifndef LIB_DMEVENT_H
|
|
|
146ac4 |
#include "configure.h"
|
|
|
146ac4 |
-#include "target.h"
|
|
|
146ac4 |
-
|
|
|
146ac4 |
// For DM_ARRAY_SIZE!
|
|
|
146ac4 |
#include "device_mapper/all.h"
|
|
|
146ac4 |
+#endif
|
|
|
146ac4 |
+
|
|
|
146ac4 |
+#include "device_mapper/vdo/target.h"
|
|
|
146ac4 |
#include "base/memory/zalloc.h"
|
|
|
146ac4 |
|
|
|
146ac4 |
#include <ctype.h>
|