master - cache: use new api function
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=357e9f9572361ec2ea8...
Commit: 357e9f9572361ec2ea89ca0bf165a30545fa747f
Parent: 9c0d92d9575da63b38685c385917644d9ac9445d
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Jun 23 11:47:33 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Jun 25 15:07:55 2018 +0200
cache: use new api function
---
lib/metadata/cache_manip.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/lib/metadata/cache_manip.c b/lib/metadata/cache_manip.c
index e347144..4132e2f 100644
--- a/lib/metadata/cache_manip.c
+++ b/lib/metadata/cache_manip.c
@@ -620,10 +620,9 @@ int lv_cache_remove(struct logical_volume *cache_lv)
if (!(cache_seg->segtype = get_segtype_from_string(corigin_lv->vg->cmd, SEG_TYPE_NAME_CACHE)))
return_0;
- if (!(cache_seg->areas = dm_pool_zalloc(cache_lv->vg->vgmem, sizeof(*cache_seg->areas))))
+ if (!add_lv_segment_areas(cache_seg, 1))
return_0;
- cache_seg->area_count = 1;
if (!set_lv_segment_area_lv(cache_seg, 0, cache_lv, 0, 0))
return_0;
5 years, 10 months
master - lv_manip: add new internal api function
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9c0d92d9575da63b386...
Commit: 9c0d92d9575da63b38685c385917644d9ac9445d
Parent: 8949903fbb0be370ae7c5d71617d5084e8dddad9
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Jun 23 11:35:22 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Jun 25 15:07:55 2018 +0200
lv_manip: add new internal api function
---
lib/metadata/lv_manip.c | 21 ++++++++++-----------
lib/metadata/metadata.h | 2 ++
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 4efe04a..11a6927 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -1219,17 +1219,19 @@ int set_lv_segment_area_lv(struct lv_segment *seg, uint32_t area_num,
/*
* Prepare for adding parallel areas to an existing segment.
*/
-static int _lv_segment_add_areas(struct logical_volume *lv,
- struct lv_segment *seg,
- uint32_t new_area_count)
+int add_lv_segment_areas(struct lv_segment *seg, uint32_t new_area_count)
{
struct lv_segment_area *newareas;
uint32_t areas_sz = new_area_count * sizeof(*newareas);
- if (!(newareas = dm_pool_zalloc(lv->vg->cmd->mem, areas_sz)))
+ if (!(newareas = dm_pool_zalloc(seg->lv->vg->vgmem, areas_sz))) {
+ log_error("Failed to allocate widened LV segment for %s.",
+ display_lvname(seg->lv));
return_0;
+ }
- memcpy(newareas, seg->areas, seg->area_count * sizeof(*seg->areas));
+ if (seg->area_count)
+ memcpy(newareas, seg->areas, seg->area_count * sizeof(*seg->areas));
seg->areas = newareas;
seg->area_count = new_area_count;
@@ -3766,7 +3768,7 @@ int lv_add_mirror_areas(struct alloc_handle *ah,
old_area_count = seg->area_count;
new_area_count = old_area_count + ah->area_count;
- if (!_lv_segment_add_areas(lv, seg, new_area_count))
+ if (!add_lv_segment_areas(seg, new_area_count))
return_0;
for (s = 0; s < ah->area_count; s++) {
@@ -3818,11 +3820,8 @@ int lv_add_mirror_lvs(struct logical_volume *lv,
old_area_count = seg->area_count;
new_area_count = old_area_count + num_extra_areas;
- if (!_lv_segment_add_areas(lv, seg, new_area_count)) {
- log_error("Failed to allocate widened LV segment for %s.",
- display_lvname(lv));
- return 0;
- }
+ if (!add_lv_segment_areas(seg, new_area_count))
+ return_0;
for (m = 0; m < old_area_count; m++)
seg_lv(seg, m)->status |= status;
diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h
index 129267c..1c4be48 100644
--- a/lib/metadata/metadata.h
+++ b/lib/metadata/metadata.h
@@ -445,6 +445,8 @@ int for_each_sub_lv(struct logical_volume *lv,
int move_lv_segments(struct logical_volume *lv_to,
struct logical_volume *lv_from,
uint64_t set_status, uint64_t reset_status);
+/* Widen existing segment areas */
+int add_lv_segment_areas(struct lv_segment *seg, uint32_t new_area_count);
/*
* Calculate readahead from underlying PV devices
5 years, 10 months
master - cache: set areas count prior using it
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8949903fbb0be370ae7...
Commit: 8949903fbb0be370ae7c5d71617d5084e8dddad9
Parent: 6b3a4aac0954264c3f054e7dd6c87babca77c244
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Jun 23 11:35:34 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Jun 25 15:07:32 2018 +0200
cache: set areas count prior using it
Set correct counter, so it's not failing on internal error check.
---
lib/metadata/cache_manip.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/metadata/cache_manip.c b/lib/metadata/cache_manip.c
index c3bd2ec..e347144 100644
--- a/lib/metadata/cache_manip.c
+++ b/lib/metadata/cache_manip.c
@@ -623,10 +623,10 @@ int lv_cache_remove(struct logical_volume *cache_lv)
if (!(cache_seg->areas = dm_pool_zalloc(cache_lv->vg->vgmem, sizeof(*cache_seg->areas))))
return_0;
+ cache_seg->area_count = 1;
if (!set_lv_segment_area_lv(cache_seg, 0, cache_lv, 0, 0))
return_0;
- cache_seg->area_count = 1;
corigin_lv->le_count = cache_lv->le_count;
corigin_lv->size = cache_lv->size;
corigin_lv->status |= LV_PENDING_DELETE;
5 years, 10 months
master - vcfgrestore: add prompt with active volumes
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=6b3a4aac0954264c3f0...
Commit: 6b3a4aac0954264c3f054e7dd6c87babca77c244
Parent: 106ee05ba01146abff248a4e7eae77982fda9ebd
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Jun 22 18:45:48 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Jun 22 23:37:36 2018 +0200
vcfgrestore: add prompt with active volumes
Add check for active device with names matching restored VG.
When such devices are present in dm table, prompt user, if he
wish to continue.
---
WHATS_NEW | 1 +
tools/vgcfgrestore.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 76 insertions(+), 1 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 70fb76a..d90ff3a 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 3.0.0
=============
+ Enhance vgcfgrestore to check for active LVs in restored VG.
Configure supports --disable-silent-rules for verbose builds.
Fix unmonitoring of merging snapshots.
Cache can uses metadata format 2 with cleaner policy.
diff --git a/tools/vgcfgrestore.c b/tools/vgcfgrestore.c
index 0b03687..0dd7d4d 100644
--- a/tools/vgcfgrestore.c
+++ b/tools/vgcfgrestore.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2018 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
@@ -15,11 +15,70 @@
#include "tools.h"
#include "daemons/lvmetad/lvmetad-client.h"
+#include "device_mapper/all.h"
+#include "device_mapper/misc/dm-ioctl.h"
+
+/*
+ * Check if there are any active volumes from restored vg_name.
+ * We can prompt user, as such operation may make some serious
+ * troubles later, when user will try to continue such devices.
+ */
+static int _check_all_dm_devices(const char *vg_name, unsigned *found)
+{
+ struct dm_task *dmt;
+ struct dm_names *names;
+ char vgname_buf[DM_NAME_LEN * 2];
+ char *vgname, *lvname, *lvlayer;
+ unsigned next = 0;
+ int r = 1;
+
+ if (!(dmt = dm_task_create(DM_DEVICE_LIST)))
+ return_0;
+
+ if (!dm_task_run(dmt)) {
+ r = 0;
+ goto_out;
+ }
+
+ if (!(names = dm_task_get_names(dmt))) {
+ r = 0;
+ goto_out;
+ }
+
+ if (!names->dev) {
+ log_verbose("No devices found.");
+ goto out;
+ }
+
+ do {
+ /* TODO: Do we want to validate UUID LVM- prefix as well ? */
+ names = (struct dm_names *)((char *) names + next);
+ if (!dm_strncpy(vgname_buf, names->name, sizeof(vgname_buf))) {
+ r = 0;
+ goto_out;
+ }
+ vgname = vgname_buf;
+ if (!dm_split_lvm_name(NULL, NULL, &vgname, &lvname, &lvlayer)) {
+ r = 0;
+ goto_out;
+ }
+ if (strcmp(vgname, vg_name) == 0) {
+ log_print("Volume group %s has active volume: %s.", vgname, lvname);
+ (*found)++;
+ }
+ next = names->next;
+ } while (next);
+
+out:
+ dm_task_destroy(dmt);
+ return r;
+}
int vgcfgrestore(struct cmd_context *cmd, int argc, char **argv)
{
const char *vg_name = NULL;
int lvmetad_rescan = 0;
+ unsigned found = 0;
int ret;
if (argc == 1) {
@@ -47,6 +106,21 @@ int vgcfgrestore(struct cmd_context *cmd, int argc, char **argv)
return ECMD_PROCESSED;
}
+ if (!_check_all_dm_devices(vg_name, &found)) {
+ log_warn("WARNING: Failed to check for active volumes in volume group \"%s\".", vg_name);
+ } else if (found) {
+ log_warn("WARNING: Found %u active volume(s) in volume group \"%s\".",
+ found, vg_name);
+ log_print("Restoring VG with active LVs, may cause mismatch with its metadata.");
+ if (!arg_is_set(cmd, yes_ARG) &&
+ yes_no_prompt("Do you really want to proceed with restore of volume group \"%s\", "
+ "while %u volume(s) are active? [y/n]: ",
+ vg_name, found) == 'n') {
+ log_error("Restore aborted.");
+ return ECMD_FAILED;
+ }
+ }
+
/*
* lvmetad does not handle a VG being restored, which would require
* vg_remove of the existing VG, then vg_update of the restored VG. A
5 years, 10 months
master - lv_manip: add extra internal error
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=106ee05ba01146abff2...
Commit: 106ee05ba01146abff248a4e7eae77982fda9ebd
Parent: 6c84a36b539d02a5f975a1e5e98c180621078498
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Jun 20 10:44:13 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Jun 22 23:37:02 2018 +0200
lv_manip: add extra internal error
Catch error early, when trying to store data into non-allocated area.
---
lib/metadata/lv_manip.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 27cd2c1..4efe04a 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -1190,6 +1190,11 @@ int set_lv_segment_area_lv(struct lv_segment *seg, uint32_t area_num,
display_lvname(seg->lv), seg->le, area_num,
display_lvname(lv), le);
+ if (area_num >= seg->area_count) {
+ log_error(INTERNAL_ERROR "Try to set to high area number (%u >= %u) for LV %s.",
+ area_num, seg->area_count, display_lvname(seg->lv));
+ return 0;
+ }
lv->status |= status;
if (lv_is_raid_metadata(lv)) {
seg->meta_areas[area_num].type = AREA_LV;
5 years, 10 months
master - utils: add clzll
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=6c84a36b539d02a5f97...
Commit: 6c84a36b539d02a5f975a1e5e98c180621078498
Parent: 8215e3503d0799211d268c3e2a0f1b648d5f9584
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Jun 19 19:35:48 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Jun 22 23:37:02 2018 +0200
utils: add clzll
Check for __builtin_clzll and add wrapper when missing.
---
configure | 44 ++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 1 +
include/configure.h.in | 3 +++
lib/misc/util.h | 15 ++++++++++++++-
4 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
index 7dee110..deaa8e9 100755
--- a/configure
+++ b/configure
@@ -6581,6 +6581,50 @@ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_clzll" >&5
+$as_echo_n "checking for __builtin_clzll... " >&6; }
+if ${ax_cv_have___builtin_clzll+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ __builtin_clzll(0)
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ax_cv_have___builtin_clzll=yes
+else
+ ax_cv_have___builtin_clzll=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have___builtin_clzll" >&5
+$as_echo "$ax_cv_have___builtin_clzll" >&6; }
+
+ if test yes = $ax_cv_have___builtin_clzll; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE___BUILTIN_CLZLL 1
+_ACEOF
+
+fi
+
+
+
+
################################################################################
for ac_func in ftruncate gethostname getpagesize gettimeofday localtime_r \
memchr memset mkdir mkfifo munmap nl_langinfo realpath rmdir setenv \
diff --git a/configure.ac b/configure.ac
index c3197b7..699bbb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,6 +140,7 @@ AC_TYPE_UINT16_T
AC_TYPE_UINT32_T
AC_TYPE_UINT64_T
AX_GCC_BUILTIN([__builtin_clz])
+AX_GCC_BUILTIN([__builtin_clzll])
################################################################################
dnl -- Check for functions
diff --git a/include/configure.h.in b/include/configure.h.in
index b1b2db3..50e35f7 100644
--- a/include/configure.h.in
+++ b/include/configure.h.in
@@ -528,6 +528,9 @@
/* Define to 1 if the system has the `__builtin_clz' built-in function */
#undef HAVE___BUILTIN_CLZ
+/* Define to 1 if the system has the `__builtin_clzll' built-in function */
+#undef HAVE___BUILTIN_CLZLL
+
/* Internalization package */
#undef INTL_PACKAGE
diff --git a/lib/misc/util.h b/lib/misc/util.h
index 9231ea9..a42ecb3 100644
--- a/lib/misc/util.h
+++ b/lib/misc/util.h
@@ -43,7 +43,7 @@
#ifdef HAVE___BUILTIN_CLZ
#define clz(x) __builtin_clz((x))
#else /* ifdef HAVE___BUILTIN_CLZ */
-unsigned _dm_clz(unsigned x)
+static unsigned _dm_clz(unsigned x)
{
int n;
@@ -76,6 +76,19 @@ unsigned _dm_clz(unsigned x)
#define clz(x) _dm_clz((x))
#endif /* ifdef HAVE___BUILTIN_CLZ */
+#ifdef HAVE___BUILTIN_CLZLL
+#define clzll(x) __builtin_clzll((x))
+#else /* ifdef HAVE___BUILTIN_CLZ */
+static unsigned _dm_clzll(unsigned long long x)
+{
+ if (x <= 0xffffffff)
+ return 32 + clz((unsigned) (x & 0xffffffff));
+
+ return clz(x >> 32);
+}
+#define clzll(x) _dm_clzll((x))
+#endif /* ifdef HAVE___BUILTIN_CLZLL */
+
#define KERNEL_VERSION(major, minor, release) (((major) << 16) + ((minor) << 8) + (release))
/* Define some portable printing types */
5 years, 10 months
master - tests: fix rules for mke2fs.conf install
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8215e3503d0799211d2...
Commit: 8215e3503d0799211d268c3e2a0f1b648d5f9584
Parent: fa58fc32576a08bf11fa98623473f5e6ec5b6d68
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Jun 22 22:43:58 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Jun 22 23:36:54 2018 +0200
tests: fix rules for mke2fs.conf install
---
test/Makefile.in | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/test/Makefile.in b/test/Makefile.in
index 39093bf..5b7578c 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -34,7 +34,7 @@ CXXFLAGS += $(EXTRA_EXEC_CFLAGS)
CLEAN_DIRS += dbus/__pycache__ $(LVM_TEST_RESULTS)
ifneq (.,$(firstword $(srcdir)))
-CLEAN_TARGETS += $(RUN_BASE) $(addprefix lib/,$(LIB_LVMLOCKD_CONF))
+CLEAN_TARGETS += $(RUN_BASE) $(addprefix lib/,$(LIB_LVMLOCKD_CONF) $(LIB_MKE2FS_CONF))
endif
CLEAN_TARGETS += .lib-dir-stamp .tests-stamp $(LIB) $(addprefix lib/,\
@@ -239,7 +239,10 @@ LIB_LVMLOCKD_CONF = \
test-dlm-conf \
test-sanlock-conf
-LIB_LOCAL = paths runner mke2fs.conf
+LIB_MKE2FS_CONF = \
+ mke2fs.conf
+
+LIB_LOCAL = paths runner
LIB_NOT = not
LIB_LINK_NOT = invalid fail should
LIB_SHARED = check aux inittest utils get lvm-wrapper
@@ -249,13 +252,13 @@ install: .tests-stamp lib/paths-installed
$(INSTALL_DIR) $(DATADIR)/{shell,unit,lib,dbus} $(EXECDIR)
$(INSTALL_DATA) shell/*.sh $(DATADIR)/shell
$(INSTALL_DATA) unit/*.sh $(DATADIR)/unit
- $(INSTALL_DATA) lib/mke2fs.conf $(DATADIR)/lib
-$(INSTALL_PROGRAM) unit/unit-test $(DATADIR)/unit
-$(INSTALL_PROGRAM) dbus/*.py $(DATADIR)/dbus/
$(INSTALL_DATA) lib/paths-installed $(DATADIR)/lib/paths
cd lib && $(INSTALL_DATA) \
$(LIB_FLAVOURS) \
$(LIB_LVMLOCKD_CONF) \
+ $(LIB_MKE2FS_CONF) \
dm-version-expected \
version-expected \
$(DATADIR)/lib
@@ -340,9 +343,6 @@ lib/version-expected: $(top_srcdir)/VERSION .lib-dir-stamp
lib/dm-version-expected: $(top_srcdir)/VERSION_DM .lib-dir-stamp
cut -f 1 -d ' ' <$< >$@
-lib/mke2fs.conf: $(srcdir)/lib/mke2fs.conf
- $(LN_S) -f $< $@
-
CMDS = lvm $(shell cat $(top_builddir)/tools/.commands 2>/dev/null)
LIB = $(addprefix lib/, $(LIB_SHARED) $(LIB_LOCAL) $(LIB_NOT) $(LIB_LINK_NOT) $(LIB_FLAVOURS))
@@ -369,8 +369,9 @@ LIB = $(addprefix lib/, $(LIB_SHARED) $(LIB_LOCAL) $(LIB_NOT) $(LIB_LINK_NOT) $(
$(LN_S) -f $(abs_top_srcdir)/conf/lvmdbusd.profile lib/
$(LN_S) -f $(abs_top_srcdir)/conf/thin-performance.profile lib/
$(LN_S) -f $(abs_top_srcdir)/scripts/fsadm.sh lib/fsadm
- test "$(srcdir)" = . || for i in $(LIB_LVMLOCKD_CONF); do \
- $(LN_S) -f $(abs_top_srcdir)/test/lib/$$i lib/; done
+ test "$(srcdir)" = . || \
+ for i in $(LIB_LVMLOCKD_CONF) $(LIB_MKE2FS_CONF); do \
+ $(LN_S) -f $(abs_top_srcdir)/test/lib/$$i lib/; done
touch $@
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
5 years, 10 months
master - build: support --disable-silent-rules
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=fa58fc32576a08bf11f...
Commit: fa58fc32576a08bf11fa98623473f5e6ec5b6d68
Parent: c728d88e11ffed97f8a5b96e1c0595a2462c5edc
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Jun 22 23:30:42 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Jun 22 23:36:19 2018 +0200
build: support --disable-silent-rules
Add support for standardized option for have verbose builds.
Useful for distro builds where more details can be useful.
---
WHATS_NEW | 1 +
configure | 17 +++++++++++++++++
configure.ac | 10 ++++++++++
make.tmpl.in | 4 ++++
4 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index a875553..70fb76a 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 3.0.0
=============
+ Configure supports --disable-silent-rules for verbose builds.
Fix unmonitoring of merging snapshots.
Cache can uses metadata format 2 with cleaner policy.
Fix check if resized PV can also fit metadata area.
diff --git a/configure b/configure
index 4536b03..7dee110 100755
--- a/configure
+++ b/configure
@@ -643,6 +643,7 @@ DMEVENTD_PIDFILE
WRITE_INSTALL
VALGRIND_POOL
USRSBINDIR
+SILENT_RULES
USE_TRACKING
UDEV_HAS_BUILTIN_BLKID
UDEV_RULE_EXEC_DETECTION
@@ -885,6 +886,7 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_dependency_tracking
+enable_silent_rules
enable_static_link
with_user
with_group
@@ -1622,6 +1624,7 @@ Optional Features:
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-dependency-tracking
speeds up one-time build.
+ --disable-silent-rules disable silent building
--enable-static_link use this to link the tools to their libraries
statically (default is dynamic linking
--disable-thin_check_needs_check
@@ -8044,6 +8047,20 @@ fi
$as_echo "$USE_TRACKING" >&6; }
################################################################################
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build silently" >&5
+$as_echo_n "checking whether to build silently... " >&6; }
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+ enableval=$enable_silent_rules; SILENT_RULES=$enableval
+else
+ SILENT_RULES=yes
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SILENT_RULES" >&5
+$as_echo "$SILENT_RULES" >&6; }
+
+
+################################################################################
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use static linking" >&5
$as_echo_n "checking whether to use static linking... " >&6; }
# Check whether --enable-static_link was given.
diff --git a/configure.ac b/configure.ac
index 05b13e0..c3197b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,6 +171,15 @@ AC_ARG_ENABLE(dependency-tracking,
AC_MSG_RESULT($USE_TRACKING)
################################################################################
+dnl -- Disable silence rules
+AC_MSG_CHECKING(whether to build silently)
+AC_ARG_ENABLE(silent-rules,
+ AC_HELP_STRING([--disable-silent-rules], [disable silent building]),
+ SILENT_RULES=$enableval, SILENT_RULES=yes)
+AC_MSG_RESULT($SILENT_RULES)
+
+
+################################################################################
dnl -- Enables statically-linked tools
AC_MSG_CHECKING(whether to use static linking)
AC_ARG_ENABLE(static_link,
@@ -1726,6 +1735,7 @@ AC_SUBST(UDEV_SYSTEMD_BACKGROUND_JOBS)
AC_SUBST(UDEV_RULE_EXEC_DETECTION)
AC_SUBST(UDEV_HAS_BUILTIN_BLKID)
AC_SUBST(USE_TRACKING)
+AC_SUBST(SILENT_RULES)
AC_SUBST(USRSBINDIR)
AC_SUBST(VALGRIND_POOL)
AC_SUBST(WRITE_INSTALL)
diff --git a/make.tmpl.in b/make.tmpl.in
index 07cb18a..38fdc73 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -13,6 +13,10 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ifneq ("@SILENT_RULES@","yes")
+ V ?= 1
+endif
+
ifeq ($(V),1)
Q=
else
5 years, 10 months
master - build: include configure.h
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c728d88e11ffed97f8a...
Commit: c728d88e11ffed97f8a5b96e1c0595a2462c5edc
Parent: 086f1ef4a0f59ee247067e850b9b9ef0cdf5b1c3
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Jun 19 20:43:31 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Jun 22 23:11:44 2018 +0200
build: include configure.h
It's important to consistenly include configure.h as the 1st. header.
It containts #defines influencing behavior of other included header
files.
---
daemons/dmeventd/dmeventd.c | 1 +
daemons/dmeventd/libdevmapper-event.c | 2 +-
device_mapper/all.h | 6 +++---
device_mapper/libdm-common.c | 6 +++---
device_mapper/vdo/status.c | 1 +
lib/device/bcache.h | 1 +
libdm/dm-tools/dmsetup.c | 4 ++--
test/unit/activation-generator_t.c | 3 +--
test/unit/bcache_t.c | 7 +++----
test/unit/bcache_utils_t.c | 3 +--
test/unit/framework.h | 1 +
test/unit/io_engine_t.c | 7 +++----
test/unit/radix_tree_t.c | 3 +--
test/unit/vdo_t.c | 3 +--
14 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c
index 3ad81ce..dcc743d 100644
--- a/daemons/dmeventd/dmeventd.c
+++ b/daemons/dmeventd/dmeventd.c
@@ -16,6 +16,7 @@
* dmeventd - dm event daemon to monitor active mapped devices
*/
+#include "device_mapper/misc/dmlib.h"
#include "base/memory/zalloc.h"
#include "device_mapper/misc/dm-logging.h"
diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c
index 157b5f1..e58a0ce 100644
--- a/daemons/dmeventd/libdevmapper-event.c
+++ b/daemons/dmeventd/libdevmapper-event.c
@@ -12,9 +12,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "device_mapper/misc/dmlib.h"
#include "base/memory/zalloc.h"
#include "device_mapper/misc/dm-logging.h"
-#include "device_mapper/misc/dmlib.h"
#include "daemons/dmeventd/libdevmapper-event.h"
#include "dmeventd.h"
#include "lib/misc/intl.h"
diff --git a/device_mapper/all.h b/device_mapper/all.h
index 8dcb38c..602b7ba 100644
--- a/device_mapper/all.h
+++ b/device_mapper/all.h
@@ -17,6 +17,9 @@
#ifndef LIB_DEVICE_MAPPER_H
#define LIB_DEVICE_MAPPER_H
+#include "base/data-struct/list.h"
+#include "base/data-struct/hash.h"
+
#include <inttypes.h>
#include <stdarg.h>
#include <sys/types.h>
@@ -31,9 +34,6 @@
#include <stdlib.h>
#include <stdio.h>
-#include "base/data-struct/list.h"
-#include "base/data-struct/hash.h"
-
#ifndef __GNUC__
# define __typeof__ typeof
#endif
diff --git a/device_mapper/libdm-common.c b/device_mapper/libdm-common.c
index d46d4b0..111fff6 100644
--- a/device_mapper/libdm-common.c
+++ b/device_mapper/libdm-common.c
@@ -13,12 +13,12 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "base/memory/zalloc.h"
-#include "device_mapper/misc/dmlib.h"
-#include "ioctl/libdm-targets.h"
+#include "misc/dmlib.h"
#include "libdm-common.h"
+#include "ioctl/libdm-targets.h"
#include "misc/kdev_t.h"
#include "misc/dm-ioctl.h"
+#include "base/memory/zalloc.h"
#include <stdarg.h>
#include <sys/param.h>
diff --git a/device_mapper/vdo/status.c b/device_mapper/vdo/status.c
index 7a26e1a..f423ca1 100644
--- a/device_mapper/vdo/status.c
+++ b/device_mapper/vdo/status.c
@@ -1,3 +1,4 @@
+#include "configure.h"
#include "target.h"
// For DM_ARRAY_SIZE!
diff --git a/lib/device/bcache.h b/lib/device/bcache.h
index cb36c30..ae5e69c 100644
--- a/lib/device/bcache.h
+++ b/lib/device/bcache.h
@@ -15,6 +15,7 @@
#ifndef BCACHE_H
#define BCACHE_H
+#include "configure.h"
#include "device_mapper/all.h"
#include <linux/fs.h>
diff --git a/libdm/dm-tools/dmsetup.c b/libdm/dm-tools/dmsetup.c
index 83786f4..44386a6 100644
--- a/libdm/dm-tools/dmsetup.c
+++ b/libdm/dm-tools/dmsetup.c
@@ -18,11 +18,10 @@
// For canonicalize_file_name()
#define _GNU_SOURCE
-#include <stdlib.h>
+#include "configure.h"
#include "libdm/misc/dm-logging.h"
#include "libdm/dm-tools/util.h"
-#include "configure.h"
#include <ctype.h>
#include <dirent.h>
@@ -35,6 +34,7 @@
#include <sys/wait.h>
#include <time.h>
#include <unistd.h>
+#include <stdlib.h>
#ifdef UDEV_SYNC_SUPPORT
# include <sys/types.h>
diff --git a/test/unit/activation-generator_t.c b/test/unit/activation-generator_t.c
index 9f6b661..cff0968 100644
--- a/test/unit/activation-generator_t.c
+++ b/test/unit/activation-generator_t.c
@@ -12,9 +12,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "scripts/generator-internals.c"
-#include "framework.h"
#include "units.h"
+#include "scripts/generator-internals.c"
#include "device_mapper/all.h"
diff --git a/test/unit/bcache_t.c b/test/unit/bcache_t.c
index 5e07005..92c2d57 100644
--- a/test/unit/bcache_t.c
+++ b/test/unit/bcache_t.c
@@ -12,15 +12,14 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "units.h"
+#include "lib/device/bcache.h"
+
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include "lib/device/bcache.h"
-#include "framework.h"
-#include "units.h"
-
#define SHOW_MOCK_CALLS 0
/*----------------------------------------------------------------
diff --git a/test/unit/bcache_utils_t.c b/test/unit/bcache_utils_t.c
index 66780ea..2e08320 100644
--- a/test/unit/bcache_utils_t.c
+++ b/test/unit/bcache_utils_t.c
@@ -14,9 +14,8 @@
#define _GNU_SOURCE
-#include "lib/device/bcache.h"
-#include "framework.h"
#include "units.h"
+#include "lib/device/bcache.h"
#include <errno.h>
#include <stdio.h>
diff --git a/test/unit/framework.h b/test/unit/framework.h
index 0c45596..d5a2cdd 100644
--- a/test/unit/framework.h
+++ b/test/unit/framework.h
@@ -1,6 +1,7 @@
#ifndef TEST_UNIT_FRAMEWORK_H
#define TEST_UNIT_FRAMEWORK_H
+#include "configure.h"
#include "device_mapper/all.h"
#include <stdbool.h>
diff --git a/test/unit/io_engine_t.c b/test/unit/io_engine_t.c
index 1a4f638..bac9c38 100644
--- a/test/unit/io_engine_t.c
+++ b/test/unit/io_engine_t.c
@@ -14,6 +14,9 @@
#define _GNU_SOURCE
+#include "units.h"
+#include "lib/device/bcache.h"
+
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
@@ -22,10 +25,6 @@
#include <fcntl.h>
#include <unistd.h>
-#include "lib/device/bcache.h"
-#include "framework.h"
-#include "units.h"
-
//----------------------------------------------------------------
#define SECTOR_SIZE 512
diff --git a/test/unit/radix_tree_t.c b/test/unit/radix_tree_t.c
index 2fba15f..e5d3e98 100644
--- a/test/unit/radix_tree_t.c
+++ b/test/unit/radix_tree_t.c
@@ -10,11 +10,10 @@
// along with this program; if not, write to the Free Software Foundation,
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#include "units.h"
#include "base/data-struct/radix-tree.h"
#include "base/memory/container_of.h"
-#include "units.h"
-
#include <stdio.h>
#include <stdlib.h>
diff --git a/test/unit/vdo_t.c b/test/unit/vdo_t.c
index 9c41887..a26c0b9 100644
--- a/test/unit/vdo_t.c
+++ b/test/unit/vdo_t.c
@@ -12,9 +12,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "device_mapper/vdo/target.h"
-#include "framework.h"
#include "units.h"
+#include "device_mapper/vdo/target.h"
//----------------------------------------------------------------
5 years, 10 months
master - build: make generate
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=086f1ef4a0f59ee2470...
Commit: 086f1ef4a0f59ee247067e850b9b9ef0cdf5b1c3
Parent: 254e5c5d119447bcb8b160a4b4e5b0c36e9af5ba
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Jun 19 15:07:50 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Jun 22 15:36:34 2018 +0200
build: make generate
---
conf/example.conf.in | 33 +++++----------------------------
man/lvchange.8_pregen | 15 ---------------
man/lvdisplay.8_pregen | 11 -----------
man/lvm-fullreport.8_pregen | 11 -----------
man/lvs.8_pregen | 11 -----------
man/pvchange.8_pregen | 11 -----------
man/pvdisplay.8_pregen | 11 -----------
man/pvs.8_pregen | 11 -----------
man/vgchange.8_pregen | 31 -------------------------------
man/vgconvert.8_pregen | 9 +++++----
man/vgdisplay.8_pregen | 11 -----------
man/vgs.8_pregen | 11 -----------
12 files changed, 10 insertions(+), 166 deletions(-)
diff --git a/conf/example.conf.in b/conf/example.conf.in
index 97daab2..83f9f42 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -151,21 +151,15 @@ devices {
# global_filter = [ "a|.*/|" ]
# Configuration option devices/cache_dir.
- # Directory in which to store the device cache file.
- # The results of filtering are cached on disk to avoid rescanning dud
- # devices (which can take a very long time). By default this cache is
- # stored in a file named .cache. It is safe to delete this file; the
- # tools regenerate it. If obtain_device_list_from_udev is enabled, the
- # list of devices is obtained from udev and any existing .cache file
- # is removed.
+ # This setting is no longer used.
cache_dir = "@DEFAULT_SYS_DIR@/@DEFAULT_CACHE_SUBDIR@"
# Configuration option devices/cache_file_prefix.
- # A prefix used before the .cache file name. See devices/cache_dir.
+ # This setting is no longer used.
cache_file_prefix = ""
# Configuration option devices/write_cache_state.
- # Enable/disable writing the cache file. See devices/cache_dir.
+ # This setting is no longer used.
write_cache_state = 1
# Configuration option devices/types.
@@ -269,11 +263,7 @@ devices {
ignore_lvm_mirrors = 1
# Configuration option devices/disable_after_error_count.
- # Number of I/O errors after which a device is skipped.
- # During each LVM operation, errors received from each device are
- # counted. If the counter of a device exceeds the limit set here,
- # no further I/O is sent to that device for the remainder of the
- # operation. Setting this to 0 disables the counters altogether.
+ # This setting is no longer used.
disable_after_error_count = 0
# Configuration option devices/require_restorefile_with_uuid.
@@ -1557,20 +1547,7 @@ activation {
# stripesize = 64
# Configuration option metadata/dirs.
- # Directories holding live copies of text format metadata.
- # These directories must not be on logical volumes!
- # It's possible to use LVM with a couple of directories here,
- # preferably on different (non-LV) filesystems, and with no other
- # on-disk metadata (pvmetadatacopies = 0). Or this can be in addition
- # to on-disk metadata areas. The feature was originally added to
- # simplify testing and is not supported under low memory situations -
- # the machine could lock up. Never edit any files in these directories
- # by hand unless you are absolutely sure you know what you are doing!
- # Use the supplied toolset to make changes (e.g. vgcfgrestore).
- #
- # Example
- # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ]
- #
+ # This setting is no longer used.
# This configuration option is advanced.
# This configuration option does not have a default value defined.
# }
diff --git a/man/lvchange.8_pregen b/man/lvchange.8_pregen
index 8f9783a..03e0b1c 100644
--- a/man/lvchange.8_pregen
+++ b/man/lvchange.8_pregen
@@ -97,10 +97,6 @@ lvchange - Change the attributes of logical volume(s)
.ad b
.br
.ad l
- \fB--ignoreskippedcluster\fP
-.ad b
-.br
-.ad l
\fB--lockopt\fP \fIString\fP
.ad b
.br
@@ -520,10 +516,6 @@ Common options for command:
.ad b
.br
.ad l
-[ \fB--ignoreskippedcluster\fP ]
-.ad b
-.br
-.ad l
[ \fB--noudevsync\fP ]
.ad b
.br
@@ -818,13 +810,6 @@ Do not use this if dmeventd is already monitoring a device.
.ad b
.HP
.ad l
-\fB--ignoreskippedcluster\fP
-.br
-Use to avoid exiting with an non-zero status code if the command is run
-without clustered locking and clustered VGs are skipped.
-.ad b
-.HP
-.ad l
\fB--lockopt\fP \fIString\fP
.br
Used to pass options for special cases to lvmlockd.
diff --git a/man/lvdisplay.8_pregen b/man/lvdisplay.8_pregen
index 6211a47..9a8962b 100644
--- a/man/lvdisplay.8_pregen
+++ b/man/lvdisplay.8_pregen
@@ -72,10 +72,6 @@ and more, using a more compact and configurable output format.
.ad b
.br
.ad l
-[ \fB--ignoreskippedcluster\fP ]
-.ad b
-.br
-.ad l
[ \fB--logonly\fP ]
.ad b
.br
@@ -284,13 +280,6 @@ operations after locking failures.
.ad b
.HP
.ad l
-\fB--ignoreskippedcluster\fP
-.br
-Use to avoid exiting with an non-zero status code if the command is run
-without clustered locking and clustered VGs are skipped.
-.ad b
-.HP
-.ad l
\fB--lockopt\fP \fIString\fP
.br
Used to pass options for special cases to lvmlockd.
diff --git a/man/lvm-fullreport.8_pregen b/man/lvm-fullreport.8_pregen
index 4a8d7b3..111b8ef 100644
--- a/man/lvm-fullreport.8_pregen
+++ b/man/lvm-fullreport.8_pregen
@@ -56,10 +56,6 @@ if information changes between commands.
.ad b
.br
.ad l
-[ \fB--ignoreskippedcluster\fP ]
-.ad b
-.br
-.ad l
[ \fB--logonly\fP ]
.ad b
.br
@@ -255,13 +251,6 @@ operations after locking failures.
.ad b
.HP
.ad l
-\fB--ignoreskippedcluster\fP
-.br
-Use to avoid exiting with an non-zero status code if the command is run
-without clustered locking and clustered VGs are skipped.
-.ad b
-.HP
-.ad l
\fB--lockopt\fP \fIString\fP
.br
Used to pass options for special cases to lvmlockd.
diff --git a/man/lvs.8_pregen b/man/lvs.8_pregen
index b5128f9..fecca99 100644
--- a/man/lvs.8_pregen
+++ b/man/lvs.8_pregen
@@ -60,10 +60,6 @@ lvs produces formatted output about LVs.
.ad b
.br
.ad l
-[ \fB--ignoreskippedcluster\fP ]
-.ad b
-.br
-.ad l
[ \fB--logonly\fP ]
.ad b
.br
@@ -270,13 +266,6 @@ operations after locking failures.
.ad b
.HP
.ad l
-\fB--ignoreskippedcluster\fP
-.br
-Use to avoid exiting with an non-zero status code if the command is run
-without clustered locking and clustered VGs are skipped.
-.ad b
-.HP
-.ad l
\fB--lockopt\fP \fIString\fP
.br
Used to pass options for special cases to lvmlockd.
diff --git a/man/pvchange.8_pregen b/man/pvchange.8_pregen
index 5da8eca..8c9288d 100644
--- a/man/pvchange.8_pregen
+++ b/man/pvchange.8_pregen
@@ -98,10 +98,6 @@ Common options for command:
.ad b
.br
.ad l
-[ \fB--ignoreskippedcluster\fP ]
-.ad b
-.br
-.ad l
[ \fB--reportformat\fP \fBbasic\fP|\fBjson\fP ]
.ad b
.RE
@@ -244,13 +240,6 @@ Display help text.
.ad b
.HP
.ad l
-\fB--ignoreskippedcluster\fP
-.br
-Use to avoid exiting with an non-zero status code if the command is run
-without clustered locking and clustered VGs are skipped.
-.ad b
-.HP
-.ad l
\fB--lockopt\fP \fIString\fP
.br
Used to pass options for special cases to lvmlockd.
diff --git a/man/pvdisplay.8_pregen b/man/pvdisplay.8_pregen
index 5f39e7b..9dbcac3 100644
--- a/man/pvdisplay.8_pregen
+++ b/man/pvdisplay.8_pregen
@@ -72,10 +72,6 @@ and more, using a more compact and configurable output format.
.ad b
.br
.ad l
-[ \fB--ignoreskippedcluster\fP ]
-.ad b
-.br
-.ad l
[ \fB--logonly\fP ]
.ad b
.br
@@ -271,13 +267,6 @@ operations after locking failures.
.ad b
.HP
.ad l
-\fB--ignoreskippedcluster\fP
-.br
-Use to avoid exiting with an non-zero status code if the command is run
-without clustered locking and clustered VGs are skipped.
-.ad b
-.HP
-.ad l
\fB--lockopt\fP \fIString\fP
.br
Used to pass options for special cases to lvmlockd.
diff --git a/man/pvs.8_pregen b/man/pvs.8_pregen
index 59f1e3d..53c259c 100644
--- a/man/pvs.8_pregen
+++ b/man/pvs.8_pregen
@@ -56,10 +56,6 @@ pvs produces formatted output about PVs.
.ad b
.br
.ad l
-[ \fB--ignoreskippedcluster\fP ]
-.ad b
-.br
-.ad l
[ \fB--logonly\fP ]
.ad b
.br
@@ -257,13 +253,6 @@ operations after locking failures.
.ad b
.HP
.ad l
-\fB--ignoreskippedcluster\fP
-.br
-Use to avoid exiting with an non-zero status code if the command is run
-without clustered locking and clustered VGs are skipped.
-.ad b
-.HP
-.ad l
\fB--lockopt\fP \fIString\fP
.br
Used to pass options for special cases to lvmlockd.
diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen
index a9ac546..94dbd88 100644
--- a/man/vgchange.8_pregen
+++ b/man/vgchange.8_pregen
@@ -75,10 +75,6 @@ vgchange - Change volume group attributes
.ad b
.br
.ad l
- \fB--ignoreskippedcluster\fP
-.ad b
-.br
-.ad l
\fB--lockopt\fP \fIString\fP
.ad b
.br
@@ -279,10 +275,6 @@ required, after which the others are optional.
.ad b
.br
.ad l
-[ \fB--ignoreskippedcluster\fP ]
-.ad b
-.br
-.ad l
[ \fB--noudevsync\fP ]
.ad b
.br
@@ -333,10 +325,6 @@ Start or stop monitoring LVs from dmeventd.
.ad b
.br
.ad l
-[ \fB--ignoreskippedcluster\fP ]
-.ad b
-.br
-.ad l
[ \fB--noudevsync\fP ]
.ad b
.br
@@ -379,10 +367,6 @@ Start or stop processing LV conversions.
.ad b
.br
.ad l
-[ \fB--ignoreskippedcluster\fP ]
-.ad b
-.br
-.ad l
[ \fB--noudevsync\fP ]
.ad b
.br
@@ -449,10 +433,6 @@ Activate or deactivate LVs.
.ad b
.br
.ad l
-[ \fB--ignoreskippedcluster\fP ]
-.ad b
-.br
-.ad l
[ \fB--noudevsync\fP ]
.ad b
.br
@@ -503,10 +483,6 @@ Reactivate LVs using the latest metadata.
.ad b
.br
.ad l
-[ \fB--ignoreskippedcluster\fP ]
-.ad b
-.br
-.ad l
[ \fB--noudevsync\fP ]
.ad b
.br
@@ -800,13 +776,6 @@ Do not use this if dmeventd is already monitoring a device.
.ad b
.HP
.ad l
-\fB--ignoreskippedcluster\fP
-.br
-Use to avoid exiting with an non-zero status code if the command is run
-without clustered locking and clustered VGs are skipped.
-.ad b
-.HP
-.ad l
\fB--lockopt\fP \fIString\fP
.br
Used to pass options for special cases to lvmlockd.
diff --git a/man/vgconvert.8_pregen b/man/vgconvert.8_pregen
index 16e1fc8..b2a6027 100644
--- a/man/vgconvert.8_pregen
+++ b/man/vgconvert.8_pregen
@@ -8,9 +8,9 @@ vgconvert - Change volume group metadata format
[ \fIoption_args\fP ]
.br
.SH DESCRIPTION
-vgconvert converts VG metadata from one format to another. This command
-is no longer used because this version of lvm no longer supports the LVM1
-format.
+vgconvert is no longer a part of LVM. It was removed along with
+support for the LVM1 format. Use an older version of LVM to
+convert VGs from the LVM1 format to LVM2.
.SH USAGE
\fBvgconvert\fP \fIVG\fP ...
.br
@@ -46,7 +46,6 @@ format.
[ COMMON_OPTIONS ]
.RE
.br
-
Common options for lvm:
.
.RS 4
@@ -106,6 +105,7 @@ Common options for lvm:
[ \fB--version\fP ]
.ad b
.RE
+
.SH OPTIONS
.HP
.ad l
@@ -301,6 +301,7 @@ capital letters mean multiple of 1000.)
.SH ENVIRONMENT VARIABLES
See \fBlvm\fP(8) for information about environment variables used by lvm.
For example, LVM_VG_NAME can generally be substituted for a required VG parameter.
+
.SH SEE ALSO
.BR lvm (8)
diff --git a/man/vgdisplay.8_pregen b/man/vgdisplay.8_pregen
index 89e3603..7c8fb12 100644
--- a/man/vgdisplay.8_pregen
+++ b/man/vgdisplay.8_pregen
@@ -67,10 +67,6 @@ and more, using a more compact and configurable output format.
.ad b
.br
.ad l
-[ \fB--ignoreskippedcluster\fP ]
-.ad b
-.br
-.ad l
[ \fB--logonly\fP ]
.ad b
.br
@@ -266,13 +262,6 @@ operations after locking failures.
.ad b
.HP
.ad l
-\fB--ignoreskippedcluster\fP
-.br
-Use to avoid exiting with an non-zero status code if the command is run
-without clustered locking and clustered VGs are skipped.
-.ad b
-.HP
-.ad l
\fB--lockopt\fP \fIString\fP
.br
Used to pass options for special cases to lvmlockd.
diff --git a/man/vgs.8_pregen b/man/vgs.8_pregen
index 681711b..c8a9611 100644
--- a/man/vgs.8_pregen
+++ b/man/vgs.8_pregen
@@ -52,10 +52,6 @@ vgs produces formatted output about VGs.
.ad b
.br
.ad l
-[ \fB--ignoreskippedcluster\fP ]
-.ad b
-.br
-.ad l
[ \fB--logonly\fP ]
.ad b
.br
@@ -252,13 +248,6 @@ operations after locking failures.
.ad b
.HP
.ad l
-\fB--ignoreskippedcluster\fP
-.br
-Use to avoid exiting with an non-zero status code if the command is run
-without clustered locking and clustered VGs are skipped.
-.ad b
-.HP
-.ad l
\fB--lockopt\fP \fIString\fP
.br
Used to pass options for special cases to lvmlockd.
5 years, 10 months