public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2 lib/format_text/format-text.c ./WHATS_NEW
@ 2010-08-03 18:19 snitzer
0 siblings, 0 replies; 3+ messages in thread
From: snitzer @ 2010-08-03 18:19 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: snitzer@sourceware.org 2010-08-03 18:19:43
Modified files:
lib/format_text: format-text.c
. : WHATS_NEW
Log message:
Avoid changing aligned pe_start as a side-effect of very verbose logging.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_text/format-text.c.diff?cvsroot=lvm2&r1=1.141&r2=1.142
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1693&r2=1.1694
--- LVM2/lib/format_text/format-text.c 2010/07/09 15:34:44 1.141
+++ LVM2/lib/format_text/format-text.c 2010/08/03 18:19:42 1.142
@@ -1498,7 +1498,7 @@
adjustment =
(pv->pe_start - pv->pe_align_offset) % pv->pe_align;
if (adjustment)
- pv->pe_start += pv->pe_align - adjustment;
+ pv->pe_start += (pv->pe_align - adjustment);
log_very_verbose("%s: setting pe_start=%" PRIu64
" (orig_pe_start=%" PRIu64 ", "
@@ -1506,7 +1506,7 @@
"adjustment=%" PRIu64 ")",
pv_dev_name(pv), pv->pe_start,
(adjustment ?
- pv->pe_start -= pv->pe_align - adjustment :
+ pv->pe_start - (pv->pe_align - adjustment) :
pv->pe_start),
pv->pe_align, pv->pe_align_offset, adjustment);
}
--- LVM2/WHATS_NEW 2010/08/03 13:24:07 1.1693
+++ LVM2/WHATS_NEW 2010/08/03 18:19:43 1.1694
@@ -1,5 +1,6 @@
Version 2.02.73 -
================================
+ Avoid changing aligned pe_start as a side-effect of very verbose logging.
Fix 'void*' arithmetic warnings in dbg_malloc.c.
Fix 'void*' arithmetic warning in some functions from libdm-iface.c.
Fix const warning in dev_manager_info() and _dev_manager_lv_rmnodes().
^ permalink raw reply [flat|nested] 3+ messages in thread
* LVM2 lib/format_text/format-text.c ./WHATS_NEW
@ 2010-06-22 19:18 wysochanski
0 siblings, 0 replies; 3+ messages in thread
From: wysochanski @ 2010-06-22 19:18 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: wysochanski@sourceware.org 2010-06-22 19:18:28
Modified files:
lib/format_text: format-text.c
. : WHATS_NEW
Log message:
Add device name to output of error messages in raw_read_mda_header().
It would be helpful if we had the device name when something like
a mda_header checksum error occurs.
Before:
./tools/lvm pvs -opv_name,vg_name,uuid,mda_count,pv_mda_count_ignored,vg_mda_count,vg_mda_count_ignored,vg_mda_copies
Incorrect metadata area header checksum
PV VG PV UUID #PMda #PMdaIgn #VMda #VMdaIgn #VMdaCps
/dev/loop0 vgtest2 sVv26t-gjpb-Rcau-uBDO-Cx04-GbRR-6Ssq7e 2 0 4 0 4
/dev/loop1 vgtest2 zXWStT-qE8F-mbkc-RfgH-aytv-mptF-Y5Ce09 2 0 4 0 4
/dev/loop2 riCpK9-9G8r-LlIp-i2oh-mb3N-CUzk-u5YpuR 1 0 0 0 0
/dev/loop3 vgtest tQCUjm-rmyd-i92d-4eeE-UYBW-v1vQ-kRaA17 2 0 4 2 0
/dev/loop4 vgtest ZRvpeI-p8F1-ccVW-BBac-xhl1-aGXU-CbP0oo 2 2 4 2 0
After:
./tools/lvm pvs -opv_name,vg_name,uuid,mda_count,pv_mda_count_ignored,vg_mda_count,vg_mda_count_ignored,vg_mda_copies
Incorrect metadata area header checksum on /dev/loop2 at offset 4096
PV VG PV UUID #PMda #PMdaIgn #VMda #VMdaIgn #VMdaCps
/dev/loop0 vgtest2 sVv26t-gjpb-Rcau-uBDO-Cx04-GbRR-6Ssq7e 2 0 4 0 4
/dev/loop1 vgtest2 zXWStT-qE8F-mbkc-RfgH-aytv-mptF-Y5Ce09 2 0 4 0 4
/dev/loop2 riCpK9-9G8r-LlIp-i2oh-mb3N-CUzk-u5YpuR 1 0 0 0 0
/dev/loop3 vgtest tQCUjm-rmyd-i92d-4eeE-UYBW-v1vQ-kRaA17 2 0 4 2 0
/dev/loop4 vgtest ZRvpeI-p8F1-ccVW-BBac-xhl1-aGXU-CbP0oo 2 2 4 2 0
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_text/format-text.c.diff?cvsroot=lvm2&r1=1.122&r2=1.123
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1624&r2=1.1625
--- LVM2/lib/format_text/format-text.c 2010/06/01 12:08:50 1.122
+++ LVM2/lib/format_text/format-text.c 2010/06/22 19:18:27 1.123
@@ -311,26 +311,32 @@
if (mdah->checksum_xl != xlate32(calc_crc(INITIAL_CRC, mdah->magic,
MDA_HEADER_SIZE -
sizeof(mdah->checksum_xl)))) {
- log_error("Incorrect metadata area header checksum");
+ log_error("Incorrect metadata area header checksum on %s"
+ " at offset %"PRIu64, dev_name(dev_area->dev),
+ dev_area->start);
goto bad;
}
_xlate_mdah(mdah);
if (strncmp((char *)mdah->magic, FMTT_MAGIC, sizeof(mdah->magic))) {
- log_error("Wrong magic number in metadata area header");
+ log_error("Wrong magic number in metadata area header on %s"
+ " at offset %"PRIu64, dev_name(dev_area->dev),
+ dev_area->start);
goto bad;
}
if (mdah->version != FMTT_VERSION) {
- log_error("Incompatible metadata area header version: %d",
- mdah->version);
+ log_error("Incompatible metadata area header version: %d on %s"
+ " at offset %"PRIu64, mdah->version,
+ dev_name(dev_area->dev), dev_area->start);
goto bad;
}
if (mdah->start != dev_area->start) {
log_error("Incorrect start sector in metadata area header: %"
- PRIu64, mdah->start);
+ PRIu64" on %s at offset %"PRIu64, mdah->start,
+ dev_name(dev_area->dev), dev_area->start);
goto bad;
}
--- LVM2/WHATS_NEW 2010/06/22 13:11:29 1.1624
+++ LVM2/WHATS_NEW 2010/06/22 19:18:27 1.1625
@@ -1,5 +1,6 @@
Version 2.02.68 -
===============================
+ Add device name and offset to output of error messages in raw_read_mda_header().
Use flexible data[] in cmirrord request to prevent abort in runtime size checks.
Honor log argument when down-converting stacked mirror.
Sleep to workaround clvmd -S race: socket closed early and server drops cmd.
^ permalink raw reply [flat|nested] 3+ messages in thread
* LVM2 lib/format_text/format-text.c ./WHATS_NEW
@ 2010-02-02 16:26 wysochanski
0 siblings, 0 replies; 3+ messages in thread
From: wysochanski @ 2010-02-02 16:26 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: wysochanski@sourceware.org 2010-02-02 16:26:35
Modified files:
lib/format_text: format-text.c
. : WHATS_NEW
Log message:
Add copy constructor for struct metadata_area.
Clean up cut&paste code with proper copy constructor.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_text/format-text.c.diff?cvsroot=lvm2&r1=1.117&r2=1.118
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1416&r2=1.1417
--- LVM2/lib/format_text/format-text.c 2009/12/11 13:16:38 1.117
+++ LVM2/lib/format_text/format-text.c 2010/02/02 16:26:34 1.118
@@ -1548,15 +1548,41 @@
return 1;
}
+/*
+ * Copy constructor for a metadata_area.
+ */
+static struct metadata_area *_mda_copy(struct dm_pool *mem,
+ struct metadata_area *mda)
+{
+ struct metadata_area *mda_new;
+ struct mda_context *mdac, *mdac_new;
+
+ if (!(mda_new = dm_pool_alloc(mem, sizeof(*mda_new)))) {
+ log_error("metadata_area allocation failed");
+ return NULL;
+ }
+ /* FIXME: Should have a per-format constructor here */
+ mdac = (struct mda_context *) mda->metadata_locn;
+ if (!(mdac_new = dm_pool_alloc(mem, sizeof(*mdac_new)))) {
+ log_error("mda_context allocation failed");
+ dm_pool_free(mem, mda_new);
+ return NULL;
+ }
+ memcpy(mda_new, mda, sizeof(*mda));
+ memcpy(mdac_new, mdac, sizeof(*mdac));
+ mda_new->metadata_locn = mdac_new;
+ return mda_new;
+}
+
+
static int _text_pv_read(const struct format_type *fmt, const char *pv_name,
struct physical_volume *pv, struct dm_list *mdas,
int scan_label_only)
{
+ struct metadata_area *mda, *mda_new;
struct label *label;
struct device *dev;
struct lvmcache_info *info;
- struct metadata_area *mda, *mda_new;
- struct mda_context *mdac, *mdac_new;
if (!(dev = dev_cache_get(pv_name, fmt->cmd->filter)))
return_0;
@@ -1573,18 +1599,9 @@
/* Add copy of mdas to supplied list */
dm_list_iterate_items(mda, &info->mdas) {
- mdac = (struct mda_context *) mda->metadata_locn;
- if (!(mda_new = dm_pool_alloc(fmt->cmd->mem, sizeof(*mda_new)))) {
- log_error("metadata_area allocation failed");
+ mda_new = _mda_copy(fmt->cmd->mem, mda);
+ if (!mda_new)
return 0;
- }
- if (!(mdac_new = dm_pool_alloc(fmt->cmd->mem, sizeof(*mdac_new)))) {
- log_error("metadata_area allocation failed");
- return 0;
- }
- memcpy(mda_new, mda, sizeof(*mda));
- memcpy(mdac_new, mdac, sizeof(*mdac));
- mda_new->metadata_locn = mdac_new;
dm_list_add(mdas, &mda_new->list);
}
@@ -1672,7 +1689,7 @@
struct physical_volume *pv, struct volume_group *vg)
{
struct metadata_area *mda, *mda_new, *mda2;
- struct mda_context *mdac, *mdac_new, *mdac2;
+ struct mda_context *mdac, *mdac2;
struct dm_list *pvmdas;
struct lvmcache_info *info;
int found;
@@ -1718,18 +1735,11 @@
if (found)
continue;
- if (!(mda_new = dm_pool_alloc(fmt->cmd->mem,
- sizeof(*mda_new))))
+ mda_new = _mda_copy(fmt->cmd->mem, mda);
+ if (!mda_new)
return_0;
-
- if (!(mdac_new = dm_pool_alloc(fmt->cmd->mem,
- sizeof(*mdac_new))))
- return_0;
- /* FIXME multiple dev_areas inside area */
- memcpy(mda_new, mda, sizeof(*mda));
- memcpy(mdac_new, mdac, sizeof(*mdac));
- mda_new->metadata_locn = mdac_new;
dm_list_add(mdas, &mda_new->list);
+ /* FIXME multiple dev_areas inside area */
}
}
@@ -1815,7 +1825,7 @@
struct format_instance *fid;
struct text_fid_context *fidtc;
struct metadata_area *mda, *mda_new;
- struct mda_context *mdac, *mdac_new;
+ struct mda_context *mdac;
struct dir_list *dl;
struct raw_list *rl;
struct dm_list *dir_list, *raw_list, *mdas;
@@ -1892,21 +1902,10 @@
dm_list_iterate_items(info, &vginfo->infos) {
mdas = &info->mdas;
dm_list_iterate_items(mda, mdas) {
- mdac =
- (struct mda_context *) mda->metadata_locn;
-
/* FIXME Check it holds this VG */
- if (!(mda_new = dm_pool_alloc(fmt->cmd->mem,
- sizeof(*mda_new))))
+ mda_new = _mda_copy(fmt->cmd->mem, mda);
+ if (!mda_new)
return_NULL;
-
- if (!(mdac_new = dm_pool_alloc(fmt->cmd->mem,
- sizeof(*mdac_new))))
- return_NULL;
- /* FIXME multiple dev_areas inside area */
- memcpy(mda_new, mda, sizeof(*mda));
- memcpy(mdac_new, mdac, sizeof(*mdac));
- mda_new->metadata_locn = mdac_new;
dm_list_add(&fid->metadata_areas, &mda_new->list);
}
}
--- LVM2/WHATS_NEW 2010/02/02 14:09:17 1.1416
+++ LVM2/WHATS_NEW 2010/02/02 16:26:35 1.1417
@@ -1,5 +1,6 @@
Version 2.02.61 -
===================================
+ Add copy constructor for metadata_area.
Remove pointless versioned symlinks to dmeventd plugin libraries.
Fix dmeventd snapshot plugin build dependency.
Make clvmd -V return zero status.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-08-03 18:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-03 18:19 LVM2 lib/format_text/format-text.c ./WHATS_NEW snitzer
-- strict thread matches above, loose matches on Subject: below --
2010-06-22 19:18 wysochanski
2010-02-02 16:26 wysochanski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).