packages/lvm2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade version to 2.03.18

Browse Source
This commit is contained in:
wangzhiqiang 2023-01-30 11:50:10 +08:00
parent 0a8e3b03bc
commit a266e89b13
5 changed files with 27 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0007-enhancement-add-dfx-log.patch
View File

@ -1,4 +1,4 @@
From 8ad1c3ae7c08a4edbe597e058e07f09d86a03df3 Mon Sep 17 00:00:00 2001
From 658319601eb89299813430fce63382b08e06827d Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Tue, 19 Mar 2019 16:43:16 +0800
Subject: [PATCH] add dfx log when error occur, or lvm resource change, it will
@ -18,10 +18,10 @@ Signed-off-by: wangjufeng<wangjufeng@huawei.com>
9 files changed, 66 insertions(+), 3 deletions(-)
diff --git a/conf/example.conf.in b/conf/example.conf.in
index 09aa8b5..7fa6731 100644
index c165e08..19a849b 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -862,6 +862,11 @@ log {
@@ -861,6 +861,11 @@ log {
# This configuration option has an automatic default value.
level = 3
@ -34,7 +34,7 @@ index 09aa8b5..7fa6731 100644
# Indent messages according to their severity.
# This configuration option has an automatic default value.
diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c
index 4cb81bf..69a2e20 100644
index b630554..08c2d7d 100644
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -51,6 +51,8 @@
@ -60,11 +60,11 @@ index 4cb81bf..69a2e20 100644
_destroy_segtypes(&cmd->segtypes);
_destroy_formats(cmd, &cmd->formats);
_destroy_filters(cmd);
+ set_global_cmdline(NULL);
devices_file_exit(cmd);
+ set_global_cmdline(NULL);
dev_cache_exit();
_destroy_dev_types(cmd);
@@ -2080,3 +2086,13 @@ void destroy_toolcontext(struct cmd_context *cmd)
_destroy_tags(cmd);
@@ -2079,3 +2085,13 @@ void destroy_toolcontext(struct cmd_context *cmd)
fin_syslog();
reset_lvm_errno(0);
}
@ -79,10 +79,10 @@ index 4cb81bf..69a2e20 100644
+ global_cmdline = cmdline;
+}
diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h
index f16322d..bc935b1 100644
index 7f5fd12..2ea21d4 100644
--- a/lib/commands/toolcontext.h
+++ b/lib/commands/toolcontext.h
@@ -50,6 +50,7 @@ struct config_info {
@@ -51,6 +51,7 @@ struct config_info {
mode_t umask;
char unit_type;
char _padding[1];
@ -90,7 +90,7 @@ index f16322d..bc935b1 100644
};
struct dm_config_tree;
@@ -303,4 +304,7 @@ struct format_type *get_format_by_name(struct cmd_context *cmd, const char *form
@@ -308,4 +309,7 @@ struct format_type *get_format_by_name(struct cmd_context *cmd, const char *form
const char *system_id_from_string(struct cmd_context *cmd, const char *str);
@ -99,10 +99,10 @@ index f16322d..bc935b1 100644
+void set_global_cmdline(char *cmdline);
#endif
diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
index ea12957..33ceb1a 100644
index 9036025..cc17435 100644
--- a/lib/config/config_settings.h
+++ b/lib/config/config_settings.h
@@ -887,6 +887,11 @@ cfg(log_level_CFG, "level", log_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_INT
@@ -900,6 +900,11 @@ cfg(log_level_CFG, "level", log_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_INT
"There are 6 syslog-like log levels currently in use: 2 to 7 inclusive.\n"
"7 is the most verbose (LOG_DEBUG).\n")
@ -115,7 +115,7 @@ index ea12957..33ceb1a 100644
"Indent messages according to their severity.\n")
diff --git a/lib/log/log.c b/lib/log/log.c
index 5771a1d..f185109 100644
index 118a3ba..86a3034 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -19,6 +19,7 @@
@ -126,7 +126,7 @@ index 5771a1d..f185109 100644
#include <stdio.h>
#include <stdarg.h>
@@ -509,6 +510,7 @@ static void _vprint_log(int level, const char *file, int line, int dm_errno_or_c
@@ -510,6 +511,7 @@ static void _vprint_log(int level, const char *file, int line, int dm_errno_or_c
const char *trformat; /* Translated format string */
char *newbuf;
int use_stderr = log_stderr(level);
@ -134,7 +134,7 @@ index 5771a1d..f185109 100644
int log_once = log_once(level);
int log_bypass_report = log_bypass_report(level);
int fatal_internal_error = 0;
@@ -521,7 +523,9 @@ static void _vprint_log(int level, const char *file, int line, int dm_errno_or_c
@@ -522,7 +524,9 @@ static void _vprint_log(int level, const char *file, int line, int dm_errno_or_c
struct dm_report *orig_report;
int logged_via_report = 0;
@ -144,7 +144,7 @@ index 5771a1d..f185109 100644
if (_abort_on_internal_errors_env_present < 0) {
if ((env_str = getenv("DM_ABORT_ON_INTERNAL_ERRORS"))) {
@@ -714,8 +718,8 @@ static void _vprint_log(int level, const char *file, int line, int dm_errno_or_c
@@ -715,8 +719,8 @@ static void _vprint_log(int level, const char *file, int line, int dm_errno_or_c
va_end(ap);
}
@ -155,7 +155,7 @@ index 5771a1d..f185109 100644
if (fatal_internal_error)
abort();
return;
@@ -758,6 +762,19 @@ static void _vprint_log(int level, const char *file, int line, int dm_errno_or_c
@@ -759,6 +763,19 @@ static void _vprint_log(int level, const char *file, int line, int dm_errno_or_c
if (_syslog && (_log_while_suspended || !critical_section())) {
va_copy(ap, orig_ap);
@ -237,10 +237,10 @@ index a54001c..8ae55f6 100644
+int get_log_unless_silent(void);
#endif
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 1e3547e..9d47399 100644
index a5bb6a5..5980204 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -3119,6 +3119,7 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
@@ -3139,6 +3139,7 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
/* The cmd_line string is only used for logging, not processing. */
if (!(cmd->cmd_line = _copy_command_line(cmd, argc, argv)))
return_ECMD_FAILED;
@ -249,5 +249,5 @@ index 1e3547e..9d47399 100644
/* Look up command - will be NULL if not recognised */
if (!(cmd->cname = find_command_name(cmd->name)))
--
2.27.0
2.33.0

35
0013-_vg_read_raw_area-fix-segfault-caused-by-using-null-.patch
View File

@ -1,35 +0,0 @@
From ce58e9d5b37c3e408f2b41c8095980490a87f2a4 Mon Sep 17 00:00:00 2001
From: Wu Guanghao <wuguanghao3@huawei.com>
Date: Mon, 15 Aug 2022 09:39:02 -0500
Subject: [PATCH] _vg_read_raw_area: fix segfault caused by using null pointer
When we tested lvm2, the kernel injected various random faults.
(gdb) bt
...
(gdb) p vg
$1 = (struct volume_group *) 0x0
(gdb) p use_previous_vg
$2 = (unsigned int *) 0x0
Signed-off-by: Wu Guanghao <wuguanghao3@huawei.com>
---
lib/format_text/format-text.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c
index 07aaa0b28..c1ccdb031 100644
--- a/lib/format_text/format-text.c
+++ b/lib/format_text/format-text.c
@@ -428,7 +428,7 @@ static struct volume_group *_vg_read_raw_area(struct cmd_context *cmd,
rlocn->checksum,
&when, &desc);
- if (!vg && !*use_previous_vg) {
+ if (!vg && (!use_previous_vg || !*use_previous_vg)) {
log_warn("WARNING: Failed to read metadata text at %llu off %llu size %llu VG %s on %s",
(unsigned long long)(area->start + rlocn->offset),
(unsigned long long)rlocn->offset,
--
2.34.1

BIN
LVM2.2.03.16.tgz
View File

Binary file not shown.

BIN
LVM2.2.03.18.tgz Normal file
View File

Binary file not shown.

11
lvm2.spec
View File

@ -42,13 +42,13 @@
%global dlm_version 4.0.6-2
Name: lvm2
Version: 2.03.16
Release: 2
Version: 2.03.18
Release: 1
Epoch: 8
Summary: Tools for logical volume management
License: GPLv2+ and LGPLv2.1 and BSD
URL: http://sourceware.org/lvm2
Source0: https://sourceware.org/pub/lvm2/releases/LVM2.2.03.16.tgz
Source0: https://sourceware.org/pub/lvm2/releases/LVM2.2.03.18.tgz
Patch1: 0001-lvm2-set-default-preferred_names.patch
Patch2: 0002-lvm2-default-allow-changes-with-duplicate-pvs.patch
Patch3: 0003-bugfix-lvm2-add-SSD.patch
@ -61,7 +61,6 @@ Patch9: 0009-enhancement-log-it-when-disk-slow.patch
Patch10: 0010-bugfix-lvm2-fix-the-reuse-of-va_list.patch
Patch11: 0011-13-dm-disk.rules-check-DM_NAME-before-create-symlink.patch
Patch12: 0012-lvm-code-reduce-cyclomatic-complexity.patch
Patch13: 0013-_vg_read_raw_area-fix-segfault-caused-by-using-null-.patch
BuildRequires: gcc
BuildRequires: gcc-c++
@ -376,6 +375,7 @@ fi
%{_sbindir}/vg*
%{_sbindir}/lvmdevices
%{_sbindir}/lvm_import_vdo
%attr(755, -, -) %{_libexecdir}/lvresize_fs_helper
%{_prefix}/lib/udev/rules.d/69-dm-lvm.rules
%{_prefix}/lib/udev/rules.d/11-dm-lvm.rules
@ -487,6 +487,9 @@ fi
%changelog
* Mon Jan 30 2023 wangzhiqiang <wangzhiqiang95@huawei.com> - 8:2.03.18-1
- upgrade version to 2.03.18
* Thu Nov 3 2022 wuzx<wuzx1226@qq.com> - 8:2.03.16-2
- Add sw64 architecture