master - coverity: fix possible NULL dereference
by Peter Rajnoha
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=193f9b26a0a87b...
Commit: 193f9b26a0a87b2f5ce9a308ea0d957fadfe4aeb
Parent: 86ae68a5f7e396a6584b8003667b44a433d914fd
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Wed Nov 26 11:46:13 2014 +0100
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Wed Nov 26 11:46:13 2014 +0100
coverity: fix possible NULL dereference
The call to dm_config_destroy can derefence result->mem
while result is still NULL:
struct dm_config_tree *get_cachepolicy_params(struct cmd_context *cmd)
{
...
int ok = 0;
...
if (!(result = dm_config_flatten(current)))
goto_out;
...
ok = 1;
out:
if (!ok) {
dm_config_destroy(result)
...
}
...
}
---
tools/toollib.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/toollib.c b/tools/toollib.c
index ddf2dcf..71eb9a8 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -1175,7 +1175,7 @@ struct dm_config_tree *get_cachepolicy_params(struct cmd_context *cmd)
ok = 1;
out:
- if (!ok) {
+ if (!ok && result) {
dm_config_destroy(result);
result = NULL;
}
9 years
master - coverity: remove dead code in lv_info_with_seg_status
by Peter Rajnoha
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=86ae68a5f7e396...
Commit: 86ae68a5f7e396a6584b8003667b44a433d914fd
Parent: 2cd98b27825b00459bd8e2c0539ffe5c09ed5b62
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Wed Nov 26 11:30:01 2014 +0100
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Wed Nov 26 11:30:01 2014 +0100
coverity: remove dead code in lv_info_with_seg_status
Just call return 0 directly on error path, without using
"goto" - the code is short, no need to use it this way
(the dead code appeared as part of further changes in this
function).
---
lib/activate/activate.c | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index 60dba1b..258873b 100644
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -719,15 +719,13 @@ int lv_info_with_seg_status(struct cmd_context *cmd, const struct logical_volume
struct lvinfo *lvinfo, struct lv_seg_status *lv_seg_status,
int with_open_count, int with_read_ahead)
{
- int r = 0;
-
if (!activation())
return 0;
if (lv == lv_seg->lv) {
r = _lv_info(cmd, lv, use_layer, lvinfo, lv_seg, lv_seg_status,
with_open_count, with_read_ahead);
- goto out;
+ return 0;
}
/*
@@ -737,10 +735,6 @@ int lv_info_with_seg_status(struct cmd_context *cmd, const struct logical_volume
*/
return _lv_info(cmd, lv, use_layer, lvinfo, NULL, NULL, with_open_count, with_read_ahead) &&
_lv_info(cmd, lv_seg->lv, use_layer, NULL, lv_seg, lv_seg_status, 0, 0);
-
- r = 1;
-out:
- return r;
}
#define OPEN_COUNT_CHECK_RETRIES 25
9 years
master - makefiles: avoid regeneration of Makefile
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2cd98b27825b00...
Commit: 2cd98b27825b00459bd8e2c0539ffe5c09ed5b62
Parent: 2de11c9e9e9513fb7d9ab0323370e584d3d3acde
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Nov 25 23:01:28 2014 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Nov 26 09:36:12 2014 +0100
makefiles: avoid regeneration of Makefile
When Makefile.in is touched, it's been matched by 'man' rule
and it's been wrongly regnerated.
Put in explicit rules to avoid Makefile sed processing.
---
man/Makefile.in | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/man/Makefile.in b/man/Makefile.in
index 40bf7a2..c42f07a 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -92,6 +92,9 @@ man: $(MAN5) $(MAN7) $(MAN8) $(MAN8CLUSTER) $(MAN8SYSTEMD_GENERATORS)
$(MAN5) $(MAN7) $(MAN8) $(MAN8DM) $(MAN8CLUSTER): Makefile
+Makefile: Makefile.in
+ @:
+
%: %.in
@case "$@" in \
*/*) ;; \
9 years
master - thin: add missing 64KB rounding
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2de11c9e9e9513...
Commit: 2de11c9e9e9513fb7d9ab0323370e584d3d3acde
Parent: 13e2049c32f016cd7f2d93d98fd47178f139fc81
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Nov 26 09:27:40 2014 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Nov 26 09:29:25 2014 +0100
thin: add missing 64KB rounding
When chunk size needs to be estimated, the code missed to round
to proper 64kb boundaries (or power of 2 for older thin pool driver).
So for some data and metadata size (i.e. 10GB and 4MB) it resulted
in incorrect chunk size (not being a multiple of 64KB)
Fix it by adding proper rounding and also use 1 routine for 2 places
where the same calculation is made.
Fix also incorrect printed warning that has used 'ffs()'
(which returns first 'least significant' bit in word)
and it was not really giving any useful size info and replace it
with properly estimated chunk size.
---
WHATS_NEW | 1 +
lib/metadata/thin_manip.c | 39 ++++++++++++++++++++++++++++++++++-----
test/shell/lvcreate-thin.sh | 16 ++++++++++++++++
3 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index e279c38..bd7b7f9 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.114 -
=====================================
+ Fix missing rounding to 64KB when estimating optimal thin pool chunk size.
Fix typo in clvmd initscript causing CLVMD_STOP_TIMEOUT variable to be ignored.
Fix size in pvresize "Resizing to ..." verbose msg to show proper result size.
diff --git a/lib/metadata/thin_manip.c b/lib/metadata/thin_manip.c
index b4aec73..e617b3c 100644
--- a/lib/metadata/thin_manip.c
+++ b/lib/metadata/thin_manip.c
@@ -394,6 +394,33 @@ int update_pool_lv(struct logical_volume *lv, int activate)
return ret;
}
+/* Estimate thin pool chunk size from data and metadata size (in sector units) */
+static size_t _estimate_chunk_size(uint64_t data_size, uint64_t metadata_size, int attr)
+{
+ /*
+ * nr_pool_blocks = data_size / metadata_size
+ * chunk_size = nr_pool_blocks * 64b / sector_size
+ */
+ size_t chunk_size = data_size / (metadata_size * (SECTOR_SIZE / 64));
+
+ if (attr & THIN_FEATURE_BLOCK_SIZE) {
+ /* Round up to 64KB */
+ chunk_size += DM_THIN_MIN_DATA_BLOCK_SIZE - 1;
+ chunk_size &= ~(size_t)(DM_THIN_MIN_DATA_BLOCK_SIZE - 1);
+ } else {
+ /* Round up to nearest power of 2 */
+ chunk_size--;
+ chunk_size |= chunk_size >> 1;
+ chunk_size |= chunk_size >> 2;
+ chunk_size |= chunk_size >> 4;
+ chunk_size |= chunk_size >> 8;
+ chunk_size |= chunk_size >> 16;
+ chunk_size++;
+ }
+
+ return chunk_size;
+}
+
int update_thin_pool_params(const struct segment_type *segtype,
struct volume_group *vg,
unsigned attr, int passed_args,
@@ -465,18 +492,20 @@ int update_thin_pool_params(const struct segment_type *segtype,
display_size(cmd, *chunk_size));
} else if (pool_metadata_size > (DEFAULT_THIN_POOL_MAX_METADATA_SIZE * 2)) {
/* Suggest bigger chunk size */
- estimate_chunk_size = (uint64_t) pool_data_extents * extent_size /
- (DEFAULT_THIN_POOL_MAX_METADATA_SIZE * 2 * (SECTOR_SIZE / UINT64_C(64)));
+ estimate_chunk_size =
+ _estimate_chunk_size((uint64_t) pool_data_extents * extent_size,
+ (DEFAULT_THIN_POOL_MAX_METADATA_SIZE * 2), attr);
log_warn("WARNING: Chunk size is too small for pool, suggested minimum is %s.",
- display_size(cmd, UINT64_C(1) << (ffs(estimate_chunk_size) + 1)));
+ display_size(cmd, estimate_chunk_size));
}
/* Round up to extent size silently */
if (pool_metadata_size % extent_size)
pool_metadata_size += extent_size - pool_metadata_size % extent_size;
} else {
- estimate_chunk_size = (uint64_t) pool_data_extents * extent_size /
- (pool_metadata_size * (SECTOR_SIZE / UINT64_C(64)));
+ estimate_chunk_size =
+ _estimate_chunk_size((uint64_t) pool_data_extents * extent_size,
+ pool_metadata_size, attr);
if (estimate_chunk_size < DM_THIN_MIN_DATA_BLOCK_SIZE)
estimate_chunk_size = DM_THIN_MIN_DATA_BLOCK_SIZE;
else if (estimate_chunk_size > DM_THIN_MAX_DATA_BLOCK_SIZE)
diff --git a/test/shell/lvcreate-thin.sh b/test/shell/lvcreate-thin.sh
index 0433ac8..2884d53 100644
--- a/test/shell/lvcreate-thin.sh
+++ b/test/shell/lvcreate-thin.sh
@@ -261,4 +261,20 @@ lvcreate -L10G --chunksize 256 -T $vg/pool1
lvcreate -L60G --chunksize 1024 -T $vg/pool2
check lv_field $vg/pool1_tmeta size "2.50m"
check lv_field $vg/pool2_tmeta size "3.75m"
+lvremove -ff $vg
+
+# Block size of multiple 64KB needs >= 1.4
+if aux have_thin 1 4 0 ; then
+# Test chunk size is rounded to 64KB boundary
+lvcreate -L10G --poolmetadatasize 4M -T $vg/pool
+check lv_field $vg/pool chunk_size "192.00k"
+fi
+# Old thinpool target required rounding to power of 2
+aux lvmconf "global/thin_disabled_features = [ \"block_size\" ]"
+lvcreate -L10G --poolmetadatasize 4M -T $vg/pool_old
+check lv_field $vg/pool_old chunk_size "256.00k"
+lvremove -ff $vg
+# reset
+#aux lvmconf "global/thin_disabled_features = []"
+
vgremove -ff $vg
9 years
master - initscripts: fix typo in clvmd initscript causing CLVMD_STOP_TIMEOUT variable to be ignored
by Peter Rajnoha
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=13e2049c32f016...
Commit: 13e2049c32f016cd7f2d93d98fd47178f139fc81
Parent: 62f3a4d2d88576ac160f7a7a5f5dc7608c7a1c04
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Tue Nov 25 15:18:58 2014 +0100
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Tue Nov 25 15:19:11 2014 +0100
initscripts: fix typo in clvmd initscript causing CLVMD_STOP_TIMEOUT variable to be ignored
---
WHATS_NEW | 1 +
scripts/clvmd_init_red_hat.in | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index f655f24..e279c38 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.114 -
=====================================
+ Fix typo in clvmd initscript causing CLVMD_STOP_TIMEOUT variable to be ignored.
Fix size in pvresize "Resizing to ..." verbose msg to show proper result size.
Version 2.02.113 - 24th November 2014
diff --git a/scripts/clvmd_init_red_hat.in b/scripts/clvmd_init_red_hat.in
index 86dea4c..8c46c06 100644
--- a/scripts/clvmd_init_red_hat.in
+++ b/scripts/clvmd_init_red_hat.in
@@ -38,7 +38,7 @@ CLVMDOPTS="-T30"
# allow up to $CLVMD_STOP_TIMEOUT seconds to clvmd to complete exit operations
# default to 10 seconds
-[ -z $CLMVD_STOP_TIMEOUT ] && CLVMD_STOP_TIMEOUT=10
+[ -z $CLVMD_STOP_TIMEOUT ] && CLVMD_STOP_TIMEOUT=10
LOCK_FILE="/var/lock/subsys/$DAEMON"
9 years
master - pvresize: fix size in 'Resizing to ...' verbose message to show proper result size
by Peter Rajnoha
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=62f3a4d2d88576...
Commit: 62f3a4d2d88576ac160f7a7a5f5dc7608c7a1c04
Parent: cd3b6070aab5b50ab60f8434ca6efd3736e927be
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Tue Nov 25 15:16:09 2014 +0100
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Tue Nov 25 15:19:10 2014 +0100
pvresize: fix size in 'Resizing to ...' verbose message to show proper result size
---
WHATS_NEW | 1 +
lib/metadata/pv_manip.c | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index a19cdb9..f655f24 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.114 -
=====================================
+ Fix size in pvresize "Resizing to ..." verbose msg to show proper result size.
Version 2.02.113 - 24th November 2014
=====================================
diff --git a/lib/metadata/pv_manip.c b/lib/metadata/pv_manip.c
index 00a7fd5..6499e36 100644
--- a/lib/metadata/pv_manip.c
+++ b/lib/metadata/pv_manip.c
@@ -650,7 +650,7 @@ int pv_resize_single(struct cmd_context *cmd,
}
log_verbose("Resizing volume \"%s\" to %" PRIu64 " sectors.",
- pv_name, pv_size(pv));
+ pv_name, size);
if (!pv_resize(pv, vg, size))
goto_out;
9 years
master - post-release
by Alasdair Kergon
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=cd3b6070aab5b5...
Commit: cd3b6070aab5b50ab60f8434ca6efd3736e927be
Parent: 2aca8347243b64751a98052d1a9801b489d48c4c
Author: Alasdair G Kergon <agk(a)redhat.com>
AuthorDate: Mon Nov 24 17:48:25 2014 +0000
Committer: Alasdair G Kergon <agk(a)redhat.com>
CommitterDate: Mon Nov 24 17:48:25 2014 +0000
post-release
---
VERSION | 2 +-
VERSION_DM | 2 +-
WHATS_NEW | 3 +++
WHATS_NEW_DM | 3 +++
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/VERSION b/VERSION
index 77c461d..0f1a69f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.02.113(2)-git (2014-11-24)
+2.02.114(2)-git (2014-11-24)
diff --git a/VERSION_DM b/VERSION_DM
index 1b591a5..13ce0a0 100644
--- a/VERSION_DM
+++ b/VERSION_DM
@@ -1 +1 @@
-1.02.92-git (2014-11-24)
+1.02.93-git (2014-11-24)
diff --git a/WHATS_NEW b/WHATS_NEW
index 780050d..a19cdb9 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,3 +1,6 @@
+Version 2.02.114 -
+=====================================
+
Version 2.02.113 - 24th November 2014
=====================================
Add --cachepolicy and --cachesettings options to lvchange.
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 45d3ece..6eafed6 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,3 +1,6 @@
+Version 1.02.93 -
+====================================
+
Version 1.02.92 - 24th November 2014
====================================
Fix memory corruption with sorting empty string lists (1.02.86).
9 years
master - pre-release
by Alasdair Kergon
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2aca8347243b64...
Commit: 2aca8347243b64751a98052d1a9801b489d48c4c
Parent: e50c9bd7cdf22690ee9d6de853a07d743806c3d8
Author: Alasdair G Kergon <agk(a)redhat.com>
AuthorDate: Mon Nov 24 17:46:50 2014 +0000
Committer: Alasdair G Kergon <agk(a)redhat.com>
CommitterDate: Mon Nov 24 17:46:50 2014 +0000
pre-release
---
VERSION | 2 +-
VERSION_DM | 2 +-
WHATS_NEW | 6 +++---
WHATS_NEW_DM | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/VERSION b/VERSION
index 2acba4f..77c461d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.02.113(2)-git (2014-11-11)
+2.02.113(2)-git (2014-11-24)
diff --git a/VERSION_DM b/VERSION_DM
index 5b592b1..1b591a5 100644
--- a/VERSION_DM
+++ b/VERSION_DM
@@ -1 +1 @@
-1.02.92-git (2014-11-11)
+1.02.92-git (2014-11-24)
diff --git a/WHATS_NEW b/WHATS_NEW
index fc6ba69..780050d 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,6 +1,7 @@
-Version 2.02.113 -
+Version 2.02.113 - 24th November 2014
=====================================
- Validate converted volume and specified pool volume differ.
+ Add --cachepolicy and --cachesettings options to lvchange.
+ Validate that converted volume and specified pool volume differ in lvconvert.
Fix regression in vgscan --mknodes usage (2.02.112).
Respect --prefix when setting CLMVD_PATH configure (2.02.89).
Default to configure --enable-udev-systemd-background-jobs for systemd>=205.
@@ -8,7 +9,6 @@ Version 2.02.113 -
Failed recovery returns FAILED_RECOVERY status flag for vg_read().
Exit with non-zero status code when pvck encounters a problem.
Fix clean_tree after activation/resume for cache target (2.02.112).
- Add --cachepolicy and --cachesettings options to lvchange.
Version 2.02.112 - 11th November 2014
=====================================
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index ba4e679..45d3ece 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,8 +1,8 @@
-Version 1.02.92 -
+Version 1.02.92 - 24th November 2014
====================================
Fix memory corruption with sorting empty string lists (1.02.86).
Fix man dmsetup.8 syntax warning of Groff
- Relax rules in the config file parser.
+ Accept unquoted strings and / in place of {} when parsing configs.
Version 1.02.91 - 11th November 2014
====================================
9 years
v2_02_113 annotated tag has been created
by Alasdair Kergon
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=0c55275fc53c30...
Commit: 0c55275fc53c301dc2d7ad1dd5cc114f17b2a318
Parent: 0000000000000000000000000000000000000000
Author: Alasdair G Kergon <agk(a)redhat.com>
AuthorDate: 2014-11-24 17:47 +0000
Committer: Alasdair G Kergon <agk(a)redhat.com>
CommitterDate: 2014-11-24 17:47 +0000
annotated tag: v2_02_113 has been created
at 0c55275fc53c301dc2d7ad1dd5cc114f17b2a318 (tag)
tagging 2aca8347243b64751a98052d1a9801b489d48c4c (commit)
replaces v2_02_112
Release 2.02.113.
65 files changed, 1630 insertions(+), 805 deletions(-)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iEYEABECAAYFAlRzb0YACgkQIoGRwVZ+LBe87gCcDA5FE38HDPu25TwU7okNjWFs
hnAAoLfRTjpQDCtFsbWeaB5ORe4afEBS
=hcG0
-----END PGP SIGNATURE-----
Alasdair G Kergon (3):
post-release
pvck: Use non-zero exit status after failure.
pre-release
David Teigland (4):
lvmcache.7: remove unwanted line continuation syntax
lvmcache: remove unnecessary line break syntax
toollib: fixes and cleanup of recent changes
toollib: improve ignore_vg case in _process_pvs_in_vgs
Peter Rajnoha (15):
coverity: fix resource leaks
coverity: remove redundant condition
coverity: fix compiler warning
coverity: fix possible integer overflow
coverity: fix possible dereference of NULL pointer
coverity: commit ba2302346 - report log_sys_error properly
cleanup: cleanup internal interface to acquire segment status
cleanup: unify LV info and LV segment status reporting in combination with LVS, SEGS and PVSEGS reporting
cleanup: free mempool memory used for LV status in PVSEGS reporting
configure: make configure --enable-udev-systemd-background-jobs only for systemd >= 205
configure: expand prefix and exec_prefix directly in configure
systemd: clvmd and cmirrord systemd unit - use usrsbindir instead of sbindir
revert: 7639eae and 4a52a92
report: add some comments about how string list is stored internally
report: add some comments about how string list is stored internally
Petr Rockai (17):
memlock: Make malloc reserve more robust against glibc tricks.
libdm-config: Allow paths (section/key = value) in config files.
libdm-config: Re-link config trees to reflect file order of keys/sections.
libdm-config: Implement dm_config_flatten.
libdm-config: Interpret barewords after '=' as strings.
libdm-config: Implement dm_config_remove_node.
libdm-config: Warn about duplicate keys.
cache: Add lv_cache_setpolicy to cache_manip.c.
toollib: Add --cachepolicy and implement get_cachepolicy_params.
lvchange: Accept --cachepolicy.
test: Add a test for lvchange --cachepolicy.
toollib: Split --cachesettings from --cachepolicy.
cache: Implement 'default' as a policy settings value to clear the record.
test: Also test repeated --cachesettings in lvchange-cache.
Update WHATS_NEW.
man/lvm.conf: Update to reflect changes in config parser.
man/lvchange: Mention --cachepolicy and --cachesettings.
Stéphane Aulery (2):
man: fix (\+) syntax warning of Groff
lvconvert.8: fix bold and italic syntax mistake
Zdenek Kabelac (49):
cache: fix clean_tree
cache: improve pending_delete
pool: fix removal of pool metadata spare
cleanu: drop duplicate const
cache: wrong feature in seg is internal error
reporter: drop mem on error path
lvm2api: use fully initilized struct
cleanup: validate pointers
cleanup: remove unused headers
vg_read: use new error flag
toolib: fix ignore_vg
vg_read: correct warning
cleanup: add '.' to log messages
debug: better message for pool zeroing state
debug: switch to verbose
tests: explicit raid sync
toollib: ignore_vg() with skip is not locked
tests: skip another older kernel from raid456
tests: reduce number of sync waiting
tests: thin repair testing
tests: deactivate repaired before swap
locking: rename LCK_CONVERT
cleanup: drop unused var
man: lvchange update
man: blkdeactivate help output
man: clvmd help output
man: clvmd updates
thin: fix error path
tests: prepare control node before clvmd
tests: use snapshot targets
toollib: release vg on ignore path
cache: check for internal error
cleanup: drop unused vars
configure: fix CLVMD_PATH location
dev_manager: fix mknodes
makefiles: standard usage of make.tmpl
libdm: fix reporting of empty string list
tests: use old virt snaps in the test
tests: reduce thin test
pool: prevent pool conversion with same name
libdm: report fix memleak on error path
cleanup: warning: declaration of 'remove' shadows a global declaration
cleanup: add missing error path check
libdm: there is no element in item 0
man: fix pages for generators
lvconvert: earlier detection of conflicting names
tests: use proper LVMTEST prefix for VG name
man: update
cache: comment out unsupported pooldatasize
9 years
master - cache: comment out unsupported pooldatasize
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e50c9bd7cdf226...
Commit: e50c9bd7cdf22690ee9d6de853a07d743806c3d8
Parent: d184e8d0bac11f64ec7a5e8dc2a0fcd5b2714890
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Nov 24 17:38:39 2014 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Nov 24 17:38:39 2014 +0100
cache: comment out unsupported pooldatasize
Support for pooldatasize is not yet finished, so keep it commented out
for now.
---
man/lvconvert.8.in | 16 ++++++++--------
man/lvcreate.8.in | 29 +++++++++++++++--------------
tools/commands.h | 7 ++++---
3 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/man/lvconvert.8.in b/man/lvconvert.8.in
index 10bc478..7dd1051 100644
--- a/man/lvconvert.8.in
+++ b/man/lvconvert.8.in
@@ -154,10 +154,10 @@ lvconvert \(em convert a logical volume from linear to mirror or snapshot
.B \-\-type
.BR \fIcache [ \fI\-pool ]| \-H | \-\-cache
.RB [ \-\-cachepool
-.IR CachePoolLogicalVolume { Name | Path }
-|
-.B \-\-pooldatasize
-.IR CachePoolMetadataSize [ bBsSkKmMgGtTpPeE ]]
+.IR CachePoolLogicalVolume { Name | Path }]
+.\" |
+.\" .B \-\-pooldatasize
+.\" .IR CachePoolMetadataSize [ bBsSkKmMgGtTpPeE ]]
.RB [ \-c | \-\-chunksize
.IR ChunkSize [ bBsSkKmMgG ]]
.RB [ \-\-cachemode
@@ -386,10 +386,10 @@ Without this option a default name of "lvol<n>" will be generated where
This volume will be read-only and cannot be further modified as long,
as it is being used as the external origin.
.TP
-.IR \fB\-\-pooldatasize " " PoolDataVolumeSize [ bBsSkKmMgGtTpPeE ]
-Sets the size of pool's data logical volume.
-The option \fB\-\-size\fP could be still used with thin pools.
-.TP
+.\" .IR \fB\-\-pooldatasize " " PoolDataVolumeSize [ bBsSkKmMgGtTpPeE ]
+.\" Sets the size of pool's data logical volume.
+.\" The option \fB\-\-size\fP could be still used with thin pools.
+.\" .TP
.BR \-\-poolmetadata " " \fIPoolMetadataLogicalVolume { \fIName | \fIPath }
Specifies cache or thin pool metadata logical volume.
The size should be in between 2MiB and 16GiB.
diff --git a/man/lvcreate.8.in b/man/lvcreate.8.in
index e2b6d91..cc51546 100644
--- a/man/lvcreate.8.in
+++ b/man/lvcreate.8.in
@@ -60,9 +60,9 @@ lvcreate \- create a logical volume in an existing volume group
.RB [ \-p | \-\-permission
.RI { r | rw }]
.RB [ \-M | \-\-persistent
-.RI { y | n }
-.RB [ \-\-pooldatasize
-.IR DataVolumeSize [ bBsSkKmMgGtTpPeE ]]
+.RI { y | n }]
+.\" .RB [ \-\-pooldatasize
+.\" .IR DataVolumeSize [ bBsSkKmMgGtTpPeE ]]
.RB [ \-\-poolmetadatasize
.IR MetadataVolumeSize [ bBsSkKmMgG ]]
.RB [ \-\-poolmetadataspare
@@ -100,7 +100,8 @@ lvcreate \- create a logical volume in an existing volume group
.RB [ \-l | \-\-extents
.IR LogicalExtentsNumber [ % { FREE | ORIGIN | PVS | VG }]
|
-.BR \-L | \-\-size | \-\-pooldatasize
+.BR \-L | \-\-size
+.\" | \-\-pooldatasize
.IR LogicalVolumeSize [ bBsSkKmMgGtTpPeE ]]
.RB [ \-c | \-\-chunksize
.IR ChunkSize [ bBsSkKmMgG ]]
@@ -168,8 +169,8 @@ will activate only on the local node.
Creates cache or cache pool logical volume or both.
Specifying the optional argument \fB\-\-size\fP will cause the creation of
the cache logical volume.
-Specifying the optional argument \fB\-\-pooldatasize\fP will cause
-the creation of the cache pool logical volume.
+.\" Specifying the optional argument \fB\-\-pooldatasize\fP will cause
+.\" the creation of the cache pool logical volume.
Specifying both arguments will cause the creation of cache with its
cache pool volume.
When the Volume group name is specified together with existing logical volume
@@ -350,11 +351,11 @@ Pool volumes cannot have persistent major and minor numbers.
Defaults to \fIy\fPes only when major or minor number is specified.
Otherwise it is \fIn\fPo.
.TP
-.IR \fB\-\-pooldatasize " " PoolDataVolumeSize [ bBsSkKmMgGtTpPeE ]
-Sets the size of pool's data logical volume.
-For thin pools you may also specify the size
-with the option \fB\-\-size\fP.
-.TP
+.\" .IR \fB\-\-pooldatasize " " PoolDataVolumeSize [ bBsSkKmMgGtTpPeE ]
+.\" Sets the size of pool's data logical volume.
+.\" For thin pools you may also specify the size
+.\" with the option \fB\-\-size\fP.
+.\" .TP
.IR \fB\-\-poolmetadatasize " " MetadataVolumeSize [ bBsSkKmMgG ]
Sets the size of pool's metadata logical volume.
Supported values are in range between 2MiB and 16GiB for thin pool,
@@ -675,9 +676,9 @@ volume (i.e. the origin LV), creating a cache LV.
.sp
.B lvcreate \-\-type cache \-L 1G \-n my_lv_cachepool vg/my_lv /dev/fast1
-Create a 1G cached LV "lvol1" with 10M cache pool "vg00/pool".
-.sp
-.B lvcreate \-\-cache \-L 1G \-n lv --pooldatasize 10M vg00/pool
+.\" Create a 1G cached LV "lvol1" with 10M cache pool "vg00/pool".
+.\" .sp
+.\" .B lvcreate \-\-cache \-L 1G \-n lv --pooldatasize 10M vg00/pool
.SH SEE ALSO
.BR lvm (8),
diff --git a/tools/commands.h b/tools/commands.h
index 4765923..852b675 100644
--- a/tools/commands.h
+++ b/tools/commands.h
@@ -281,7 +281,7 @@ xx(lvcreate,
"\t[-n|--name LogicalVolumeName]\n"
"\t[--noudevsync]\n"
"\t[-p|--permission {r|rw}]\n"
- "\t[--pooldatasize DataSize[bBsSkKmMgGtTpPeE]]\n"
+ //"\t[--pooldatasize DataSize[bBsSkKmMgGtTpPeE]]\n"
"\t[--poolmetadatasize MetadataSize[bBsSkKmMgG]]\n"
"\t[--poolmetadataspare {y|n}]]\n"
"\t[--[raid]minrecoveryrate Rate]\n"
@@ -321,7 +321,7 @@ xx(lvcreate,
"\t[-K|--ignoreactivationskip]\n"
"\t{-l|--extents LogicalExtentsNumber[%{VG|FREE|ORIGIN}] |\n"
"\t -L|--size LogicalVolumeSize[bBsSkKmMgGtTpPeE]}\n"
- "\t[--pooldatasize DataVolumeSize[bBsSkKmMgGtTpPeE]]\n"
+ //"\t[--pooldatasize DataVolumeSize[bBsSkKmMgGtTpPeE]]\n"
"\t[--poolmetadatasize MetadataVolumeSize[bBsSkKmMgG]]\n"
"\t[-M|--persistent {y|n}] [-j|--major major] [--minor minor]\n"
"\t[--metadataprofile ProfileName]\n"
@@ -343,7 +343,8 @@ xx(lvcreate,
metadataprofile_ARG, minor_ARG, mirrorlog_ARG, mirrors_ARG, monitor_ARG,
minrecoveryrate_ARG, maxrecoveryrate_ARG, name_ARG, nosync_ARG,
noudevsync_ARG, permission_ARG, persistent_ARG,
- pooldatasize_ARG, poolmetadatasize_ARG, poolmetadataspare_ARG,
+ //pooldatasize_ARG,
+ poolmetadatasize_ARG, poolmetadataspare_ARG,
raidminrecoveryrate_ARG, raidmaxrecoveryrate_ARG,
readahead_ARG, regionsize_ARG, setactivationskip_ARG, size_ARG, snapshot_ARG,
stripes_ARG, stripesize_ARG, test_ARG, thin_ARG, thinpool_ARG, type_ARG,
9 years