From 494d99b0f5e5c360b121593227cdb96ba0c65287 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 23 2015 08:33:38 +0000
Subject: import lvm2-2.02.115-3.el7_1.1


---

diff --git a/SOURCES/lvm2-2_02_116-fix-lvm2app-to-properly-handle-info-status-properties.patch b/SOURCES/lvm2-2_02_116-fix-lvm2app-to-properly-handle-info-status-properties.patch
new file mode 100644
index 0000000..4d9cccd
--- /dev/null
+++ b/SOURCES/lvm2-2_02_116-fix-lvm2app-to-properly-handle-info-status-properties.patch
@@ -0,0 +1,52 @@
+ WHATS_NEW               | 2 ++
+ lib/metadata/lv.c       | 2 +-
+ lib/report/properties.c | 4 ++--
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/WHATS_NEW b/WHATS_NEW
+index ef5cc83..7c77c68 100644
+--- a/WHATS_NEW
++++ b/WHATS_NEW
+@@ -1,5 +1,7 @@
+ Version 2.02.116 - 
+ ====================================
++  Fix lvm2app lvm_lv_get_property return value for fields with info/status ioctl.
++  Fix lvm2app regression in lvm_lv_get_attr causing unknown values (2.02.115).
+   Preserve chunk size with repair and metadata swap of a thin pool.
+   Fix raid --splitmirror 1 functionality (2.02.112).
+   Fix tree preload to handle splitting raid images.
+diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c
+index 9052e63..c3c5d4a 100644
+--- a/lib/metadata/lv.c
++++ b/lib/metadata/lv.c
+@@ -831,7 +831,7 @@ char *lv_attr_dup(struct dm_pool *mem, const struct logical_volume *lv)
+ 	if (!(status.seg_status.mem = dm_pool_create("reporter_pool", 1024)))
+ 		return_0;
+ 
+-	if (!lv_info_with_seg_status(lv->vg->cmd, lv, first_seg(lv), 1, &status, 1, 1))
++	if (!(status.info_ok = lv_info_with_seg_status(lv->vg->cmd, lv, first_seg(lv), 1, &status, 1, 1)))
+ 		goto_bad;
+ 
+ 	ret = lv_attr_dup_with_info_and_seg_status(mem, &status);
+diff --git a/lib/report/properties.c b/lib/report/properties.c
+index 8866928..c1c9563 100644
+--- a/lib/report/properties.c
++++ b/lib/report/properties.c
+@@ -476,7 +476,7 @@ int lvseg_get_property(const struct lv_segment *lvseg,
+ int lv_get_property(const struct logical_volume *lv,
+ 		    struct lvm_property_type *prop)
+ {
+-	return prop_get_property(_properties, lv, prop, LVS);
++	return prop_get_property(_properties, lv, prop, LVS | LVSINFO | LVSSTATUS | LVSINFOSTATUS);
+ }
+ 
+ int vg_get_property(const struct volume_group *vg,
+@@ -500,7 +500,7 @@ int pv_get_property(const struct physical_volume *pv,
+ int lv_set_property(struct logical_volume *lv,
+ 		    struct lvm_property_type *prop)
+ {
+-	return prop_set_property(_properties, lv, prop, LVS);
++	return prop_set_property(_properties, lv, prop, LVS | LVSINFO | LVSSTATUS | LVSINFOSTATUS);
+ }
+ 
+ int vg_set_property(struct volume_group *vg,
diff --git a/SPECS/lvm2.spec b/SPECS/lvm2.spec
index a13d84c..c91b276 100644
--- a/SPECS/lvm2.spec
+++ b/SPECS/lvm2.spec
@@ -41,7 +41,7 @@ Summary: Userland logical volume management tools
 Name: lvm2
 Epoch: 7
 Version: 2.02.115
-Release: 3%{?dist}
+Release: 3%{?dist}.1
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -52,6 +52,7 @@ Patch2: lvm2-enable-lvmetad-by-default.patch
 Patch3: lvm2-drop-unavailable-libblkid-2_24-BLKID_SUBLKS_BADCSUM-for-signature-detection.patch
 Patch4: lvm2-remove-mpath-device-handling-from-udev-rules.patch
 Patch5: lvm2-2_02_116-fix-raid-image-splitting.patch
+Patch6: lvm2-2_02_116-fix-lvm2app-to-properly-handle-info-status-properties.patch
 
 BuildRequires: libselinux-devel >= %{libselinux_version}, libsepol-devel
 BuildRequires: libblkid-devel >= %{util_linux_version}
@@ -98,6 +99,7 @@ or more physical volumes and creating one or more logical volumes
 %patch3 -p1 -b .blkid_sublks_badcsum
 %patch4 -p1 -b .multipath
 %patch5 -p1 -b .raid_split
+%patch6 -p1 -b .lvm2app_info_status
 
 %build
 %define _default_pid_dir /run
@@ -666,6 +668,10 @@ the device-mapper event library.
 %{_libdir}/pkgconfig/devmapper-event.pc
 
 %changelog
+* Mon May 18 2015 Peter Rajnoha <prajnoha@redhat.com> - 7:2.02.115-3.el7_1.1
+- Fix lvm2app lvm_lv_get_property return value for fields with info/status ioctl.
+- Fix lvm2app regression in lvm_lv_get_attr causing unknown values (2.02.115).
+
 * Wed Jan 28 2015 Peter Rajnoha <prajnoha@redhat.com> - 7:2.02.115-3
 - Preserve chunk size with repair and metadata swap of a thin pool.
 - Fix raid --splitmirror 1 functionality (2.02.112).