diff --git a/LVM2.2.02.160.tgz b/LVM2.2.02.160.tgz deleted file mode 100644 index a7f4bbf..0000000 --- a/LVM2.2.02.160.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:26727a9e29f3998b85d3da56fca0a341cb126ea4b725211db3f343c1712594c7 -size 2078325 diff --git a/LVM2.2.02.160.tgz.asc b/LVM2.2.02.160.tgz.asc deleted file mode 100644 index 9eba2b8..0000000 --- a/LVM2.2.02.160.tgz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEABECAAYFAld9KnQACgkQIoGRwVZ+LBcr5ACeJuqICKIQB2fhfBXI6+nehtx7 -PkcAoME7FVFpC/MdOzKklBHlncQoE7eV -=GIsb ------END PGP SIGNATURE----- diff --git a/LVM2.2.02.164.tgz b/LVM2.2.02.164.tgz new file mode 100644 index 0000000..d23b6b1 --- /dev/null +++ b/LVM2.2.02.164.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96dbbfe0b06191eac0e795bc40cdffcc8b10f809e26ac1e46fef16ef34264619 +size 2110255 diff --git a/LVM2.2.02.164.tgz.asc b/LVM2.2.02.164.tgz.asc new file mode 100644 index 0000000..aa29aac --- /dev/null +++ b/LVM2.2.02.164.tgz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEABECAAYFAlextAMACgkQIoGRwVZ+LBe1ogCg42bB5ZlNV+h1BIO8vXYcEdtk +/8gAoI+N8gCE0MM7Z1fgg7f6iSRnbAnJ +=dl73 +-----END PGP SIGNATURE----- diff --git a/cluster_support_mirrord_log.diff b/cluster_support_mirrord_log.diff index dcdbddc..a6c2926 100644 --- a/cluster_support_mirrord_log.diff +++ b/cluster_support_mirrord_log.diff @@ -9,10 +9,10 @@ Subject: Parallelize dispatching tools/lvconvert.c | 9 --- 7 files changed, 109 insertions(+), 81 deletions(-) -Index: LVM2.2.02.160/daemons/cmirrord/Makefile.in +Index: LVM2.2.02.164/daemons/cmirrord/Makefile.in =================================================================== ---- LVM2.2.02.160.orig/daemons/cmirrord/Makefile.in -+++ LVM2.2.02.160/daemons/cmirrord/Makefile.in +--- LVM2.2.02.164.orig/daemons/cmirrord/Makefile.in ++++ LVM2.2.02.164/daemons/cmirrord/Makefile.in @@ -26,7 +26,7 @@ TARGETS = cmirrord include $(top_builddir)/make.tmpl @@ -22,10 +22,10 @@ Index: LVM2.2.02.160/daemons/cmirrord/Makefile.in LMLIBS += $(CPG_LIBS) $(SACKPT_LIBS) CFLAGS += $(CPG_CFLAGS) $(SACKPT_CFLAGS) $(EXTRA_EXEC_CFLAGS) LDFLAGS += $(EXTRA_EXEC_LDFLAGS) -Index: LVM2.2.02.160/daemons/cmirrord/cluster.c +Index: LVM2.2.02.164/daemons/cmirrord/cluster.c =================================================================== ---- LVM2.2.02.160.orig/daemons/cmirrord/cluster.c -+++ LVM2.2.02.160/daemons/cmirrord/cluster.c +--- LVM2.2.02.164.orig/daemons/cmirrord/cluster.c ++++ LVM2.2.02.164/daemons/cmirrord/cluster.c @@ -22,6 +22,7 @@ #include #include @@ -282,10 +282,10 @@ Index: LVM2.2.02.160/daemons/cmirrord/cluster.c return 0; } -Index: LVM2.2.02.160/daemons/cmirrord/functions.c +Index: LVM2.2.02.164/daemons/cmirrord/functions.c =================================================================== ---- LVM2.2.02.160.orig/daemons/cmirrord/functions.c -+++ LVM2.2.02.160/daemons/cmirrord/functions.c +--- LVM2.2.02.164.orig/daemons/cmirrord/functions.c ++++ LVM2.2.02.164/daemons/cmirrord/functions.c @@ -19,6 +19,7 @@ #include #include @@ -414,10 +414,10 @@ Index: LVM2.2.02.160/daemons/cmirrord/functions.c dm_list_iterate_items(lc, &log_list) { LOG_ERROR("%s", lc->uuid); LOG_ERROR(" recoverer : %" PRIu32, lc->recoverer); -Index: LVM2.2.02.160/daemons/cmirrord/local.c +Index: LVM2.2.02.164/daemons/cmirrord/local.c =================================================================== ---- LVM2.2.02.160.orig/daemons/cmirrord/local.c -+++ LVM2.2.02.160/daemons/cmirrord/local.c +--- LVM2.2.02.164.orig/daemons/cmirrord/local.c ++++ LVM2.2.02.164/daemons/cmirrord/local.c @@ -29,13 +29,13 @@ static int cn_fd = -1; /* Connector (netlink) socket fd */ @@ -441,10 +441,10 @@ Index: LVM2.2.02.160/daemons/cmirrord/local.c memset(send_buf, 0, sizeof(send_buf)); -Index: LVM2.2.02.160/lib/metadata/mirror.c +Index: LVM2.2.02.164/lib/metadata/mirror.c =================================================================== ---- LVM2.2.02.160.orig/lib/metadata/mirror.c -+++ LVM2.2.02.160/lib/metadata/mirror.c +--- LVM2.2.02.164.orig/lib/metadata/mirror.c ++++ LVM2.2.02.164/lib/metadata/mirror.c @@ -1973,10 +1973,6 @@ int add_mirror_log(struct cmd_context *c unsigned old_log_count; int r = 0; @@ -483,10 +483,10 @@ Index: LVM2.2.02.160/lib/metadata/mirror.c /* For corelog mirror, activation code depends on * the global mirror_in_sync status. As we are adding -Index: LVM2.2.02.160/lib/mirror/mirrored.c +Index: LVM2.2.02.164/lib/mirror/mirrored.c =================================================================== ---- LVM2.2.02.160.orig/lib/mirror/mirrored.c -+++ LVM2.2.02.160/lib/mirror/mirrored.c +--- LVM2.2.02.164.orig/lib/mirror/mirrored.c ++++ LVM2.2.02.164/lib/mirror/mirrored.c @@ -293,12 +293,15 @@ static int _add_log(struct dm_pool *mem, return 0; } @@ -504,11 +504,11 @@ Index: LVM2.2.02.160/lib/mirror/mirrored.c log_flags |= DM_CORELOG; } -Index: LVM2.2.02.160/tools/lvconvert.c +Index: LVM2.2.02.164/tools/lvconvert.c =================================================================== ---- LVM2.2.02.160.orig/tools/lvconvert.c -+++ LVM2.2.02.160/tools/lvconvert.c -@@ -1321,15 +1321,6 @@ static int _lvconvert_mirrors_parse_para +--- LVM2.2.02.164.orig/tools/lvconvert.c ++++ LVM2.2.02.164/tools/lvconvert.c +@@ -1309,15 +1309,6 @@ static int _lvconvert_mirrors_parse_para *new_log_count = arg_int_value(cmd, mirrorlog_ARG, lp->corelog ? MIRROR_LOG_CORE : DEFAULT_MIRRORLOG); @@ -517,10 +517,10 @@ Index: LVM2.2.02.160/tools/lvconvert.c - * log daemon is multi-threaded. - */ - if ((*new_log_count == MIRROR_LOG_MIRRORED) && vg_is_clustered(lv->vg)) { -- log_error("Log type, \"mirrored\", is unavailable to cluster mirrors"); +- log_error("Log type, \"mirrored\", is unavailable to cluster mirrors."); - return 0; - } - - log_verbose("Setting logging type to %s", get_mirror_log_name(*new_log_count)); + log_verbose("Setting logging type to %s.", get_mirror_log_name(*new_log_count)); /* diff --git a/device-mapper.changes b/device-mapper.changes index 45983ee..c02338f 100644 --- a/device-mapper.changes +++ b/device-mapper.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Sep 2 08:23:06 UTC 2016 - tchvatal@suse.com + +- Update to 2.02.164 release, WHATS_NEW for changelog + * Mostly because the old tarball was no longer available + * Refresh fuzz on patch: + + make-mirror-legs-on-different-tag-pvs.patch + + cluster_support_mirrord_log.diff + ------------------------------------------------------------------- Fri Jul 8 13:43:41 UTC 2016 - tchvatal@suse.com diff --git a/device-mapper.spec b/device-mapper.spec index 85c8fd7..da5d2e2 100644 --- a/device-mapper.spec +++ b/device-mapper.spec @@ -17,8 +17,8 @@ ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.160 -%define device_mapper_version 1.02.130 +%define lvm2_version 2.02.164 +%define device_mapper_version 1.02.133 ### COMMON-DEF-END ### %define libname libdevmapper1_03 %define libname_event libdevmapper-event1_03 diff --git a/lvm2-clvm.changes b/lvm2-clvm.changes index 45983ee..c02338f 100644 --- a/lvm2-clvm.changes +++ b/lvm2-clvm.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Sep 2 08:23:06 UTC 2016 - tchvatal@suse.com + +- Update to 2.02.164 release, WHATS_NEW for changelog + * Mostly because the old tarball was no longer available + * Refresh fuzz on patch: + + make-mirror-legs-on-different-tag-pvs.patch + + cluster_support_mirrord_log.diff + ------------------------------------------------------------------- Fri Jul 8 13:43:41 UTC 2016 - tchvatal@suse.com diff --git a/lvm2-clvm.spec b/lvm2-clvm.spec index 784c0f4..69da22c 100644 --- a/lvm2-clvm.spec +++ b/lvm2-clvm.spec @@ -17,8 +17,8 @@ ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.160 -%define device_mapper_version 1.02.130 +%define lvm2_version 2.02.164 +%define device_mapper_version 1.02.133 ### COMMON-DEF-END ### Name: lvm2-clvm Version: %{lvm2_version} diff --git a/lvm2.changes b/lvm2.changes index 45983ee..c02338f 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Sep 2 08:23:06 UTC 2016 - tchvatal@suse.com + +- Update to 2.02.164 release, WHATS_NEW for changelog + * Mostly because the old tarball was no longer available + * Refresh fuzz on patch: + + make-mirror-legs-on-different-tag-pvs.patch + + cluster_support_mirrord_log.diff + ------------------------------------------------------------------- Fri Jul 8 13:43:41 UTC 2016 - tchvatal@suse.com diff --git a/lvm2.spec b/lvm2.spec index 708bfd7..60ad725 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -17,8 +17,8 @@ ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.160 -%define device_mapper_version 1.02.130 +%define lvm2_version 2.02.164 +%define device_mapper_version 1.02.133 ### COMMON-DEF-END ### %define _udevdir %(pkg-config --variable=udevdir udev) %define applib liblvm2app2_2 diff --git a/make-mirror-legs-on-different-tag-pvs.patch b/make-mirror-legs-on-different-tag-pvs.patch index e2342a9..4e22f18 100644 --- a/make-mirror-legs-on-different-tag-pvs.patch +++ b/make-mirror-legs-on-different-tag-pvs.patch @@ -25,11 +25,11 @@ Signed-off-by: Guangliang Zhao man/lvcreate.8.in | 4 ++++ 5 files changed, 60 insertions(+) -Index: LVM2.2.02.139/conf/example.conf.in +Index: LVM2.2.02.164/conf/example.conf.in =================================================================== ---- LVM2.2.02.139.orig/conf/example.conf.in -+++ LVM2.2.02.139/conf/example.conf.in -@@ -359,6 +359,23 @@ allocation { +--- LVM2.2.02.164.orig/conf/example.conf.in ++++ LVM2.2.02.164/conf/example.conf.in +@@ -372,6 +372,23 @@ allocation { # or erased unless the --wipesignatures option is used directly. wipe_signatures_when_zeroing_new_lvs = 1 @@ -53,13 +53,13 @@ Index: LVM2.2.02.139/conf/example.conf.in # Configuration option allocation/mirror_logs_require_separate_pvs. # Mirror logs and images will always use different PVs. # The default setting changed in version 2.02.85. -Index: LVM2.2.02.139/lib/config/config_settings.h +Index: LVM2.2.02.164/lib/config/config_settings.h =================================================================== ---- LVM2.2.02.139.orig/lib/config/config_settings.h -+++ LVM2.2.02.139/lib/config/config_settings.h -@@ -449,6 +449,9 @@ cfg(allocation_mirror_logs_require_separ - "Mirror logs and images will always use different PVs.\n" - "The default setting changed in version 2.02.85.\n") +--- LVM2.2.02.164.orig/lib/config/config_settings.h ++++ LVM2.2.02.164/lib/config/config_settings.h +@@ -473,6 +473,9 @@ cfg(allocation_raid_stripe_all_devices_C + "when the command does not specify the number of stripes to use.\n" + "This was the default behaviour until release 2.02.162.\n") +cfg(allocation_mirror_legs_require_separate_pvs_CFG, "mirror_legs_require_separate_pvs", allocation_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_MIRROR_LEGS_REQUIRE_SEPARATE_PVS, vsn(2, 2, 98), NULL, 0, NULL, + "Mirror legs will always use different PVs.\n") @@ -67,11 +67,11 @@ Index: LVM2.2.02.139/lib/config/config_settings.h cfg(allocation_cache_pool_metadata_require_separate_pvs_CFG, "cache_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2, 106), NULL, 0, NULL, "Cache pool metadata and data will always use different PVs.\n") -Index: LVM2.2.02.139/lib/config/defaults.h +Index: LVM2.2.02.164/lib/config/defaults.h =================================================================== ---- LVM2.2.02.139.orig/lib/config/defaults.h -+++ LVM2.2.02.139/lib/config/defaults.h -@@ -144,6 +144,7 @@ +--- LVM2.2.02.164.orig/lib/config/defaults.h ++++ LVM2.2.02.164/lib/config/defaults.h +@@ -157,6 +157,7 @@ #define DEFAULT_MAX_LV 0 #define DEFAULT_ALLOC_POLICY ALLOC_NORMAL #define DEFAULT_MIRROR_LOGS_REQUIRE_SEPARATE_PVS 0 @@ -79,11 +79,11 @@ Index: LVM2.2.02.139/lib/config/defaults.h #define DEFAULT_MAXIMISE_CLING 1 #define DEFAULT_CLUSTERED 0 -Index: LVM2.2.02.139/lib/metadata/lv_manip.c +Index: LVM2.2.02.164/lib/metadata/lv_manip.c =================================================================== ---- LVM2.2.02.139.orig/lib/metadata/lv_manip.c -+++ LVM2.2.02.139/lib/metadata/lv_manip.c -@@ -1550,6 +1550,9 @@ struct alloc_handle { +--- LVM2.2.02.164.orig/lib/metadata/lv_manip.c ++++ LVM2.2.02.164/lib/metadata/lv_manip.c +@@ -1519,6 +1519,9 @@ struct alloc_handle { unsigned maximise_cling; unsigned mirror_logs_separate; /* Force mirror logs on separate PVs? */ @@ -93,7 +93,7 @@ Index: LVM2.2.02.139/lib/metadata/lv_manip.c /* * RAID devices require a metadata area that accompanies each -@@ -2608,6 +2611,32 @@ static int _limit_to_one_area_per_tag(st +@@ -2600,6 +2603,32 @@ static int _limit_to_one_area_per_tag(st } /* @@ -126,7 +126,7 @@ Index: LVM2.2.02.139/lib/metadata/lv_manip.c * Returns 1 regardless of whether any space was found, except on error. */ static int _find_some_parallel_space(struct alloc_handle *ah, -@@ -2737,6 +2766,10 @@ static int _find_some_parallel_space(str +@@ -2729,6 +2758,10 @@ static int _find_some_parallel_space(str continue; case USE_AREA: @@ -137,7 +137,7 @@ Index: LVM2.2.02.139/lib/metadata/lv_manip.c /* * Except with ALLOC_ANYWHERE, replace first area with this * one which is smaller but still big enough. -@@ -3220,6 +3253,7 @@ static struct alloc_handle *_alloc_init( +@@ -3210,6 +3243,7 @@ static struct alloc_handle *_alloc_init( ah->parity_count = parity_count; ah->region_size = region_size; ah->alloc = alloc; @@ -145,7 +145,7 @@ Index: LVM2.2.02.139/lib/metadata/lv_manip.c /* * For the purposes of allocation, area_count and parity_count are -@@ -3231,6 +3265,7 @@ static struct alloc_handle *_alloc_init( +@@ -3221,6 +3255,7 @@ static struct alloc_handle *_alloc_init( ah->area_multiple = _calc_area_multiple(segtype, area_count + parity_count, stripes); //FIXME: s/mirror_logs_separate/metadata_separate/ so it can be used by others? ah->mirror_logs_separate = find_config_tree_bool(cmd, allocation_mirror_logs_require_separate_pvs_CFG, NULL); @@ -153,11 +153,11 @@ Index: LVM2.2.02.139/lib/metadata/lv_manip.c if (mirrors || stripes) total_extents = new_extents; -Index: LVM2.2.02.139/man/lvcreate.8.in +Index: LVM2.2.02.164/man/lvcreate.8.in =================================================================== ---- LVM2.2.02.139.orig/man/lvcreate.8.in -+++ LVM2.2.02.139/man/lvcreate.8.in -@@ -404,6 +404,10 @@ Using \fBcore\fP means the mirror is reg +--- LVM2.2.02.164.orig/man/lvcreate.8.in ++++ LVM2.2.02.164/man/lvcreate.8.in +@@ -418,6 +418,10 @@ Using \fBcore\fP means the mirror is reg from the first device each time the logical volume is activated, like after every reboot. .br