master - coverity: fix issues detected in recent code
by Heinz Mauelshagen
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=82f4f073bb7eb6...
Commit: 82f4f073bb7eb68aa7cb23a0c6ee75ba03fd0e57
Parent: 15b932a70e4a29f386ea57e1b845d637780b463b
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Mon Jun 27 10:12:41 2016 +0200
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Mon Jun 27 11:22:29 2016 +0200
coverity: fix issues detected in recent code
Uninitialized variables (UNINIT) /safe/guest2/covscan/LVM2.2.02.158/tools/toollib.c: 3520 in _process_pvs_in_vgs()
Uninitialized variables (UNINIT) Using uninitialized value "do_report_ret_code".
Null pointer dereferences (REVERSE_INULL) /safe/guest2/covscan/LVM2.2.02.158/libdm/libdm-report.c: 4745 in dm_report_output()
Null pointer dereferences (REVERSE_INULL) Null-checking "rh" suggests that it may be null, but it has already been dereferenced on all paths leading to the check.
Incorrect expression (MISSING_COMMA) /safe/guest2/covscan/LVM2.2.02.158/lib/log/log.c: 280 in _get_log_level_name()
Incorrect expression (MISSING_COMMA) In the initialization of "log_level_names", a suspicious concatenated string ""noticeinfo"" is produced.
Null pointer dereferences (FORWARD_NULL) /safe/guest2/covscan/LVM2.2.02.158/tools/reporter.c: 816 in_get_report_options()
Null pointer dereferences (FORWARD_NULL) Comparing "mem" to null implies that "mem" might be null.
---
lib/log/log.c | 2 +-
libdm/libdm-report.c | 4 ++--
tools/reporter.c | 2 +-
tools/toollib.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/log/log.c b/lib/log/log.c
index b3453dc..30d71ef 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -277,7 +277,7 @@ static const char *_get_log_level_name(int use_stderr, int level)
"fatal", /* _LOG_FATAL */
"error", /* _LOG_ERROR */
"warn", /* _LOG_WARN */
- "notice" /* _LOG_NOTICE */
+ "notice",/* _LOG_NOTICE */
"info", /* _LOG_INFO */
"debug" /* _LOG_DEBUG */
};
diff --git a/libdm/libdm-report.c b/libdm/libdm-report.c
index 6bea34c..ad03c6e 100644
--- a/libdm/libdm-report.c
+++ b/libdm/libdm-report.c
@@ -4001,7 +4001,7 @@ static int _report_set_selection(struct dm_report *rh, const char *selection, in
goto_bad;
}
- if (!selection || !strcasecmp(selection, SPECIAL_SELECTION_ALL))
+ if (!selection || !selection[0] || !strcasecmp(selection, SPECIAL_SELECTION_ALL))
return 1;
rh->selection->add_new_fields = add_new_fields;
@@ -4742,7 +4742,7 @@ int dm_report_output(struct dm_report *rh)
else
r = _output_as_columns(rh);
out:
- if (r && rh && rh->group_item)
+ if (r && rh->group_item)
rh->group_item->output_done = 1;
return r;
}
diff --git a/tools/reporter.c b/tools/reporter.c
index ee2d251..40d449c 100644
--- a/tools/reporter.c
+++ b/tools/reporter.c
@@ -815,7 +815,7 @@ static int _get_report_options(struct cmd_context *cmd,
if (!(mem = dm_pool_create("report_options", 128))) {
log_error("Failed to create temporary mempool to process report options.");
- goto out;
+ return ECMD_FAILED;
}
if (single_args->report_type == CMDLOG) {
diff --git a/tools/toollib.c b/tools/toollib.c
index 5c61ddd..80d0f32 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -3439,7 +3439,7 @@ static int _process_pvs_in_vgs(struct cmd_context *cmd, uint32_t read_flags,
int skip;
int notfound;
int already_locked;
- int do_report_ret_code;
+ int do_report_ret_code = 1;
log_set_report_object_type(LOG_REPORT_OBJECT_TYPE_VG);
7 years, 9 months
master - tests: using mkfs config file
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e5d1f3d6c5433e...
Commit: e5d1f3d6c5433e8b118e572a507f121c45729715
Parent: 2063d6bb0640c54d0356dff3618a1239357a55ae
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Jul 4 17:39:17 2016 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Jul 4 17:41:10 2016 +0200
tests: using mkfs config file
Use more predictable local config when creating ext4.
---
test/shell/thin-autoumount-dmeventd.sh | 34 +++++++++++++++++++++----------
test/shell/thin-foreign-dmeventd.sh | 10 ++++++--
2 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/test/shell/thin-autoumount-dmeventd.sh b/test/shell/thin-autoumount-dmeventd.sh
index dd0884e..3729e18 100644
--- a/test/shell/thin-autoumount-dmeventd.sh
+++ b/test/shell/thin-autoumount-dmeventd.sh
@@ -16,6 +16,17 @@ SKIP_WITH_LVMPOLLD=1
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
+mntdir="${PREFIX}mnt with space"
+mntusedir="${PREFIX}mntuse"
+
+cleanup_mounted_and_teardown()
+{
+ umount "$mntdir" 2>/dev/null || true
+ umount "$mntusedir" 2>/dev/null || true
+ vgremove -ff $vg
+ aux teardown
+}
+
is_lv_opened_()
{
test $(get lv_field "$1" lv_device_open --binary) = "1"
@@ -26,7 +37,8 @@ is_lv_opened_()
#
# Main
#
-which mkfs.ext2 || skip
+which mkfs.ext4 || skip
+export MKE2FS_CONFIG="$TESTDIR/lib/mke2fs.conf"
aux have_thin 1 0 0 || skip
@@ -38,18 +50,17 @@ aux lvmconf "activation/thin_pool_autoextend_percent = 0" \
aux prepare_vg 2
-mntdir="${PREFIX}mnt with space"
-mntusedir="${PREFIX}mntuse"
lvcreate -L8M -V8M -n $lv1 -T $vg/pool
lvcreate -V8M -n $lv2 -T $vg/pool
-mkfs.ext2 "$DM_DEV_DIR/$vg/$lv1"
-mkfs.ext2 "$DM_DEV_DIR/$vg/$lv2"
+mkfs.ext4 "$DM_DEV_DIR/$vg/$lv1"
+mkfs.ext4 "$DM_DEV_DIR/$vg/$lv2"
lvchange --monitor y $vg/pool
mkdir "$mntdir" "$mntusedir"
+trap 'cleanup_mounted_and_teardown' EXIT
mount "$DM_DEV_DIR/mapper/$vg-$lv1" "$mntdir"
mount "$DM_DEV_DIR/mapper/$vg-$lv2" "$mntusedir"
@@ -64,8 +75,10 @@ sync
sleep 60 < "$mntusedir/file$$" &
PID_SLEEP=$!
-# Fill pool above 70%
-dd if=/dev/zero of="$mntdir/file$$" bs=1M count=6 conv=fdatasync
+lvs -a $vg
+# Fill pool above 95% (to cause 'forced lazy umount)
+dd if=/dev/zero of="$mntdir/file$$" bs=256K count=20 conv=fdatasync
+sync
lvs -a $vg
# Could loop here for a few secs so dmeventd can do some work
@@ -77,6 +90,8 @@ for i in $(seq 1 12) ; do
sleep 1
done
+lvs -a $vg
+
is_lv_opened_ "$vg/$lv2" || \
die "$mntusedir is not mounted here (sleep already expired??)"
@@ -84,10 +99,7 @@ is_lv_opened_ "$vg/$lv2" || \
kill $PID_SLEEP
wait
-is_lv_opened_ "$vg/$lv2" && {
+not is_lv_opened_ "$vg/$lv2" || {
mount
die "$mntusedir should have been unmounted by dmeventd!"
}
-
-vgremove -f $vg
-
diff --git a/test/shell/thin-foreign-dmeventd.sh b/test/shell/thin-foreign-dmeventd.sh
index a96b206..5d7488e 100644
--- a/test/shell/thin-foreign-dmeventd.sh
+++ b/test/shell/thin-foreign-dmeventd.sh
@@ -37,13 +37,17 @@ percent_() {
aux have_thin 1 0 0 || skip
which mkfs.ext4 || skip
+# Use our mkfs config file to get approximately same results
+# TODO: maybe use it for all test via some 'prepare' function
+export MKE2FS_CONFIG="$TESTDIR/lib/mke2fs.conf"
+
aux prepare_dmeventd
aux prepare_pvs 2 64
vgcreate $vg -s 64K $(cat DEVICES)
# Create named pool only
-lvcreate --errorwhenfull y -L2100K -T $vg/pool
+lvcreate --errorwhenfull y -L2 -T $vg/pool
POOL="$vg-pool"
THIN="${PREFIX}_thin"
@@ -65,7 +69,7 @@ dmsetup table
dmsetup info -c
mkdir "$MOUNT_DIR"
-# This mkfs fills 2.2MB pool over 95%
+# This mkfs should fill 2MB pool over 95%
# no autoresize is configured
mkfs.ext4 "$DM_DEV_DIR/mapper/$THIN"
test $(percent_) -gt 95
@@ -78,7 +82,7 @@ test $(percent_) -gt 95
aux lvmconf 'activation/thin_pool_autoextend_percent = 10' \
'activation/thin_pool_autoextend_threshold = 75'
-# Give it some time to left dmeventd do some work
+# Give it some time to left dmeventd do some (failing to resize) work
sleep 20
# And check foreign thin device is still mounted
7 years, 9 months
master - tests: add line for mixing dmeventd with log
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2063d6bb0640c5...
Commit: 2063d6bb0640c54d0356dff3618a1239357a55ae
Parent: b91390c21149875c26f8c7b37e3cbdfda0f419ae
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Jul 4 17:32:58 2016 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Jul 4 17:41:09 2016 +0200
tests: add line for mixing dmeventd with log
TODO: it might be better to log dmeventd messages with test output
just like we do with clvmd - maybe we will switch to this one
instead of extra DMEVENTD log file in future....
---
test/lib/aux.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 66574df..7724723 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -194,6 +194,7 @@ prepare_dmeventd() {
local run_valgrind=
test "${LVM_VALGRIND_DMEVENTD:-0}" -eq 0 || run_valgrind="run_valgrind"
+# LVM_LOG_FILE_EPOCH=DMEVENTD $run_valgrind dmeventd -fddddl "$@" 2>&1 &
LVM_LOG_FILE_EPOCH=DMEVENTD $run_valgrind dmeventd -fddddl "$@" >debug.log_DMEVENTD_out 2>&1 &
echo $! > LOCAL_DMEVENTD
7 years, 9 months
master - tests: add mke2fs.conf
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b91390c2114987...
Commit: b91390c21149875c26f8c7b37e3cbdfda0f419ae
Parent: 2981d1e79851bc83751efc1d9ce987cdc65305bc
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Jul 4 17:28:43 2016 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Jul 4 17:40:25 2016 +0200
tests: add mke2fs.conf
Add config for mkfs to get more predicatable results
when using mkfs across variety of distributions.
In future maybe use this per all tests as default.
For now user has to specify in a test MKE2FS_CONFIG envvar to use it.
---
test/Makefile.in | 1 +
test/lib/mke2fs.conf | 45 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/test/Makefile.in b/test/Makefile.in
index f48d6ea..94b3105 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -205,6 +205,7 @@ install: .tests-stamp lib/paths-installed
$(INSTALL_DIR) $(DATADIR)/{shell,api,lib,dbus} $(EXECDIR)
$(INSTALL_DATA) shell/*.sh $(DATADIR)/shell
$(INSTALL_DATA) api/*.sh $(DATADIR)/api
+ $(INSTALL_DATA) lib/mke2fs.conf $(DATADIR)/lib
$(INSTALL_PROGRAM) api/*.{t,py} $(DATADIR)/api
$(INSTALL_PROGRAM) dbus/*.py $(DATADIR)/dbus/
$(INSTALL_DATA) lib/paths-installed $(DATADIR)/lib/paths
diff --git a/test/lib/mke2fs.conf b/test/lib/mke2fs.conf
new file mode 100644
index 0000000..81bed21
--- /dev/null
+++ b/test/lib/mke2fs.conf
@@ -0,0 +1,45 @@
+[defaults]
+ base_features = sparse_super,filetype,resize_inode,dir_index,ext_attr
+ enable_periodic_fsck = 1
+ blocksize = 4096
+ inode_size = 256
+ inode_ratio = 16384
+
+[fs_types]
+ ext3 = {
+ features = has_journal
+ }
+ ext4 = {
+ features = has_journal,extent,huge_file,flex_bg,dir_nlink,extra_isize
+ inode_size = 256
+ }
+ ext4dev = {
+ features = has_journal,extent,huge_file,flex_bg,dir_nlink,extra_isize
+ inode_size = 256
+ options = test_fs=1
+ }
+ small = {
+ blocksize = 1024
+ inode_size = 128
+ inode_ratio = 4096
+ }
+ floppy = {
+ blocksize = 1024
+ inode_size = 128
+ inode_ratio = 8192
+ }
+ news = {
+ inode_ratio = 4096
+ }
+ largefile = {
+ inode_ratio = 1048576
+ blocksize = -1
+ }
+ largefile4 = {
+ inode_ratio = 4194304
+ blocksize = -1
+ }
+ hurd = {
+ blocksize = 4096
+ inode_size = 128
+ }
7 years, 9 months
master - tests: try to force remove higher minor first
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2981d1e79851bc...
Commit: 2981d1e79851bc83751efc1d9ce987cdc65305bc
Parent: c0a505b0bb4eb6584bfea54b526ce38bdfcfa838
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Jul 4 15:39:44 2016 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Jul 4 17:40:24 2016 +0200
tests: try to force remove higher minor first
When force removing thin-pool we loose 'real' access to hidden device,
and if such pool is in suspended state, any thin volume cannot be
dropped. It likely should be also checked by dmsetup, but meanwhile
apply simple logic - try to force remove first all higher minors first
with assumption we first create thin-pool and then thin volume
and there are usually not being released lower dm numbers to
get the order wrong.
---
test/lib/aux.sh | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 8653149..66574df 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -419,7 +419,8 @@ teardown_devs_prefixed() {
while num_devs=$(dm_table | grep "$prefix" | wc -l) && \
test $num_devs -lt $num_remaining_devs -a $num_devs -ne 0; do
test "$stray" -eq 0 || echo "Removing $num_devs stray mapped devices with names beginning with $prefix: "
- for dm in $(dm_info name --sort open | grep "$prefix") ; do
+ # HACK: sort also by minors - so we try to close 'possibly later' created device first
+ for dm in $(dm_info name --sort open,-minor | grep "$prefix") ; do
dmsetup remove -f "$dm" || true
done
num_remaining_devs=$num_devs
7 years, 9 months
master - cleanup: drop unused header files
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c0a505b0bb4eb6...
Commit: c0a505b0bb4eb6584bfea54b526ce38bdfcfa838
Parent: adc1fe4b3f84b341383d9737162397426e1a1295
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Jul 4 15:37:31 2016 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Jul 4 17:40:24 2016 +0200
cleanup: drop unused header files
---
lib/format_text/archiver.c | 1 -
lib/metadata/lv_manip.c | 1 -
2 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/lib/format_text/archiver.c b/lib/format_text/archiver.c
index 2acd8f5..92799e4 100644
--- a/lib/format_text/archiver.c
+++ b/lib/format_text/archiver.c
@@ -22,7 +22,6 @@
#include "memlock.h"
#include "toolcontext.h"
#include "locking.h"
-#include "lvmetad-client.h"
#include <unistd.h>
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 6f02b16..5cf9618 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -28,7 +28,6 @@
#include "str_list.h"
#include "defaults.h"
#include "lvm-exec.h"
-#include "lvm-signal.h"
#include "memlock.h"
#include "lvmlockd.h"
7 years, 9 months
master - dmeventd: improved logged messages from thin plugin
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=adc1fe4b3f84b3...
Commit: adc1fe4b3f84b341383d9737162397426e1a1295
Parent: 52be93c54bfedf16bb86472c03b6833d2be0efd1
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Jul 4 17:30:27 2016 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Jul 4 17:40:24 2016 +0200
dmeventd: improved logged messages from thin plugin
Show better names in logged messages.
---
daemons/dmeventd/plugins/thin/dmeventd_thin.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/daemons/dmeventd/plugins/thin/dmeventd_thin.c b/daemons/dmeventd/plugins/thin/dmeventd_thin.c
index c27cf50..622910f 100644
--- a/daemons/dmeventd/plugins/thin/dmeventd_thin.c
+++ b/daemons/dmeventd/plugins/thin/dmeventd_thin.c
@@ -94,7 +94,7 @@ static int _has_unmountable_prefix(int major, int minor)
goto out;
#if THIN_DEBUG
- log_debug("Found LV (%u:%u) %s.", major, minor, uuid);
+ log_debug("Found logical volume %s (%u:%u).", uuid, major, minor);
#endif
r = 1;
out:
@@ -246,13 +246,18 @@ static int _umount_device(char *buffer, unsigned major, unsigned minor,
char *target, void *cb_data)
{
struct mountinfo_s *data = cb_data;
+ char *words[10];
if ((major == data->info.major) && dm_bit(data->minors, minor)) {
- log_info("Unmounting thin volume %s from %s.",
- data->device, target);
+ if (dm_split_words(buffer, DM_ARRAY_SIZE(words), 0, words) < DM_ARRAY_SIZE(words))
+ words[9] = NULL; /* just don't show device name */
+ log_info("Unmounting thin %s (%d:%d) of thin-pool %s (%u:%u) from mount point \"%s\".",
+ words[9] ? : "", major, minor, data->device,
+ data->info.major, data->info.minor,
+ target);
if (!_run(UMOUNT_COMMAND, "-fl", target, NULL))
- log_error("Failed to umount thin %s from %s: %s.",
- data->device, target, strerror(errno));
+ log_error("Failed to lazy umount thin %s (%d:%d) from %s: %s.",
+ words[9], major, minor, target, strerror(errno));
}
return 1;
7 years, 9 months
master - dmsetup: fix timestamp leak
by Bryn Reeves
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=52be93c54bfedf...
Commit: 52be93c54bfedf16bb86472c03b6833d2be0efd1
Parent: 62dce13c7a00a71c73926340e05053b7ebee48e9
Author: Bryn M. Reeves <bmr(a)redhat.com>
AuthorDate: Wed Jun 29 10:14:57 2016 +0100
Committer: Bryn M. Reeves <bmr(a)redhat.com>
CommitterDate: Mon Jul 4 12:16:51 2016 +0100
dmsetup: fix timestamp leak
With a single report (--count=1) no timerfd is set up and the cycle
and current timestamps should be freed during the single call to
_update_interval_times().
---
tools/dmsetup.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/tools/dmsetup.c b/tools/dmsetup.c
index 03e2519..8ba12dd 100644
--- a/tools/dmsetup.c
+++ b/tools/dmsetup.c
@@ -703,13 +703,16 @@ static int _update_interval_times(void)
{
static struct dm_timestamp *this_timestamp = NULL;
uint64_t delta_t, interval_num = _interval_num();
- int r = 0;
+ int r = 1;
/*
* Clock shutdown for exit - nothing to do.
*/
- if (_timer_fd == TIMER_STOPPED && !_cycle_timestamp)
- return 1;
+ if ((_timer_fd == TIMER_STOPPED) && !_cycle_timestamp)
+ goto out;
+
+ /* clock is running */
+ r = 0;
/*
* Current timestamp. If _new_interval is set this is used as
@@ -780,7 +783,8 @@ static int _update_interval_times(void)
r = 1;
out:
- if (!r || _timer_fd == TIMER_STOPPED) {
+ /* timer stopped or never started */
+ if (!r || _timer_fd < 0) {
/* The _cycle_timestamp has not yet been allocated if we
* fail to obtain this_timestamp on the first interval.
*/
7 years, 9 months
master - dmstats: fix RgStart and RgSize field widths
by Bryn Reeves
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=62dce13c7a00a7...
Commit: 62dce13c7a00a71c73926340e05053b7ebee48e9
Parent: f27e95b25a639ca5cf8329f6f26f6a040706bf57
Author: Bryn M. Reeves <bmr(a)redhat.com>
AuthorDate: Mon Jun 27 12:41:58 2016 +0100
Committer: Bryn M. Reeves <bmr(a)redhat.com>
CommitterDate: Mon Jul 4 12:16:51 2016 +0100
dmstats: fix RgStart and RgSize field widths
---
tools/dmsetup.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/dmsetup.c b/tools/dmsetup.c
index b61b42f..03e2519 100644
--- a/tools/dmsetup.c
+++ b/tools/dmsetup.c
@@ -4189,8 +4189,8 @@ FIELD_F(STATS, NUM, "Interval", 8, dm_stats_sample_interval, "interval", "Sampli
/* Stats report meta-fields */
FIELD_F(STATS_META, NUM, "RgID", 4, dm_stats_region_id, "region_id", "Region ID.")
-FIELD_F(STATS_META, SIZ, "RgStart", 5, dm_stats_region_start, "region_start", "Region start.")
-FIELD_F(STATS_META, SIZ, "RgSize", 5, dm_stats_region_len, "region_len", "Region length.")
+FIELD_F(STATS_META, SIZ, "RgStart", 7, dm_stats_region_start, "region_start", "Region start.")
+FIELD_F(STATS_META, SIZ, "RgSize", 6, dm_stats_region_len, "region_len", "Region length.")
FIELD_F(STATS_META, NUM, "ArID", 4, dm_stats_area_id, "area_id", "Area ID.")
FIELD_F(STATS_META, SIZ, "ArStart", 7, dm_stats_area_start, "area_start", "Area offset from start of device.")
FIELD_F(STATS_META, SIZ, "ArSize", 6, dm_stats_area_len, "area_len", "Area length.")
7 years, 9 months
master - docs: remove obsolete note from dmstats.8.in
by Bryn Reeves
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f27e95b25a639c...
Commit: f27e95b25a639ca5cf8329f6f26f6a040706bf57
Parent: d8c2677ab92c3c3bd35ccab0d486ebce8db4fbb4
Author: Bryn M. Reeves <bmr(a)redhat.com>
AuthorDate: Sun Jun 19 21:48:29 2016 +0100
Committer: Bryn M. Reeves <bmr(a)redhat.com>
CommitterDate: Mon Jul 4 12:16:50 2016 +0100
docs: remove obsolete note from dmstats.8.in
---
man/dmstats.8.in | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/man/dmstats.8.in b/man/dmstats.8.in
index 9776aa7..1b7a499 100644
--- a/man/dmstats.8.in
+++ b/man/dmstats.8.in
@@ -192,11 +192,6 @@ The second argument is the \fIdevice name\fP,
Further options permit the selection of regions, output format
control, and reporting behaviour.
-When the program is run using the '\fBdmstats\fP' alias, the command
-\fBmust\fP be the first argument and any switches and options should be
-specified following the command itself. This limitation is not present
-when run as '\fBdmsetup stats\fP'.
-
When no device argument is given dmstats will by default operate on all
device-mapper devices present. The \fBcreate\fP and \fBdelete\fP
commands require the use of \fB\-\-alldevices\fP when used in this way.
7 years, 9 months