master - Remove checking for locked VGs
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c4153a8dfca9defcea6...
Commit: c4153a8dfca9defcea645818dcd547388858c51e
Parent: 3b6b7f8f9be1841fc7d283203a1f3261e7e3622a
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Jun 11 12:25:52 2018 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Jun 12 09:46:04 2018 -0500
Remove checking for locked VGs
A few places were calling a function to check if a
VG lock was held. The only place it was actually
needed is for pvcreate which wants to do its own
locking (and scanning) around process_each_pv.
The locking/scanning exceptions for pvcreate in
process_each_pv/vg_read can be enabled by just passing
a couple of flags instead of checking if the VG is
already locked. This also means that these special
cases won't be enabled unknowingly in other places
where they shouldn't be used.
---
lib/cache/lvmcache.c | 8 ---
lib/cache/lvmcache.h | 1 -
lib/metadata/metadata-exported.h | 2 +
lib/metadata/metadata.c | 18 ++-----
tools/toollib.c | 94 +++++++++++---------------------------
5 files changed, 34 insertions(+), 89 deletions(-)
diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c
index 923fb2e..757ed88 100644
--- a/lib/cache/lvmcache.c
+++ b/lib/cache/lvmcache.c
@@ -142,14 +142,6 @@ void lvmcache_lock_vgname(const char *vgname, int read_only __attribute__((unuse
_vgs_locked++;
}
-int lvmcache_vgname_is_locked(const char *vgname)
-{
- if (!_lock_hash)
- return 0;
-
- return dm_hash_lookup(_lock_hash, is_orphan_vg(vgname) ? VG_ORPHANS : vgname) ? 1 : 0;
-}
-
void lvmcache_unlock_vgname(const char *vgname)
{
if (!dm_hash_lookup(_lock_hash, vgname))
diff --git a/lib/cache/lvmcache.h b/lib/cache/lvmcache.h
index 536f6fd..008f110 100644
--- a/lib/cache/lvmcache.h
+++ b/lib/cache/lvmcache.h
@@ -105,7 +105,6 @@ struct device *lvmcache_device_from_pvid(struct cmd_context *cmd, const struct i
const char *lvmcache_vgname_from_info(struct lvmcache_info *info);
const struct format_type *lvmcache_fmt_from_info(struct lvmcache_info *info);
int lvmcache_vgs_locked(void);
-int lvmcache_vgname_is_locked(const char *vgname);
void lvmcache_seed_infos_from_lvmetad(struct cmd_context *cmd);
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index bcd10a3..641bf49 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -178,6 +178,8 @@
#define READ_OK_NOTFOUND 0x00040000U
#define READ_WARN_INCONSISTENT 0x00080000U
#define READ_FOR_UPDATE 0x00100000U /* A meta-flag, useful with toollib for_each_* functions. */
+#define PROCESS_SKIP_SCAN 0x00200000U /* skip lvmcache_label_scan in process_each_pv */
+#define PROCESS_SKIP_ORPHAN_LOCK 0x00400000U /* skip lock_vol(VG_ORPHAN) in vg_read */
/* vg's "read_status" field */
#define FAILED_INCONSISTENT 0x00000001U
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index ff8f1a5..30b22c0 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -3049,12 +3049,6 @@ int vg_commit(struct volume_group *vg)
int cache_updated = 0;
struct pv_list *pvl;
- if (!lvmcache_vgname_is_locked(vg->name)) {
- log_error(INTERNAL_ERROR "Attempt to write new VG metadata "
- "without locking %s", vg->name);
- return cache_updated;
- }
-
cache_updated = _vg_commit_mdas(vg);
set_vg_notify(vg->cmd);
@@ -5032,7 +5026,7 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha
uint32_t failure = 0;
uint32_t warn_flags = 0;
int is_shared = 0;
- int already_locked;
+ int skip_lock = is_orphan_vg(vg_name) && (read_flags & PROCESS_SKIP_ORPHAN_LOCK);
if ((read_flags & READ_ALLOW_INCONSISTENT) || (lock_flags != LCK_VG_WRITE))
consistent = 0;
@@ -5043,15 +5037,13 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha
return NULL;
}
- already_locked = lvmcache_vgname_is_locked(vg_name);
-
- if (!already_locked &&
+ if (!skip_lock &&
!lock_vol(cmd, vg_name, lock_flags, NULL)) {
log_error("Can't get lock for %s", vg_name);
return _vg_make_handle(cmd, vg, FAILED_LOCKING);
}
- if (already_locked)
+ if (skip_lock)
log_very_verbose("Locking %s already done", vg_name);
if (is_orphan_vg(vg_name))
@@ -5119,13 +5111,13 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha
goto_bad;
if (!(vg = _vg_make_handle(cmd, vg, failure)) || vg_read_error(vg))
- if (!already_locked)
+ if (!skip_lock)
unlock_vg(cmd, vg, vg_name);
return vg;
bad:
- if (!already_locked)
+ if (!skip_lock)
unlock_vg(cmd, vg, vg_name);
bad_no_unlock:
diff --git a/tools/toollib.c b/tools/toollib.c
index 7da1703..fb37d07 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -1926,7 +1926,6 @@ static int _process_vgnameid_list(struct cmd_context *cmd, uint32_t read_flags,
int skip;
int notfound;
int process_all = 0;
- int already_locked;
int do_report_ret_code = 1;
log_set_report_object_type(LOG_REPORT_OBJECT_TYPE_VG);
@@ -1969,8 +1968,6 @@ static int _process_vgnameid_list(struct cmd_context *cmd, uint32_t read_flags,
continue;
}
- already_locked = lvmcache_vgname_is_locked(vg_name);
-
vg = vg_read(cmd, vg_name, vg_uuid, read_flags, lockd_state);
if (_ignore_vg(vg, vg_name, arg_vgnames, read_flags, &skip, ¬found)) {
stack;
@@ -1998,7 +1995,7 @@ static int _process_vgnameid_list(struct cmd_context *cmd, uint32_t read_flags,
ret_max = ret;
}
- if (!vg_read_error(vg) && !already_locked)
+ if (!vg_read_error(vg))
unlock_vg(cmd, vg, vg_name);
endvg:
release_vg(vg);
@@ -3577,7 +3574,6 @@ static int _process_lv_vgnameid_list(struct cmd_context *cmd, uint32_t read_flag
int ret;
int skip;
int notfound;
- int already_locked;
int do_report_ret_code = 1;
log_set_report_object_type(LOG_REPORT_OBJECT_TYPE_VG);
@@ -3638,8 +3634,6 @@ static int _process_lv_vgnameid_list(struct cmd_context *cmd, uint32_t read_flag
continue;
}
- already_locked = lvmcache_vgname_is_locked(vg_name);
-
vg = vg_read(cmd, vg_name, vg_uuid, read_flags, lockd_state);
if (_ignore_vg(vg, vg_name, arg_vgnames, read_flags, &skip, ¬found)) {
stack;
@@ -3658,8 +3652,7 @@ static int _process_lv_vgnameid_list(struct cmd_context *cmd, uint32_t read_flag
if (ret > ret_max)
ret_max = ret;
- if (!already_locked)
- unlock_vg(cmd, vg, vg_name);
+ unlock_vg(cmd, vg, vg_name);
endvg:
release_vg(vg);
if (!lockd_vg(cmd, vg_name, "un", 0, &lockd_state))
@@ -4299,7 +4292,7 @@ static int _process_pvs_in_vgs(struct cmd_context *cmd, uint32_t read_flags,
int ret;
int skip;
int notfound;
- int already_locked;
+ int skip_lock;
int do_report_ret_code = 1;
log_set_report_object_type(LOG_REPORT_OBJECT_TYPE_VG);
@@ -4333,7 +4326,7 @@ static int _process_pvs_in_vgs(struct cmd_context *cmd, uint32_t read_flags,
log_debug("Processing PVs in VG %s", vg_name);
- already_locked = lvmcache_vgname_is_locked(vg_name);
+ skip_lock = is_orphan_vg(vg_name) && (read_flags & PROCESS_SKIP_ORPHAN_LOCK);
vg = vg_read(cmd, vg_name, vg_uuid, read_flags, lockd_state);
if (_ignore_vg(vg, vg_name, NULL, read_flags, &skip, ¬found)) {
@@ -4361,7 +4354,7 @@ static int _process_pvs_in_vgs(struct cmd_context *cmd, uint32_t read_flags,
if (ret > ret_max)
ret_max = ret;
- if (!skip && !already_locked)
+ if (!skip && !skip_lock)
unlock_vg(cmd, vg, vg->name);
endvg:
release_vg(vg);
@@ -4400,7 +4393,6 @@ int process_each_pv(struct cmd_context *cmd,
struct device_id_list *dil;
int process_all_pvs;
int process_all_devices;
- int orphans_locked;
int ret_max = ECMD_PROCESSED;
int ret;
@@ -4448,8 +4440,6 @@ int process_each_pv(struct cmd_context *cmd,
return ECMD_FAILED;
}
- orphans_locked = lvmcache_vgname_is_locked(VG_ORPHANS);
-
process_all_pvs = dm_list_empty(&arg_pvnames) && dm_list_empty(&arg_tags);
process_all_devices = process_all_pvs && (cmd->cname->flags & ENABLE_ALL_DEVS) && all_is_set;
@@ -4460,22 +4450,8 @@ int process_each_pv(struct cmd_context *cmd,
goto_out;
}
- /*
- * This full scan would be done by _get_all_devices() if
- * it were not done here first. It's called here first
- * so that get_vgnameids() will look at any new devices.
- * When orphans is already locked, these steps are done
- * before process_each_pv is called.
- */
- if (!trust_cache() && !orphans_locked) {
- lvmcache_destroy(cmd, 1, 0);
-
- /*
- * Scan all devices to populate lvmcache with initial
- * list of PVs and VGs.
- */
+ if (!(read_flags & PROCESS_SKIP_SCAN))
lvmcache_label_scan(cmd);
- }
if (!get_vgnameids(cmd, &all_vgnameids, only_this_vgname, 1)) {
ret_max = ret;
@@ -4546,11 +4522,9 @@ int process_each_pv(struct cmd_context *cmd,
ret_max = ret;
/*
- * If the orphans lock was held, there shouldn't be missed devices. If
- * there were, we cannot clear the cache while holding the orphans lock
- * anyway.
+ * If the orphans lock was held, there shouldn't be missed devices.
*/
- if (orphans_locked)
+ if (read_flags & PROCESS_SKIP_ORPHAN_LOCK)
goto skip_missed;
/*
@@ -4577,12 +4551,7 @@ int process_each_pv(struct cmd_context *cmd,
log_verbose("Some PVs were not found in first search, retrying.");
- lvmcache_destroy(cmd, 0, 0);
- if (!lvmcache_init(cmd)) {
- log_error("Failed to initalize lvm cache.");
- ret_max = ECMD_FAILED;
- goto out;
- }
+ lvmcache_label_scan(cmd);
lvmcache_seed_infos_from_lvmetad(cmd);
ret = _process_pvs_in_vgs(cmd, read_flags, &all_vgnameids, &all_devices,
@@ -5413,25 +5382,16 @@ int pvcreate_each_device(struct cmd_context *cmd,
dm_list_add(&pp->arg_devices, &pd->list);
}
- /*
- * Clear the cache before acquiring the orphan lock. (Clearing the
- * cache with locks held is an error.) We want the orphan lock
- * acquired before process_each_pv. If the orphan lock is not held
- * when process_each_pv is called, then process_each_pv clears the
- * cache.
- */
- lvmcache_destroy(cmd, 1, 0);
-
- /*
- * If no prompts require a user response, this orphan lock is held
- * throughout, and pvcreate_each_device() returns with it held so that
- * vgcreate/vgextend use the PVs created here to add to a VG.
- */
if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE, NULL)) {
log_error("Can't get lock for orphan PVs.");
return 0;
}
+ /*
+ * Scan before calling process_each_pv so we can set up the PV args
+ * first. We can then skip the scan that would normally occur at the
+ * beginning of process_each_pv.
+ */
lvmcache_label_scan(cmd);
/*
@@ -5455,8 +5415,8 @@ int pvcreate_each_device(struct cmd_context *cmd,
* If it's added to arg_process but needs a prompt or force option, then
* a corresponding prompt entry is added to pp->prompts.
*/
- process_each_pv(cmd, 0, NULL, NULL, 1, 0, handle,
- pp->is_remove ? _pvremove_check_single : _pvcreate_check_single);
+ process_each_pv(cmd, 0, NULL, NULL, 1, PROCESS_SKIP_SCAN | PROCESS_SKIP_ORPHAN_LOCK,
+ handle, pp->is_remove ? _pvremove_check_single : _pvcreate_check_single);
/*
* A fatal error was found while checking.
@@ -5538,9 +5498,11 @@ int pvcreate_each_device(struct cmd_context *cmd,
goto do_command;
/*
- * Prompts require asking the user, so release the orphans lock, ask
- * the questions, reacquire the orphans lock, verify that the PVs were
- * not used during the questions, then do the create steps.
+ * Prompts require asking the user and make take some time, during
+ * which we don't want to block other commands. So, release the lock
+ * to prevent blocking other commands while we wait. After a response
+ * from the user, reacquire the lock, verify that the PVs were not used
+ * during the wait, then do the create steps.
*/
unlock_vg(cmd, NULL, VG_ORPHANS);
@@ -5575,14 +5537,11 @@ int pvcreate_each_device(struct cmd_context *cmd,
}
/*
- * Clear the cache, reacquire the orphans write lock, then check again
- * that the devices can still be used. If the second loop finds them
- * changed, or can't find them any more, then they aren't used.
- * Clear the cache here before locking orphans, since it won't be
- * done by process_each_pv with orphans already locked.
+ * Reacquire the lock that was released above before waiting, then
+ * check again that the devices can still be used. If the second loop
+ * finds them changed, or can't find them any more, then they aren't
+ * used.
*/
- lvmcache_destroy(cmd, 1, 0);
-
if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE, NULL)) {
log_error("Can't get lock for orphan PVs.");
goto out;
@@ -5604,7 +5563,8 @@ int pvcreate_each_device(struct cmd_context *cmd,
*/
dm_list_splice(&pp->arg_confirm, &pp->arg_process);
- process_each_pv(cmd, 0, NULL, NULL, 1, 0, handle, _pv_confirm_single);
+ process_each_pv(cmd, 0, NULL, NULL, 1, PROCESS_SKIP_SCAN | PROCESS_SKIP_ORPHAN_LOCK,
+ handle, _pv_confirm_single);
dm_list_iterate_items(pd, &pp->arg_confirm)
log_error("Device %s %s.", pd->name, dev_cache_filtered_reason(pd->name));
5 years, 10 months
master - lvmlockd: skip repair lock upgrade for non shared vgs
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3b6b7f8f9be1841fc7d...
Commit: 3b6b7f8f9be1841fc7d283203a1f3261e7e3622a
Parent: 1c79cf9830390cfbe31d3146da66cbe36ac3e72a
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Jun 12 09:25:51 2018 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Jun 12 09:44:05 2018 -0500
lvmlockd: skip repair lock upgrade for non shared vgs
Only attempt lvmlockd lock upgrade for shared VGs.
---
lib/metadata/metadata.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index e45f5c1..ff8f1a5 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -4765,7 +4765,8 @@ int vg_check_status(const struct volume_group *vg, uint64_t status)
* VG is left unlocked on failure
*/
static struct volume_group *_recover_vg(struct cmd_context *cmd,
- const char *vg_name, const char *vgid, uint32_t lockd_state)
+ const char *vg_name, const char *vgid,
+ int is_shared, uint32_t lockd_state)
{
int consistent = 1;
struct volume_group *vg;
@@ -4779,7 +4780,7 @@ static struct volume_group *_recover_vg(struct cmd_context *cmd,
/*
* Convert vg lock in lvmlockd from sh to ex.
*/
- if (!(lockd_state & LDST_FAIL) && !(lockd_state & LDST_EX)) {
+ if (is_shared && !(lockd_state & LDST_FAIL) && !(lockd_state & LDST_EX)) {
log_debug("Upgrade lvmlockd lock to repair vg %s.", vg_name);
if (!lockd_vg(cmd, vg_name, "ex", 0, &state)) {
log_warn("Skip repair for shared VG without exclusive lock.");
@@ -5030,6 +5031,7 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha
int consistent_in;
uint32_t failure = 0;
uint32_t warn_flags = 0;
+ int is_shared = 0;
int already_locked;
if ((read_flags & READ_ALLOW_INCONSISTENT) || (lock_flags != LCK_VG_WRITE))
@@ -5078,8 +5080,9 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha
/* consistent == 0 when VG is not found, but failed == FAILED_NOTFOUND */
if (!consistent && !failure) {
+ is_shared = vg_is_shared(vg);
release_vg(vg);
- if (!(vg = _recover_vg(cmd, vg_name, vgid, lockd_state))) {
+ if (!(vg = _recover_vg(cmd, vg_name, vgid, is_shared, lockd_state))) {
if (is_orphan_vg(vg_name))
log_error("Recovery of standalone physical volumes failed.");
else
5 years, 10 months
master - build: ensure configure.h comes first
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1c79cf9830390cfbe31...
Commit: 1c79cf9830390cfbe31d3146da66cbe36ac3e72a
Parent: 77d5caae90a898888d32603bc7823de40f426c06
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Jun 11 22:38:51 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Jun 11 22:38:51 2018 +0200
build: ensure configure.h comes first
Fix header order so configure.h is 1st. included header.
---
device_mapper/libdm-report.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/device_mapper/libdm-report.c b/device_mapper/libdm-report.c
index e437e4c..cbd0d16 100644
--- a/device_mapper/libdm-report.c
+++ b/device_mapper/libdm-report.c
@@ -13,8 +13,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "base/memory/zalloc.h"
#include "misc/dmlib.h"
+#include "base/memory/zalloc.h"
#include <ctype.h>
#include <math.h> /* fabs() */
5 years, 10 months
master - snapshot: improve checking of merging snapshot
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=77d5caae90a898888d3...
Commit: 77d5caae90a898888d32603bc7823de40f426c06
Parent: 75fed05d3ef648583764ff56cc577e0f3eba1bba
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Jun 11 22:19:20 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Jun 11 22:25:42 2018 +0200
snapshot: improve checking of merging snapshot
Add runtime detection for 'lvs -o+seg_monitor' and 'vgchange --monitor'.
This fix should avoid unnecessary timeout on systemd shutdown.
---
WHATS_NEW | 1 +
lib/activate/activate.c | 3 ++-
lib/metadata/lv.c | 3 ++-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 162b584..a875553 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 3.0.0
=============
+ Fix unmonitoring of merging snapshots.
Cache can uses metadata format 2 with cleaner policy.
Fix check if resized PV can also fit metadata area.
Avoid showing internal error in lvs output or pvmoved LVs.
diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index ce67ec8..8f4462a 100644
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -1735,7 +1735,8 @@ int monitor_dev_for_events(struct cmd_context *cmd, const struct logical_volume
* In case of a snapshot device, we monitor lv->snapshot->lv,
* not the actual LV itself.
*/
- if (lv_is_cow(lv) && (laopts->no_merging || !lv_is_merging_cow(lv))) {
+ if (lv_is_cow(lv) && (laopts->no_merging || !lv_is_merging_cow(lv) ||
+ lv_has_target_type(lv->vg->cmd->mem, lv, NULL, TARGET_NAME_SNAPSHOT))) {
if (!(r = monitor_dev_for_events(cmd, lv->snapshot->lv, NULL, monitor)))
stack;
return r;
diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c
index 14d7312..7ab06cb 100644
--- a/lib/metadata/lv.c
+++ b/lib/metadata/lv.c
@@ -301,7 +301,8 @@ char *lvseg_monitor_dup(struct dm_pool *mem, const struct lv_segment *seg)
int pending = 0, monitored = 0;
struct lv_segment *segm = (struct lv_segment *) seg;
- if (lv_is_cow(seg->lv) && !lv_is_merging_cow(seg->lv))
+ if (lv_is_cow(seg->lv) && (!lv_is_merging_cow(seg->lv) ||
+ lv_has_target_type(seg->lv->vg->cmd->mem, seg->lv, NULL, TARGET_NAME_SNAPSHOT)))
segm = first_seg(seg->lv->snapshot->lv);
// log_debug("Query LV:%s mon:%s segm:%s tgtm:%p segmon:%d statusm:%d", seg->lv->name, segm->lv->name, segm->segtype->name, segm->segtype->ops->target_monitored, seg_monitored(segm), (int)(segm->status & PVMOVE));
5 years, 10 months
master - vgchange: start polling with option
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=75fed05d3ef64858376...
Commit: 75fed05d3ef648583764ff56cc577e0f3eba1bba
Parent: e82b70e7399b20dd201e8d7fad182ce276596fb2
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Jun 11 22:18:00 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Jun 11 22:25:42 2018 +0200
vgchange: start polling with option
Polling start either with '--refresh'
or with '--poll' option specified.
---
tools/vgchange.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/tools/vgchange.c b/tools/vgchange.c
index b07057f..b427a81 100644
--- a/tools/vgchange.c
+++ b/tools/vgchange.c
@@ -662,6 +662,7 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name,
}
if (!arg_is_set(cmd, refresh_ARG) &&
+ arg_is_set(cmd, poll_ARG) &&
!vgchange_background_polling(cmd, vg))
return_ECMD_FAILED;
5 years, 10 months
master - build: use internal libs for lvm2cmd
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e82b70e7399b20dd201...
Commit: e82b70e7399b20dd201e8d7fad182ce276596fb2
Parent: 9c7ee1e1c4e436060d3b1970c73084d41012f108
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Jun 11 22:15:49 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Jun 11 22:25:42 2018 +0200
build: use internal libs for lvm2cmd
---
tools/Makefile.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 2dbd93b..9742842 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -177,7 +177,7 @@ liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
$(Q) $(CC) -shared -Wl,-soname,$@.$(LIB_VERSION) \
$(CFLAGS) $(CLDFLAGS) -o $@ \
@CLDWHOLEARCHIVE@ liblvm2cmd.a @CLDNOWHOLEARCHIVE@ \
- $(LVMLIBS) $(LIBS)
+ $(LVMLIBS) $(INTERNAL_LIBS) $(LIBS)
liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX)
@echo " [LN] $@"
5 years, 10 months
master - build: link dmeventd plugins with internal libs
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9c7ee1e1c4e436060d3...
Commit: 9c7ee1e1c4e436060d3b1970c73084d41012f108
Parent: 5c2f7f083cc518b11e657b294f42e38a688404e1
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Jun 11 21:09:45 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Jun 11 22:25:42 2018 +0200
build: link dmeventd plugins with internal libs
---
daemons/dmeventd/plugins/lvm2/Makefile.in | 2 +-
daemons/dmeventd/plugins/mirror/Makefile.in | 2 +-
daemons/dmeventd/plugins/raid/Makefile.in | 2 +-
daemons/dmeventd/plugins/snapshot/Makefile.in | 2 +-
daemons/dmeventd/plugins/thin/Makefile.in | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/daemons/dmeventd/plugins/lvm2/Makefile.in b/daemons/dmeventd/plugins/lvm2/Makefile.in
index 7e4696c..e4eedc6 100644
--- a/daemons/dmeventd/plugins/lvm2/Makefile.in
+++ b/daemons/dmeventd/plugins/lvm2/Makefile.in
@@ -24,7 +24,7 @@ LIB_VERSION = $(LIB_VERSION_LVM)
include $(top_builddir)/make.tmpl
-LIBS += @LVM2CMD_LIB@ $(PTHREAD_LIBS)
+LIBS += @LVM2CMD_LIB@ $(INTERNAL_LIBS) $(PTHREAD_LIBS)
install_lvm2: install_lib_shared
diff --git a/daemons/dmeventd/plugins/mirror/Makefile.in b/daemons/dmeventd/plugins/mirror/Makefile.in
index 22832dd..a28b9e5 100644
--- a/daemons/dmeventd/plugins/mirror/Makefile.in
+++ b/daemons/dmeventd/plugins/mirror/Makefile.in
@@ -30,7 +30,7 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow
include $(top_builddir)/make.tmpl
-LIBS += -ldevmapper-event-lvm2
+LIBS += -ldevmapper-event-lvm2 $(INTERNAL_LIBS)
install_lvm2: install_dm_plugin
diff --git a/daemons/dmeventd/plugins/raid/Makefile.in b/daemons/dmeventd/plugins/raid/Makefile.in
index 54343b1..d38ca15 100644
--- a/daemons/dmeventd/plugins/raid/Makefile.in
+++ b/daemons/dmeventd/plugins/raid/Makefile.in
@@ -29,7 +29,7 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow
include $(top_builddir)/make.tmpl
-LIBS += -ldevmapper-event-lvm2
+LIBS += -ldevmapper-event-lvm2 $(INTERNAL_LIBS)
install_lvm2: install_dm_plugin
diff --git a/daemons/dmeventd/plugins/snapshot/Makefile.in b/daemons/dmeventd/plugins/snapshot/Makefile.in
index 75f4342..ab46b43 100644
--- a/daemons/dmeventd/plugins/snapshot/Makefile.in
+++ b/daemons/dmeventd/plugins/snapshot/Makefile.in
@@ -26,7 +26,7 @@ LIB_VERSION = $(LIB_VERSION_LVM)
include $(top_builddir)/make.tmpl
-LIBS += -ldevmapper-event-lvm2
+LIBS += -ldevmapper-event-lvm2 $(INTERNAL_LIBS)
install_lvm2: install_dm_plugin
diff --git a/daemons/dmeventd/plugins/thin/Makefile.in b/daemons/dmeventd/plugins/thin/Makefile.in
index 9f1c2b3..b1e3e1b 100644
--- a/daemons/dmeventd/plugins/thin/Makefile.in
+++ b/daemons/dmeventd/plugins/thin/Makefile.in
@@ -29,7 +29,7 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow
include $(top_builddir)/make.tmpl
-LIBS += -ldevmapper-event-lvm2
+LIBS += -ldevmapper-event-lvm2 $(INTERNAL_LIBS)
install_lvm2: install_dm_plugin
5 years, 10 months
master - build: make generate
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5c2f7f083cc518b11e6...
Commit: 5c2f7f083cc518b11e657b294f42e38a688404e1
Parent: 2a307ce33c515268763c714275bd4a85bf9fd0fa
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Jun 8 22:16:00 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Jun 11 22:25:42 2018 +0200
build: make generate
---
conf/example.conf.in | 43 ++++---------------------------------------
man/lvchange.8_pregen | 14 ++++++++++++++
man/lvconvert.8_pregen | 14 ++++++++++++++
man/lvcreate.8_pregen | 14 ++++++++++++++
man/lvdisplay.8_pregen | 10 ++++++++++
man/lvextend.8_pregen | 14 ++++++++++++++
man/lvm-fullreport.8_pregen | 8 ++++----
man/lvm-lvpoll.8_pregen | 10 ++++++++++
man/lvmconfig.8_pregen | 10 ++++++++++
man/lvmdiskscan.8_pregen | 10 ++++++++++
man/lvreduce.8_pregen | 10 ++++++++++
man/lvremove.8_pregen | 10 ++++++++++
man/lvrename.8_pregen | 10 ++++++++++
man/lvresize.8_pregen | 14 ++++++++++++++
man/lvs.8_pregen | 8 ++++----
man/lvscan.8_pregen | 10 ++++++++++
man/pvchange.8_pregen | 10 ++++++++++
man/pvck.8_pregen | 10 ++++++++++
man/pvcreate.8_pregen | 10 ++++++++++
man/pvdisplay.8_pregen | 10 ++++++++++
man/pvmove.8_pregen | 10 ++++++++++
man/pvremove.8_pregen | 10 ++++++++++
man/pvresize.8_pregen | 10 ++++++++++
man/pvs.8_pregen | 8 ++++----
man/pvscan.8_pregen | 10 ++++++++++
man/vgcfgbackup.8_pregen | 10 ++++++++++
man/vgcfgrestore.8_pregen | 14 ++++++++++++++
man/vgchange.8_pregen | 29 ++++++++++++++---------------
man/vgck.8_pregen | 10 ++++++++++
man/vgconvert.8_pregen | 10 ++++++++++
man/vgcreate.8_pregen | 17 ++++++++++++-----
man/vgdisplay.8_pregen | 10 ++++++++++
man/vgexport.8_pregen | 10 ++++++++++
man/vgextend.8_pregen | 10 ++++++++++
man/vgimport.8_pregen | 10 ++++++++++
man/vgimportclone.8_pregen | 10 ++++++++++
man/vgmerge.8_pregen | 10 ++++++++++
man/vgmknodes.8_pregen | 10 ++++++++++
man/vgreduce.8_pregen | 14 ++++++++++++++
man/vgremove.8_pregen | 10 ++++++++++
man/vgrename.8_pregen | 10 ++++++++++
man/vgs.8_pregen | 8 ++++----
man/vgscan.8_pregen | 10 ++++++++++
man/vgsplit.8_pregen | 20 ++++++++++----------
44 files changed, 444 insertions(+), 85 deletions(-)
diff --git a/conf/example.conf.in b/conf/example.conf.in
index 4c62aad..97daab2 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -728,34 +728,7 @@ global {
etc = "@CONFDIR@"
# Configuration option global/locking_type.
- # Type of locking to use.
- #
- # Accepted values:
- # 0
- # Turns off locking. Warning: this risks metadata corruption if
- # commands run concurrently.
- # 1
- # LVM uses local file-based locking, the standard mode.
- # 2
- # LVM uses the external shared library locking_library.
- # 3
- # LVM uses built-in clustered locking with clvmd.
- # This is incompatible with lvmetad. If use_lvmetad is enabled,
- # LVM prints a warning and disables lvmetad use.
- # 4
- # LVM uses read-only locking which forbids any operations that
- # might change metadata.
- # 5
- # Offers dummy locking for tools that do not need any locks.
- # You should not need to set this directly; the tools will select
- # when to use it instead of the configured locking_type.
- # Do not use lvmetad or the kernel device-mapper driver with this
- # locking type. It is used by the --readonly option that offers
- # read-only access to Volume Group metadata that cannot be locked
- # safely because it belongs to an inaccessible domain and might be
- # in use, for example a virtual machine image or a disk that is
- # shared by a clustered machine.
- #
+ # This setting is no longer used.
locking_type = 1
# Configuration option global/wait_for_locks.
@@ -763,19 +736,11 @@ global {
wait_for_locks = 1
# Configuration option global/fallback_to_clustered_locking.
- # Attempt to use built-in cluster locking if locking_type 2 fails.
- # If using external locking (type 2) and initialisation fails, with
- # this enabled, an attempt will be made to use the built-in clustered
- # locking. Disable this if using a customised locking_library.
+ # This setting is no longer used.
fallback_to_clustered_locking = 1
# Configuration option global/fallback_to_local_locking.
- # Use locking_type 1 (local) if locking_type 2 or 3 fail.
- # If an attempt to initialise type 2 or type 3 locking failed, perhaps
- # because cluster components such as clvmd are not running, with this
- # enabled, an attempt will be made to use local file-based locking
- # (type 1). If this succeeds, only commands against local VGs will
- # proceed. VGs marked as clustered will be ignored.
+ # This setting is no longer used.
fallback_to_local_locking = 1
# Configuration option global/locking_dir.
@@ -799,7 +764,7 @@ global {
# This configuration option does not have a default value defined.
# Configuration option global/locking_library.
- # The external locking library to use for locking_type 2.
+ # This setting is no longer used.
# This configuration option has an automatic default value.
# locking_library = "liblvm2clusterlock.so"
diff --git a/man/lvchange.8_pregen b/man/lvchange.8_pregen
index 26a6297..8f9783a 100644
--- a/man/lvchange.8_pregen
+++ b/man/lvchange.8_pregen
@@ -133,6 +133,10 @@ lvchange - Change the attributes of logical volume(s)
.ad b
.br
.ad l
+ \fB--nolocking\fP
+.ad b
+.br
+.ad l
\fB--noudevsync\fP
.ad b
.br
@@ -576,6 +580,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -876,6 +884,12 @@ See \fBdmeventd\fP(8) for more information.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--noudevsync\fP
.br
Disables udev synchronisation. The process will not wait for notification
diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen
index 91691a3..c9df4da 100644
--- a/man/lvconvert.8_pregen
+++ b/man/lvconvert.8_pregen
@@ -119,6 +119,10 @@ lvconvert - Change logical volume layout
.ad b
.br
.ad l
+ \fB--nolocking\fP
+.ad b
+.br
+.ad l
\fB--noudevsync\fP
.ad b
.br
@@ -903,6 +907,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -1177,6 +1185,12 @@ generated, where # is a number generated by LVM.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--noudevsync\fP
.br
Disables udev synchronisation. The process will not wait for notification
diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen
index 9dcb33f..b6483b5 100644
--- a/man/lvcreate.8_pregen
+++ b/man/lvcreate.8_pregen
@@ -143,6 +143,10 @@ lvcreate - Create a logical volume
.ad b
.br
.ad l
+ \fB--nolocking\fP
+.ad b
+.br
+.ad l
\fB--nosync\fP
.ad b
.br
@@ -916,6 +920,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -1254,6 +1262,12 @@ generated, where # is a number generated by LVM.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--nosync\fP
.br
Causes the creation of mirror, raid1, raid4, raid5 and raid10 to skip the
diff --git a/man/lvdisplay.8_pregen b/man/lvdisplay.8_pregen
index 33e4f5d..6211a47 100644
--- a/man/lvdisplay.8_pregen
+++ b/man/lvdisplay.8_pregen
@@ -170,6 +170,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -321,6 +325,12 @@ Useful if grepping the output.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--nosuffix\fP
.br
Suppress the suffix on output sizes. Use with --units
diff --git a/man/lvextend.8_pregen b/man/lvextend.8_pregen
index 130672e..b29f508 100644
--- a/man/lvextend.8_pregen
+++ b/man/lvextend.8_pregen
@@ -63,6 +63,10 @@ lvextend - Add space to a logical volume
.ad b
.br
.ad l
+ \fB--nolocking\fP
+.ad b
+.br
+.ad l
\fB--nosync\fP
.ad b
.br
@@ -324,6 +328,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -455,6 +463,12 @@ this option.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--nosync\fP
.br
Causes the creation of mirror, raid1, raid4, raid5 and raid10 to skip the
diff --git a/man/lvm-fullreport.8_pregen b/man/lvm-fullreport.8_pregen
index 3fb00b1..4a8d7b3 100644
--- a/man/lvm-fullreport.8_pregen
+++ b/man/lvm-fullreport.8_pregen
@@ -72,10 +72,6 @@ if information changes between commands.
.ad b
.br
.ad l
-[ \fB--nolocking\fP ]
-.ad b
-.br
-.ad l
[ \fB--nosuffix\fP ]
.ad b
.br
@@ -170,6 +166,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
diff --git a/man/lvm-lvpoll.8_pregen b/man/lvm-lvpoll.8_pregen
index 4591a28..1f4c129 100644
--- a/man/lvm-lvpoll.8_pregen
+++ b/man/lvm-lvpoll.8_pregen
@@ -84,6 +84,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -169,6 +173,12 @@ Display long help text.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--polloperation\fP \fBpvmove\fP|\fBconvert\fP|\fBmerge\fP|\fBmerge_thin\fP
.br
The command to perform from lvmpolld.
diff --git a/man/lvmconfig.8_pregen b/man/lvmconfig.8_pregen
index b47d589..0db2dd7 100644
--- a/man/lvmconfig.8_pregen
+++ b/man/lvmconfig.8_pregen
@@ -153,6 +153,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -281,6 +285,12 @@ See \fBlvm.conf\fP(5) for more information about profiles.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
diff --git a/man/lvmdiskscan.8_pregen b/man/lvmdiskscan.8_pregen
index 8b26d95..8eb57bf 100644
--- a/man/lvmdiskscan.8_pregen
+++ b/man/lvmdiskscan.8_pregen
@@ -79,6 +79,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -144,6 +148,12 @@ Only report PVs.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
diff --git a/man/lvreduce.8_pregen b/man/lvreduce.8_pregen
index 3aa4b5a..7acc042 100644
--- a/man/lvreduce.8_pregen
+++ b/man/lvreduce.8_pregen
@@ -110,6 +110,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -214,6 +218,12 @@ this option.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--noudevsync\fP
.br
Disables udev synchronisation. The process will not wait for notification
diff --git a/man/lvremove.8_pregen b/man/lvremove.8_pregen
index 88d0501..c835672 100644
--- a/man/lvremove.8_pregen
+++ b/man/lvremove.8_pregen
@@ -114,6 +114,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -195,6 +199,12 @@ metadata/record_lvs_history is enabled.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--noudevsync\fP
.br
Disables udev synchronisation. The process will not wait for notification
diff --git a/man/lvrename.8_pregen b/man/lvrename.8_pregen
index 69711e0..8d2f9b3 100644
--- a/man/lvrename.8_pregen
+++ b/man/lvrename.8_pregen
@@ -89,6 +89,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -155,6 +159,12 @@ Display long help text.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--noudevsync\fP
.br
Disables udev synchronisation. The process will not wait for notification
diff --git a/man/lvresize.8_pregen b/man/lvresize.8_pregen
index 8df157a..13246f5 100644
--- a/man/lvresize.8_pregen
+++ b/man/lvresize.8_pregen
@@ -59,6 +59,10 @@ lvresize - Resize a logical volume
.ad b
.br
.ad l
+ \fB--nolocking\fP
+.ad b
+.br
+.ad l
\fB--nosync\fP
.ad b
.br
@@ -272,6 +276,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -397,6 +405,12 @@ this option.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--nosync\fP
.br
Causes the creation of mirror, raid1, raid4, raid5 and raid10 to skip the
diff --git a/man/lvs.8_pregen b/man/lvs.8_pregen
index c6303bb..b5128f9 100644
--- a/man/lvs.8_pregen
+++ b/man/lvs.8_pregen
@@ -76,10 +76,6 @@ lvs produces formatted output about LVs.
.ad b
.br
.ad l
-[ \fB--nolocking\fP ]
-.ad b
-.br
-.ad l
[ \fB--nosuffix\fP ]
.ad b
.br
@@ -174,6 +170,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
diff --git a/man/lvscan.8_pregen b/man/lvscan.8_pregen
index e9d90ee..489286e 100644
--- a/man/lvscan.8_pregen
+++ b/man/lvscan.8_pregen
@@ -105,6 +105,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -191,6 +195,12 @@ Display long help text.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
diff --git a/man/pvchange.8_pregen b/man/pvchange.8_pregen
index 6a80e72..5da8eca 100644
--- a/man/pvchange.8_pregen
+++ b/man/pvchange.8_pregen
@@ -154,6 +154,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -269,6 +273,12 @@ If no, lvm will store metadata on the PV.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
diff --git a/man/pvck.8_pregen b/man/pvck.8_pregen
index 1140d69..499f62c 100644
--- a/man/pvck.8_pregen
+++ b/man/pvck.8_pregen
@@ -69,6 +69,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -137,6 +141,12 @@ Display long help text.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
diff --git a/man/pvcreate.8_pregen b/man/pvcreate.8_pregen
index c4b03da..2b4fb1c 100644
--- a/man/pvcreate.8_pregen
+++ b/man/pvcreate.8_pregen
@@ -145,6 +145,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -274,6 +278,12 @@ Specifies the type of on-disk metadata to use.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--norestorefile\fP
.br
In conjunction with --uuid, this allows a uuid to be specified
diff --git a/man/pvdisplay.8_pregen b/man/pvdisplay.8_pregen
index bbf09d8..5f39e7b 100644
--- a/man/pvdisplay.8_pregen
+++ b/man/pvdisplay.8_pregen
@@ -166,6 +166,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -306,6 +310,12 @@ Useful if grepping the output.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--nosuffix\fP
.br
Suppress the suffix on output sizes. Use with --units
diff --git a/man/pvmove.8_pregen b/man/pvmove.8_pregen
index cb121f2..e553722 100644
--- a/man/pvmove.8_pregen
+++ b/man/pvmove.8_pregen
@@ -137,6 +137,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -260,6 +264,12 @@ Move only the extents belonging to the named LV.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--noudevsync\fP
.br
Disables udev synchronisation. The process will not wait for notification
diff --git a/man/pvremove.8_pregen b/man/pvremove.8_pregen
index 16a82ad..3d83478 100644
--- a/man/pvremove.8_pregen
+++ b/man/pvremove.8_pregen
@@ -79,6 +79,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -145,6 +149,12 @@ Display long help text.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
diff --git a/man/pvresize.8_pregen b/man/pvresize.8_pregen
index 7b61f81..5a5c975 100644
--- a/man/pvresize.8_pregen
+++ b/man/pvresize.8_pregen
@@ -74,6 +74,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -133,6 +137,12 @@ Display long help text.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
diff --git a/man/pvs.8_pregen b/man/pvs.8_pregen
index a2a62a6..59f1e3d 100644
--- a/man/pvs.8_pregen
+++ b/man/pvs.8_pregen
@@ -72,10 +72,6 @@ pvs produces formatted output about PVs.
.ad b
.br
.ad l
-[ \fB--nolocking\fP ]
-.ad b
-.br
-.ad l
[ \fB--nosuffix\fP ]
.ad b
.br
@@ -170,6 +166,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
diff --git a/man/pvscan.8_pregen b/man/pvscan.8_pregen
index 230492b..3ce59b5 100644
--- a/man/pvscan.8_pregen
+++ b/man/pvscan.8_pregen
@@ -218,6 +218,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -323,6 +327,12 @@ The minor number of a device.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB-n\fP|\fB--novolumegroup\fP
.br
Only show PVs not belonging to any VG.
diff --git a/man/vgcfgbackup.8_pregen b/man/vgcfgbackup.8_pregen
index e9c42fe..cd2521a 100644
--- a/man/vgcfgbackup.8_pregen
+++ b/man/vgcfgbackup.8_pregen
@@ -105,6 +105,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -186,6 +190,12 @@ Display long help text.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
diff --git a/man/vgcfgrestore.8_pregen b/man/vgcfgrestore.8_pregen
index cffd44b..b4e2183 100644
--- a/man/vgcfgrestore.8_pregen
+++ b/man/vgcfgrestore.8_pregen
@@ -55,6 +55,10 @@ vgcfgrestore - Restore volume group configuration
.ad b
.br
.ad l
+ \fB--nolocking\fP
+.ad b
+.br
+.ad l
\fB--profile\fP \fIString\fP
.ad b
.br
@@ -197,6 +201,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -288,6 +296,12 @@ Specifies the type of on-disk metadata to use.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen
index 00cfc2b..a9ac546 100644
--- a/man/vgchange.8_pregen
+++ b/man/vgchange.8_pregen
@@ -31,10 +31,6 @@ vgchange - Change volume group attributes
.ad b
.br
.ad l
- \fB-c\fP|\fB--clustered\fP \fBy\fP|\fBn\fP
-.ad b
-.br
-.ad l
\fB--commandprofile\fP \fIString\fP
.ad b
.br
@@ -119,6 +115,10 @@ vgchange - Change volume group attributes
.ad b
.br
.ad l
+ \fB--nolocking\fP
+.ad b
+.br
+.ad l
\fB--noudevsync\fP
.ad b
.br
@@ -218,10 +218,6 @@ required, after which the others are optional.
.ad b
.br
.ad l
- \fB-c\fP|\fB--clustered\fP \fBy\fP|\fBn\fP,
-.ad b
-.br
-.ad l
\fB-s\fP|\fB--physicalextentsize\fP \fISize\fP[m|UNIT],
.ad b
.br
@@ -637,6 +633,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -722,13 +722,6 @@ Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information
.ad b
.HP
.ad l
-\fB-c\fP|\fB--clustered\fP \fBy\fP|\fBn\fP
-.br
-Change the clustered property of a VG using clvmd.
-See \fBclvmd\fP(8) for more information about clustered VGs.
-.ad b
-.HP
-.ad l
\fB--commandprofile\fP \fIString\fP
.br
The command profile to use for command configuration.
@@ -881,6 +874,12 @@ See \fBdmeventd\fP(8) for more information.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--noudevsync\fP
.br
Disables udev synchronisation. The process will not wait for notification
diff --git a/man/vgck.8_pregen b/man/vgck.8_pregen
index 83e4a19..b1418f3 100644
--- a/man/vgck.8_pregen
+++ b/man/vgck.8_pregen
@@ -74,6 +74,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -133,6 +137,12 @@ Display long help text.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
diff --git a/man/vgconvert.8_pregen b/man/vgconvert.8_pregen
index 5e7f8a9..16e1fc8 100644
--- a/man/vgconvert.8_pregen
+++ b/man/vgconvert.8_pregen
@@ -95,6 +95,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -199,6 +203,12 @@ Specifies the type of on-disk metadata to use.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
diff --git a/man/vgcreate.8_pregen b/man/vgcreate.8_pregen
index 09bf126..cc990cc 100644
--- a/man/vgcreate.8_pregen
+++ b/man/vgcreate.8_pregen
@@ -152,6 +152,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -199,11 +203,8 @@ Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information
.ad l
\fB-c\fP|\fB--clustered\fP \fBy\fP|\fBn\fP
.br
-Create a clustered VG using clvmd if LVM is compiled with cluster support.
-This allows multiple hosts to share a VG on shared devices.
-clvmd and a lock manager must be configured and running.
-(A clustered VG using clvmd is different from a shared VG using lvmlockd.)
-See \fBclvmd\fP(8) for more information about clustered VGs.
+This option was specific to clvm and is now replaced by
+the --shared option with \fBlvmlockd\fP(8).
.ad b
.HP
.ad l
@@ -332,6 +333,12 @@ Specifies the type of on-disk metadata to use.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB-s\fP|\fB--physicalextentsize\fP \fISize\fP[m|UNIT]
.br
Sets the physical extent size of PVs in the VG.
diff --git a/man/vgdisplay.8_pregen b/man/vgdisplay.8_pregen
index dcf9934..89e3603 100644
--- a/man/vgdisplay.8_pregen
+++ b/man/vgdisplay.8_pregen
@@ -161,6 +161,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -295,6 +299,12 @@ Useful if grepping the output.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--nosuffix\fP
.br
Suppress the suffix on output sizes. Use with --units
diff --git a/man/vgexport.8_pregen b/man/vgexport.8_pregen
index 1dd715e..a87c871 100644
--- a/man/vgexport.8_pregen
+++ b/man/vgexport.8_pregen
@@ -108,6 +108,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -172,6 +176,12 @@ Display long help text.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
diff --git a/man/vgextend.8_pregen b/man/vgextend.8_pregen
index a6a30e9..a2aff35 100644
--- a/man/vgextend.8_pregen
+++ b/man/vgextend.8_pregen
@@ -123,6 +123,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -245,6 +249,12 @@ Specifies the type of on-disk metadata to use.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
diff --git a/man/vgimport.8_pregen b/man/vgimport.8_pregen
index 71f9d56..f3d86df 100644
--- a/man/vgimport.8_pregen
+++ b/man/vgimport.8_pregen
@@ -98,6 +98,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -170,6 +174,12 @@ Display long help text.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
diff --git a/man/vgimportclone.8_pregen b/man/vgimportclone.8_pregen
index aab34f4..0d0eb84 100644
--- a/man/vgimportclone.8_pregen
+++ b/man/vgimportclone.8_pregen
@@ -78,6 +78,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -154,6 +158,12 @@ Display long help text.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
diff --git a/man/vgmerge.8_pregen b/man/vgmerge.8_pregen
index ab6873d..8b599f8 100644
--- a/man/vgmerge.8_pregen
+++ b/man/vgmerge.8_pregen
@@ -75,6 +75,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -147,6 +151,12 @@ Display long help text.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
diff --git a/man/vgmknodes.8_pregen b/man/vgmknodes.8_pregen
index 9588694..1cff786 100644
--- a/man/vgmknodes.8_pregen
+++ b/man/vgmknodes.8_pregen
@@ -86,6 +86,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -152,6 +156,12 @@ Display long help text.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
diff --git a/man/vgreduce.8_pregen b/man/vgreduce.8_pregen
index ecc5aca..fd92266 100644
--- a/man/vgreduce.8_pregen
+++ b/man/vgreduce.8_pregen
@@ -53,6 +53,10 @@ vgreduce - Remove physical volume(s) from a volume group
.ad b
.br
.ad l
+ \fB--nolocking\fP
+.ad b
+.br
+.ad l
\fB--profile\fP \fIString\fP
.ad b
.br
@@ -187,6 +191,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -272,6 +280,12 @@ Only remove missing PVs from mirror LVs.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
diff --git a/man/vgremove.8_pregen b/man/vgremove.8_pregen
index f562991..69f2831 100644
--- a/man/vgremove.8_pregen
+++ b/man/vgremove.8_pregen
@@ -89,6 +89,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -155,6 +159,12 @@ Display long help text.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--noudevsync\fP
.br
Disables udev synchronisation. The process will not wait for notification
diff --git a/man/vgrename.8_pregen b/man/vgrename.8_pregen
index 1f8928e..0313cf8 100644
--- a/man/vgrename.8_pregen
+++ b/man/vgrename.8_pregen
@@ -102,6 +102,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -175,6 +179,12 @@ Display long help text.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
diff --git a/man/vgs.8_pregen b/man/vgs.8_pregen
index efceb4e..681711b 100644
--- a/man/vgs.8_pregen
+++ b/man/vgs.8_pregen
@@ -68,10 +68,6 @@ vgs produces formatted output about VGs.
.ad b
.br
.ad l
-[ \fB--nolocking\fP ]
-.ad b
-.br
-.ad l
[ \fB--nosuffix\fP ]
.ad b
.br
@@ -166,6 +162,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
diff --git a/man/vgscan.8_pregen b/man/vgscan.8_pregen
index 18b2990..fe9f201 100644
--- a/man/vgscan.8_pregen
+++ b/man/vgscan.8_pregen
@@ -85,6 +85,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -164,6 +168,12 @@ LVs and creates any missing ones and removes unused ones.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--notifydbus\fP
.br
Send a notification to D-Bus. The command will exit with an error
diff --git a/man/vgsplit.8_pregen b/man/vgsplit.8_pregen
index 6c3e6ec..c1e7f4e 100644
--- a/man/vgsplit.8_pregen
+++ b/man/vgsplit.8_pregen
@@ -50,10 +50,6 @@ Common options for command:
.ad b
.br
.ad l
-[ \fB-c\fP|\fB--clustered\fP \fBy\fP|\fBn\fP ]
-.ad b
-.br
-.ad l
[ \fB-l\fP|\fB--maxlogicalvolumes\fP \fINumber\fP ]
.ad b
.br
@@ -122,6 +118,10 @@ Common options for lvm:
.ad b
.br
.ad l
+[ \fB--nolocking\fP ]
+.ad b
+.br
+.ad l
[ \fB--profile\fP \fIString\fP ]
.ad b
.br
@@ -160,12 +160,6 @@ Enabling this is strongly advised! See \fBvgcfgbackup\fP(8) for more information
.ad b
.HP
.ad l
-\fB-c\fP|\fB--clustered\fP \fBy\fP|\fBn\fP
-.br
-Specifies the clustered property of the new VG.
-.ad b
-.HP
-.ad l
\fB--commandprofile\fP \fIString\fP
.br
The command profile to use for command configuration.
@@ -244,6 +238,12 @@ Move only PVs used by the named LV.
.ad b
.HP
.ad l
+\fB--nolocking\fP
+.br
+Disable locking.
+.ad b
+.HP
+.ad l
\fB--profile\fP \fIString\fP
.br
An alias for --commandprofile or --metadataprofile, depending
5 years, 10 months
master - build: update configure
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2a307ce33c515268763...
Commit: 2a307ce33c515268763c714275bd4a85bf9fd0fa
Parent: b48e10d9e6fd33ea26ce5296be44a986f49352a2
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Jun 8 22:15:05 2018 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Jun 11 22:25:42 2018 +0200
build: update configure
---
configure | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index 953539f..323ab4a 100755
--- a/configure
+++ b/configure
@@ -11527,7 +11527,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
$as_echo_n "(cached) " >&6
else
- for am_cv_pathless_PYTHON in python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -13611,7 +13611,7 @@ _ACEOF
################################################################################
-ac_config_files="$ac_config_files Makefile make.tmpl libdm/make.tmpl daemons/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile python/Makefile python/setup
.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/api/python_lvm_unit.py tools/Makefile udev/Makefile"
+ac_config_files="$ac_config_files Makefile make.tmpl libdm/make.tmpl daemons/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/Makefile lib/Makefile include/lvm-version.h libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc man/Makefile po/Makefile scripts/blkdeactivate.sh scr
ipts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile tools/Makefile udev/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -14343,8 +14343,6 @@ do
"libdm/libdevmapper.pc") CONFIG_FILES="$CONFIG_FILES libdm/libdevmapper.pc" ;;
"man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
"po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
- "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;;
- "python/setup.py") CONFIG_FILES="$CONFIG_FILES python/setup.py" ;;
"scripts/blkdeactivate.sh") CONFIG_FILES="$CONFIG_FILES scripts/blkdeactivate.sh" ;;
"scripts/blk_availability_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/blk_availability_init_red_hat" ;;
"scripts/blk_availability_systemd_red_hat.service") CONFIG_FILES="$CONFIG_FILES scripts/blk_availability_systemd_red_hat.service" ;;
@@ -14369,8 +14367,6 @@ do
"scripts/lvmdump.sh") CONFIG_FILES="$CONFIG_FILES scripts/lvmdump.sh" ;;
"scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
- "test/api/Makefile") CONFIG_FILES="$CONFIG_FILES test/api/Makefile" ;;
- "test/api/python_lvm_unit.py") CONFIG_FILES="$CONFIG_FILES test/api/python_lvm_unit.py" ;;
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
"udev/Makefile") CONFIG_FILES="$CONFIG_FILES udev/Makefile" ;;
5 years, 10 months
master - Remove lvmcache CACHE_LOCKED flag
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b48e10d9e6fd33ea26c...
Commit: b48e10d9e6fd33ea26ce5296be44a986f49352a2
Parent: ebd147ff244abd7d308ffb3ea8a2121b5f4bc7a3
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Jun 8 15:11:47 2018 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Fri Jun 8 15:11:47 2018 -0500
Remove lvmcache CACHE_LOCKED flag
and the functions that set it. It's no longer used.
---
lib/cache/lvmcache.c | 38 +-------------------------------------
1 files changed, 1 insertions(+), 37 deletions(-)
diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c
index 3cbe1df..923fb2e 100644
--- a/lib/cache/lvmcache.c
+++ b/lib/cache/lvmcache.c
@@ -28,8 +28,6 @@
#include "lib/cache/lvmetad.h"
#include "daemons/lvmetad/lvmetad-client.h"
-#define CACHE_LOCKED 0x00000002
-
/* One per device */
struct lvmcache_info {
struct dm_list list; /* Join VG members together */
@@ -131,33 +129,6 @@ void lvmcache_seed_infos_from_lvmetad(struct cmd_context *cmd)
_has_scanned = 1;
}
-static void _update_cache_info_lock_state(struct lvmcache_info *info, int locked)
-{
- if (locked)
- info->status |= CACHE_LOCKED;
- else
- info->status &= ~CACHE_LOCKED;
-}
-
-static void _update_cache_vginfo_lock_state(struct lvmcache_vginfo *vginfo,
- int locked)
-{
- struct lvmcache_info *info;
-
- dm_list_iterate_items(info, &vginfo->infos)
- _update_cache_info_lock_state(info, locked);
-}
-
-static void _update_cache_lock_state(const char *vgname, int locked)
-{
- struct lvmcache_vginfo *vginfo;
-
- if (!(vginfo = lvmcache_vginfo_from_vgname(vgname, NULL)))
- return;
-
- _update_cache_vginfo_lock_state(vginfo, locked);
-}
-
void lvmcache_lock_vgname(const char *vgname, int read_only __attribute__((unused)))
{
if (dm_hash_lookup(_lock_hash, vgname))
@@ -167,10 +138,8 @@ void lvmcache_lock_vgname(const char *vgname, int read_only __attribute__((unuse
if (!dm_hash_insert(_lock_hash, vgname, (void *) 1))
log_error("Cache locking failure for %s", vgname);
- if (strcmp(vgname, VG_GLOBAL)) {
- _update_cache_lock_state(vgname, 1);
+ if (strcmp(vgname, VG_GLOBAL))
_vgs_locked++;
- }
}
int lvmcache_vgname_is_locked(const char *vgname)
@@ -187,9 +156,6 @@ void lvmcache_unlock_vgname(const char *vgname)
log_error(INTERNAL_ERROR "Attempt to unlock unlocked VG %s.",
vgname);
- if (strcmp(vgname, VG_GLOBAL))
- _update_cache_lock_state(vgname, 0);
-
dm_hash_remove(_lock_hash, vgname);
/* FIXME Do this per-VG */
@@ -1513,8 +1479,6 @@ static int _lvmcache_update_vgname(struct lvmcache_info *info,
else if (!_lvmcache_update_vgid(NULL, vginfo, vgid)) /* Orphans */
return_0;
- _update_cache_vginfo_lock_state(vginfo, lvmcache_vgname_is_locked(vgname));
-
/* FIXME Check consistency of list! */
vginfo->fmt = fmt;
5 years, 10 months