master - WHATS_NEW: update
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f0614e7cf05df969f97...
Commit: f0614e7cf05df969f9789f0746b820ce5cbb33a2
Parent: b722ce2f1000da1ed321d43ef4858d1dd5d567d8
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Aug 28 21:42:12 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Aug 28 21:43:03 2020 +0200
WHATS_NEW: update
---
WHATS_NEW | 2 ++
1 file changed, 2 insertions(+)
diff --git a/WHATS_NEW b/WHATS_NEW
index cdc491c83..d433ddf9a 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,7 @@
Version 2.03.11 -
==================================
+ Preserve uint32_t for seqno handling.
+ Switch from mmap to plain read when loading regular files.
Fix missing device closing on wiping error path.
Update lvmvdo man page and better explain DISCARD usage.
3 years, 3 months
master - gcc: drop bogus ;
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b722ce2f1000da1ed32...
Commit: b722ce2f1000da1ed321d43ef4858d1dd5d567d8
Parent: 19e9c88faf10bf2f9a2dd7da695b776163fb7bd4
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Aug 28 21:14:06 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Aug 28 21:43:03 2020 +0200
gcc: drop bogus ;
---
lib/metadata/metadata.c | 2 +-
lib/report/report.c | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index 4777d7923..bf3669b10 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -1945,7 +1945,7 @@ static int _lv_postorder_level(struct logical_volume *lv, void *data)
{
struct _lv_postorder_baton *baton = data;
return (data) ? _lv_postorder_visit(lv, baton->fn, baton->data) : 0;
-};
+}
static int _lv_postorder_visit(struct logical_volume *lv,
int (*fn)(struct logical_volume *lv, void *data),
diff --git a/lib/report/report.c b/lib/report/report.c
index 979cbee52..b0d514202 100644
--- a/lib/report/report.c
+++ b/lib/report/report.c
@@ -348,39 +348,39 @@ struct time_info {
static int _is_time_num(time_id_t id)
{
return ((id > TIME_NUM__START) && (id < TIME_NUM__END));
-};
+}
/*
static int _is_time_frame(time_id_t id)
{
return ((id > TIME_FRAME__START) && (id < TIME_FRAME__END));
-};
+}
*/
static int _is_time_label_date(time_id_t id)
{
return ((id > TIME_LABEL_DATE__START) && (id < TIME_LABEL_DATE__END));
-};
+}
static int _is_time_label_time(time_id_t id)
{
return ((id > TIME_LABEL_TIME__START) && (id < TIME_LABEL_TIME__END));
-};
+}
static int _is_time_unit(time_id_t id)
{
return ((id > TIME_UNIT__START) && (id < TIME_UNIT__END));
-};
+}
static int _is_time_weekday(time_id_t id)
{
return ((id > TIME_WEEKDAY__START) && (id < TIME_WEEKDAY__END));
-};
+}
static int _is_time_month(time_id_t id)
{
return ((id > TIME_MONTH__START) && (id < TIME_MONTH__END));
-};
+}
static const char *_skip_space(const char *s)
{
3 years, 3 months
master - gcc: do not use return with void function
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=19e9c88faf10bf2f9a2...
Commit: 19e9c88faf10bf2f9a2dd7da695b776163fb7bd4
Parent: ee0cb17608d2e9f6d92ea339e121713312c3f84f
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Aug 28 19:33:49 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Aug 28 21:43:03 2020 +0200
gcc: do not use return with void function
Follow C norm and do not use 'return' in void function to call other
functions.
---
daemons/lvmlockd/lvmlockd-client.h | 2 +-
lib/label/hints.c | 2 +-
libdm/dm-tools/dmsetup.c | 12 ++++++++----
libdm/libdm-stats.c | 6 ++++--
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/daemons/lvmlockd/lvmlockd-client.h b/daemons/lvmlockd/lvmlockd-client.h
index 62ffb732a..1d49dded8 100644
--- a/daemons/lvmlockd/lvmlockd-client.h
+++ b/daemons/lvmlockd/lvmlockd-client.h
@@ -33,7 +33,7 @@ static inline daemon_handle lvmlockd_open(const char *sock)
static inline void lvmlockd_close(daemon_handle h)
{
- return daemon_close(h);
+ daemon_close(h);
}
/*
diff --git a/lib/label/hints.c b/lib/label/hints.c
index fdc0bd6c0..3125ae01d 100644
--- a/lib/label/hints.c
+++ b/lib/label/hints.c
@@ -354,7 +354,7 @@ void hints_exit(struct cmd_context *cmd)
free_hints(&cmd->hints);
if (_hints_fd == -1)
return;
- return _unlock_hints(cmd);
+ _unlock_hints(cmd);
}
void free_hints(struct dm_list *hints)
diff --git a/libdm/dm-tools/dmsetup.c b/libdm/dm-tools/dmsetup.c
index d01b8f2e8..bf2762ae7 100644
--- a/libdm/dm-tools/dmsetup.c
+++ b/libdm/dm-tools/dmsetup.c
@@ -6359,13 +6359,17 @@ static void _usage(FILE *out)
{
switch (_base_commands[_base_command].type) {
case DMSETUP_TYPE:
- return _dmsetup_usage(out);
+ _dmsetup_usage(out);
+ break;
case LOSETUP_TYPE:
- return _losetup_usage(out);
+ _losetup_usage(out);
+ break;
case STATS_TYPE:
- return _stats_usage(out);
+ _stats_usage(out);
+ break;
case DEVMAP_NAME_TYPE:
- return _devmap_name_usage(out);
+ _devmap_name_usage(out);
+ break;
}
}
diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c
index 05971bdad..5379bed5e 100644
--- a/libdm/libdm-stats.c
+++ b/libdm/libdm-stats.c
@@ -1459,8 +1459,10 @@ static void _stats_walk_start(const struct dm_stats *dms, uint64_t *flags,
if (!dms->regions)
return;
- if (!(*flags & (DM_STATS_WALK_AREA | DM_STATS_WALK_REGION)))
- return _group_walk_start(dms, flags, cur_r, cur_a, cur_g);
+ if (!(*flags & (DM_STATS_WALK_AREA | DM_STATS_WALK_REGION))) {
+ _group_walk_start(dms, flags, cur_r, cur_a, cur_g);
+ return;
+ }
/* initialise cursor state */
*cur_a = 0;
3 years, 3 months
master - gcc: use apropriate type for reading and printing values
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ee0cb17608d2e9f6d92...
Commit: ee0cb17608d2e9f6d92ea339e121713312c3f84f
Parent: b918afb693a62938e8189a5d07b13df8007ae062
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Aug 28 19:35:25 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Aug 28 21:43:03 2020 +0200
gcc: use apropriate type for reading and printing values
---
device_mapper/ioctl/libdm-iface.c | 2 +-
device_mapper/libdm-common.c | 2 +-
device_mapper/mm/pool.c | 2 +-
lib/label/hints.c | 2 +-
lib/label/label.c | 2 +-
lib/metadata/metadata.c | 8 ++++----
lib/metadata/vg.c | 4 ++--
lib/mm/memlock.c | 2 +-
libdm/ioctl/libdm-iface.c | 2 +-
libdm/libdm-common.c | 2 +-
libdm/libdm-stats.c | 2 +-
libdm/mm/pool.c | 2 +-
12 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/device_mapper/ioctl/libdm-iface.c b/device_mapper/ioctl/libdm-iface.c
index 25e7d1a75..8e7240673 100644
--- a/device_mapper/ioctl/libdm-iface.c
+++ b/device_mapper/ioctl/libdm-iface.c
@@ -205,7 +205,7 @@ static int _get_proc_number(const char *file, const char *name,
}
while (getline(&line, &len, fl) != -1) {
- if (sscanf(line, "%d %255s\n", &num, &nm[0]) == 2) {
+ if (sscanf(line, "%u %255s\n", &num, &nm[0]) == 2) {
if (!strcmp(name, nm)) {
if (number) {
*number = num;
diff --git a/device_mapper/libdm-common.c b/device_mapper/libdm-common.c
index bc691d629..b6d08f557 100644
--- a/device_mapper/libdm-common.c
+++ b/device_mapper/libdm-common.c
@@ -512,7 +512,7 @@ int unmangle_string(const char *str, const char *str_name, size_t len,
int strict = mode != DM_STRING_MANGLING_NONE;
char str_rest[DM_NAME_LEN];
size_t i, j;
- int code;
+ unsigned int code;
int r = 0;
if (!str || !buf)
diff --git a/device_mapper/mm/pool.c b/device_mapper/mm/pool.c
index b6478c54b..18df7ca1e 100644
--- a/device_mapper/mm/pool.c
+++ b/device_mapper/mm/pool.c
@@ -98,7 +98,7 @@ void dm_pools_check_leaks(void)
p->orig_pool,
p->name, p->stats.bytes);
#else
- log_error(" [%p] %s", p, p->name);
+ log_error(" [%p] %s", (void *)p, p->name);
#endif
}
pthread_mutex_unlock(&_dm_pools_mutex);
diff --git a/lib/label/hints.c b/lib/label/hints.c
index efa02f7c5..fdc0bd6c0 100644
--- a/lib/label/hints.c
+++ b/lib/label/hints.c
@@ -737,7 +737,7 @@ static int _read_hint_file(struct cmd_context *cmd, struct dm_list *hints, int *
keylen = strlen("scan_lvs:");
if (!strncmp(_hint_line, "scan_lvs:", keylen)) {
- int scan_lvs = 0;
+ unsigned scan_lvs = 0;
if ((sscanf(_hint_line + keylen, "%u", &scan_lvs) != 1) ||
scan_lvs != cmd->scan_lvs) {
log_debug("ignore hints with different or unreadable scan_lvs");
diff --git a/lib/label/label.c b/lib/label/label.c
index 4d37ceff6..4d369d4f1 100644
--- a/lib/label/label.c
+++ b/lib/label/label.c
@@ -716,7 +716,7 @@ static int _scan_list(struct cmd_context *cmd, struct dev_filter *f,
dev_name(devl->dev),
(int)MAJOR(devl->dev->dev),
(int)MINOR(devl->dev->dev),
- devl->dev->bcache_fd, bb);
+ devl->dev->bcache_fd, (void *)bb);
ret = _process_block(cmd, f, devl->dev, bb, 0, 0, &is_lvm_device);
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index c0d42066d..4777d7923 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -5239,9 +5239,9 @@ struct volume_group *vg_read(struct cmd_context *cmd, const char *vg_name, const
dm_config_destroy(cft);
} else {
if (vg->vg_precommitted)
- log_error(INTERNAL_ERROR "vg_read vg %p vg_precommitted %p", vg, vg->vg_precommitted);
+ log_error(INTERNAL_ERROR "vg_read vg %p vg_precommitted %p", (void *)vg, (void *)vg->vg_precommitted);
if (vg->vg_committed)
- log_error(INTERNAL_ERROR "vg_read vg %p vg_committed %p", vg, vg->vg_committed);
+ log_error(INTERNAL_ERROR "vg_read vg %p vg_committed %p", (void *)vg, (void *)vg->vg_committed);
}
out:
/* We return with the VG lock held when read is successful. */
@@ -5265,9 +5265,9 @@ bad:
*/
if (error_vg && vg) {
if (vg->vg_precommitted)
- log_error(INTERNAL_ERROR "vg_read vg %p vg_precommitted %p", vg, vg->vg_precommitted);
+ log_error(INTERNAL_ERROR "vg_read vg %p vg_precommitted %p", (void *)vg, (void *)vg->vg_precommitted);
if (vg->vg_committed)
- log_error(INTERNAL_ERROR "vg_read vg %p vg_committed %p", vg, vg->vg_committed);
+ log_error(INTERNAL_ERROR "vg_read vg %p vg_committed %p", (void *)vg, (void *)vg->vg_committed);
/* caller must unlock_vg and release_vg */
*error_vg = vg;
diff --git a/lib/metadata/vg.c b/lib/metadata/vg.c
index beddf73de..a809115f6 100644
--- a/lib/metadata/vg.c
+++ b/lib/metadata/vg.c
@@ -61,7 +61,7 @@ struct volume_group *alloc_vg(const char *pool_name, struct cmd_context *cmd,
dm_list_init(&vg->removed_historical_lvs);
dm_list_init(&vg->removed_pvs);
- log_debug_mem("Allocated VG %s at %p.", vg->name ? : "<no name>", vg);
+ log_debug_mem("Allocated VG %s at %p.", vg->name ? : "<no name>", (void *)vg);
return vg;
}
@@ -76,7 +76,7 @@ static void _free_vg(struct volume_group *vg)
return;
}
- log_debug_mem("Freeing VG %s at %p.", vg->name ? : "<no name>", vg);
+ log_debug_mem("Freeing VG %s at %p.", vg->name ? : "<no name>", (void *)vg);
dm_hash_destroy(vg->hostnames);
dm_pool_destroy(vg->vgmem);
diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c
index aa47d665b..b06bbc82c 100644
--- a/lib/mm/memlock.c
+++ b/lib/mm/memlock.c
@@ -232,7 +232,7 @@ static int _maps_line(const struct dm_config_node *cn, lvmlock_t lock,
const char *line, size_t *mstats)
{
const struct dm_config_value *cv;
- long from, to;
+ unsigned long from, to;
int pos;
unsigned i;
char fr, fw, fx, fp;
diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c
index 7ad549c91..f4be478da 100644
--- a/libdm/ioctl/libdm-iface.c
+++ b/libdm/ioctl/libdm-iface.c
@@ -204,7 +204,7 @@ static int _get_proc_number(const char *file, const char *name,
}
while (getline(&line, &len, fl) != -1) {
- if (sscanf(line, "%d %255s\n", &num, &nm[0]) == 2) {
+ if (sscanf(line, "%u %255s\n", &num, &nm[0]) == 2) {
if (!strcmp(name, nm)) {
if (number) {
*number = num;
diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c
index d75c7046c..466c74bb9 100644
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
@@ -510,7 +510,7 @@ int unmangle_string(const char *str, const char *str_name, size_t len,
int strict = mode != DM_STRING_MANGLING_NONE;
char str_rest[DM_NAME_LEN];
size_t i, j;
- int code;
+ unsigned int code;
int r = 0;
if (!str || !buf)
diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c
index 420e3e181..05971bdad 100644
--- a/libdm/libdm-stats.c
+++ b/libdm/libdm-stats.c
@@ -403,7 +403,7 @@ static int _stats_bound(const struct dm_stats *dms)
if (dms->bind_major > 0 || dms->bind_name || dms->bind_uuid)
return 1;
/* %p format specifier expects a void pointer. */
- log_error("Stats handle at %p is not bound.", dms);
+ log_error("Stats handle at %p is not bound.", (const void *)dms);
return 0;
}
diff --git a/libdm/mm/pool.c b/libdm/mm/pool.c
index 26f43a787..f3e1d1a34 100644
--- a/libdm/mm/pool.c
+++ b/libdm/mm/pool.c
@@ -98,7 +98,7 @@ void dm_pools_check_leaks(void)
p->orig_pool,
p->name, p->stats.bytes);
#else
- log_error(" [%p] %s", p, p->name);
+ log_error(" [%p] %s", (void *)p, p->name);
#endif
}
pthread_mutex_unlock(&_dm_pools_mutex);
3 years, 3 months
master - tools: move struct element before variable lenght list
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b918afb693a62938e81...
Commit: b918afb693a62938e8189a5d07b13df8007ae062
Parent: 7880896f0dbe730e7b47aa8040544434813eacc4
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Aug 28 19:15:42 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Aug 28 21:43:02 2020 +0200
tools: move struct element before variable lenght list
Move prio field before 'variable' struct array field.
Interesting why this has not been catched yet.
TODO: think about test case
---
tools/tools.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/tools.h b/tools/tools.h
index c3d780d36..4b944e2fd 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -109,8 +109,8 @@ struct arg_values {
struct arg_value_group_list {
struct dm_list list;
- struct arg_values arg_values[0];
uint32_t prio;
+ struct arg_values arg_values[0];
};
#define PERMITTED_READ_ONLY 0x00000002
3 years, 3 months
master - gcc: calc size in compile time
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7880896f0dbe730e7b4...
Commit: 7880896f0dbe730e7b47aa8040544434813eacc4
Parent: fd8d926fc52badc93f7985b5db2f4cb6a75e81e4
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Aug 28 18:58:55 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Aug 28 21:43:02 2020 +0200
gcc: calc size in compile time
---
lib/device/dev-md.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/device/dev-md.c b/lib/device/dev-md.c
index 23ce41af1..8fe7fc361 100644
--- a/lib/device/dev-md.c
+++ b/lib/device/dev-md.c
@@ -50,7 +50,7 @@ static int _dev_has_md_magic(struct device *dev, uint64_t sb_offset)
}
#define IMSM_SIGNATURE "Intel Raid ISM Cfg Sig. "
-#define IMSM_SIG_LEN (strlen(IMSM_SIGNATURE))
+#define IMSM_SIG_LEN (sizeof(IMSM_SIGNATURE) - 1)
static int _dev_has_imsm_magic(struct device *dev, uint64_t devsize_sectors)
{
3 years, 3 months
master - gcc: avoid stack alloc arithmetic
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=fd8d926fc52badc93f7...
Commit: fd8d926fc52badc93f7985b5db2f4cb6a75e81e4
Parent: ce202c3b1c018a001015fa2ff69a01f06d84a6fa
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Aug 28 18:46:06 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Aug 28 21:43:02 2020 +0200
gcc: avoid stack alloc arithmetic
---
tools/lvconvert.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 524ed5a33..afc581377 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -1161,6 +1161,8 @@ static int _lvconvert_validate_thin(struct logical_volume *lv,
static int _raid_split_image_conversion(struct logical_volume *lv)
{
const char *s;
+ char raidlv_name[NAME_LEN];
+ const struct logical_volume *tmp_lv;
if (lv_is_raid_with_tracking(lv)) {
log_error("Conversion of tracking raid1 LV %s is not supported.",
@@ -1170,12 +1172,7 @@ static int _raid_split_image_conversion(struct logical_volume *lv)
if (lv_is_raid_image(lv) &&
(s = strstr(lv->name, "_rimage_"))) {
- size_t len = s - lv->name;
- char raidlv_name[len + 1];
- const struct logical_volume *tmp_lv;
-
- strncpy(raidlv_name, lv->name, len);
- raidlv_name[len] = '\0';
+ (void) dm_strncpy(raidlv_name, lv->name, s - lv->name);
if (!(tmp_lv = find_lv(lv->vg, raidlv_name))) {
log_error(INTERNAL_ERROR "Failed to find RaidLV of RAID subvolume %s.",
3 years, 3 months
master - gcc: keep unsigned arithmetic
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ce202c3b1c018a00101...
Commit: ce202c3b1c018a001015fa2ff69a01f06d84a6fa
Parent: ff4827ffb1dbd568b988716c63634c96eb4c1e15
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Aug 28 19:55:01 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Aug 28 21:43:02 2020 +0200
gcc: keep unsigned arithmetic
Avoid conversion to int.
---
lib/device/bcache.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/device/bcache.c b/lib/device/bcache.c
index 7e7e18542..03cd4be87 100644
--- a/lib/device/bcache.c
+++ b/lib/device/bcache.c
@@ -66,7 +66,7 @@ struct cb_set {
static struct cb_set *_cb_set_create(unsigned nr)
{
- int i;
+ unsigned i;
struct cb_set *cbs = malloc(sizeof(*cbs));
if (!cbs)
3 years, 3 months
master - lv_manip: get_default_region_size return uint32_t
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ff4827ffb1dbd568b98...
Commit: ff4827ffb1dbd568b988716c63634c96eb4c1e15
Parent: 93c9055591d8311cb361909f719964cdfa79e209
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Aug 28 20:07:34 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Aug 28 21:43:02 2020 +0200
lv_manip: get_default_region_size return uint32_t
---
lib/metadata/lv_manip.c | 4 ++--
lib/metadata/metadata-exported.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index bb2ad5beb..c47ec72e2 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -829,7 +829,7 @@ static int _round_down_pow2(int r)
return r & ~(r >> 1);
}
-int get_default_region_size(struct cmd_context *cmd)
+uint32_t get_default_region_size(struct cmd_context *cmd)
{
int pagesize = lvm_getpagesize();
int region_size = _get_default_region_size(cmd);
@@ -846,7 +846,7 @@ int get_default_region_size(struct cmd_context *cmd)
region_size / 2);
}
- return region_size;
+ return (uint32_t) region_size;
}
int add_seg_to_segs_using_this_lv(struct logical_volume *lv,
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index 06ea757b8..db41ca36c 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -1152,7 +1152,7 @@ int vg_max_lv_reached(struct volume_group *vg);
/*
* Mirroring functions
*/
-int get_default_region_size(struct cmd_context *cmd); /* in lv_manip.c */
+uint32_t get_default_region_size(struct cmd_context *cmd); /* in lv_manip.c */
struct lv_segment *find_mirror_seg(struct lv_segment *seg);
int lv_add_mirrors(struct cmd_context *cmd, struct logical_volume *lv,
uint32_t mirrors, uint32_t stripes, uint32_t stripe_size,
3 years, 3 months
master - lvmcache: use uint32_t for seqno caching
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=93c9055591d8311cb36...
Commit: 93c9055591d8311cb361909f719964cdfa79e209
Parent: 03f9cd95b4bad1e055ce932742426b0724f607c3
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Aug 28 19:48:40 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Aug 28 21:43:02 2020 +0200
lvmcache: use uint32_t for seqno caching
---
lib/cache/lvmcache.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c
index b1d05fb07..147d0f1cc 100644
--- a/lib/cache/lvmcache.c
+++ b/lib/cache/lvmcache.c
@@ -42,9 +42,9 @@ struct lvmcache_info {
bool mda1_bad; /* label scan found bad metadata in mda1 */
bool mda2_bad; /* label scan found bad metadata in mda2 */
bool summary_seqno_mismatch; /* two mdas on this dev has mismatching metadata */
- int summary_seqno; /* vg seqno found on this dev during scan */
- int mda1_seqno;
- int mda2_seqno;
+ uint32_t summary_seqno; /* vg seqno found on this dev during scan */
+ uint32_t mda1_seqno;
+ uint32_t mda2_seqno;
};
/* One per VG */
@@ -63,7 +63,7 @@ struct lvmcache_vginfo {
char *lock_type;
uint32_t mda_checksum;
size_t mda_size;
- int seqno;
+ uint32_t seqno;
bool scan_summary_mismatch; /* vgsummary from devs had mismatching seqno or checksum */
bool has_duplicate_local_vgname; /* this local vg and another local vg have same name */
bool has_duplicate_foreign_vgname; /* this foreign vg and another foreign vg have same name */
3 years, 3 months