lvm2-commits April 2020

lvm2-commits@lists.fedorahosted.org

3 participants
20 discussions

master - blkdeactivate: add support for VDO in blkdeactivate script
by Peter Rajnoha 09 Apr '20

09 Apr '20

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0dd905c959a8f36ea6270… Commit: 0dd905c959a8f36ea627027336b6d5dafb015001 Parent: e10f20bc23088a2f9f7529f8f2b40d9c1fcb54c6 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Thu Apr 9 15:23:58 2020 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Thu Apr 9 15:29:29 2020 +0200 blkdeactivate: add support for VDO in blkdeactivate script Make it possible to tear down VDO volumes with blkdeactivate if VDO is part of a device stack (and if VDO binary is installed). Also, support optional -o|--vdooptions configfile=file. --- WHATS_NEW_DM | 1 + man/blkdeactivate.8_main | 11 +++++++++++ scripts/blkdeactivate.sh.in | 48 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index ef0461fad..3ec9c3c15 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.173 - ================================== + Add support for VDO in blkdeactivate script. Version 1.02.171 - 26th March 2020 ================================== diff --git a/man/blkdeactivate.8_main b/man/blkdeactivate.8_main index f3c19a8c3..06af52e52 100644 --- a/man/blkdeactivate.8_main +++ b/man/blkdeactivate.8_main @@ -9,6 +9,7 @@ blkdeactivate \(em utility to deactivate block devices .RB [ -l \ \fIlvm_options\fP ] .RB [ -m \ \fImpath_options\fP ] .RB [ -r \ \fImdraid_options\fP ] +.RB [ -o \ \fIvdo_options\fP ] .RB [ -u ] .RB [ -v ] .RI [ device ] @@ -70,6 +71,15 @@ Comma-separated list of MD RAID specific options: Wait MD device's resync, recovery or reshape action to complete before deactivation. .RE + +.TP +.BR -o ", " --vdooptions \ \fIvdo_options\fP +Comma-separated list of VDO specific options: +.RS +.IP \fIconfigfile=file\fP +Use specified VDO configuration file. +.RE + .TP .BR -u ", " --umount Unmount a mounted device before trying to deactivate it. @@ -120,4 +130,5 @@ of a device-mapper device fails, retry it and force removal. .BR lvm (8), .BR mdadm (8), .BR multipathd (8), +.BR vdo (8), .BR umount (8) diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in index a4b8a8fb5..57b3e58bf 100644 --- a/scripts/blkdeactivate.sh.in +++ b/scripts/blkdeactivate.sh.in @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2012-2017 Red Hat, Inc. All rights reserved. +# Copyright (C) 2012-2020 Red Hat, Inc. All rights reserved. # # This file is part of LVM2. # @@ -38,6 +38,7 @@ MDADM="/sbin/mdadm" MOUNTPOINT="/bin/mountpoint" MPATHD="/sbin/multipathd" UMOUNT="/bin/umount" +VDO="/bin/vdo" sbindir="@SBINDIR@" DMSETUP="$sbindir/dmsetup" @@ -54,6 +55,7 @@ DMSETUP_OPTS="" LVM_OPTS="" MDADM_OPTS="" MPATHD_OPTS="" +VDO_OPTS="" LSBLK="/bin/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT" LSBLK_VARS="local devtype local kname local name local mnt" @@ -124,6 +126,7 @@ usage() { echo " -l | --lvmoptions LVM_OPTIONS Comma separated LVM specific options" echo " -m | --mpathoptions MPATH_OPTIONS Comma separated DM-multipath specific options" echo " -r | --mdraidoptions MDRAID_OPTIONS Comma separated MD RAID specific options" + echo " -o | --vdooptions VDO_OPTIONS Comma separated VDO specific options" echo " -u | --umount Unmount the device if mounted" echo " -v | --verbose Verbose mode (also implies -e)" echo @@ -138,6 +141,8 @@ usage() { echo " wait wait for resync, recovery or reshape to complete first" echo " MPATH_OPTIONS:" echo " disablequeueing disable queueing on all DM-multipath devices first" + echo " VDO_OPTIONS:" + echo " configfile=file use specified VDO configuration file" exit } @@ -319,6 +324,23 @@ deactivate_md () { fi } +deactivate_vdo() { + local xname + xname=$(printf "%s" "$name") + test -b "$DEV_DIR/mapper/$xname" || return 0 + test -z "${SKIP_DEVICE_LIST["$kname"]}" || return 1 + + deactivate_holders "$DEV_DIR/mapper/$xname" || return 1 + + echo -n " [VDO]: deactivating VDO volume $xname... " + if eval "$VDO" stop $VDO_OPTS --name="$xname" "$OUT" "$ERR"; then + echo "done" + else + echo "skipping" + add_device_to_skip_list + fi +} + deactivate () { ###################################################################### # DEACTIVATION HOOKS FOR NEW DEVICE TYPES GO HERE! # @@ -335,6 +357,8 @@ deactivate () { ###################################################################### if test "$devtype" = "lvm"; then deactivate_lvm + elif test "$devtype" = "vdo"; then + deactivate_vdo elif test "${kname:0:3}" = "dm-"; then deactivate_dm elif test "${kname:0:2}" = "md"; then @@ -479,6 +503,20 @@ get_mpathopts() { IFS=$ORIG_IFS } +get_vdoopts() { + ORIG_IFS=$IFS; IFS=',' + + for opt in $1; do + case "$opt" in + "") ;; + configfile=*) tmp=${opt#*=}; VDO_OPTS+="--confFile=${tmp%%,*} " ;; + *) echo "$opt: unknown VDO option" + esac + done + + IFS=$ORIG_IFS +} + set_env() { if test "$ERRORS" -eq "1"; then unset ERR @@ -493,6 +531,7 @@ set_env() { LVM_OPTS+="-vvvv" MDADM_OPTS+="-vv" MPATHD_OPTS+="-v 3" + VDO_OPTS+="--verbose " else OUT="1>$DEV_DIR/null" fi @@ -509,6 +548,12 @@ set_env() { MDADM_AVAILABLE=0 fi + if test -f $VDO; then + VDO_AVAILABLE=1 + else + VDO_AVAILABLE=0 + fi + MPATHD_RUNNING=0 test "$MPATHD_DO_DISABLEQUEUEING" -eq 1 && { if test -f "$MPATHD"; then @@ -528,6 +573,7 @@ while test $# -ne 0; do "-l"|"--lvmoptions") get_lvmopts "$2" ; shift ;; "-m"|"--mpathoptions") get_mpathopts "$2" ; shift ;; "-r"|"--mdraidoptions") get_mdraidopts "$2"; shift ;; + "-o"|"--vdooptions") get_vdoopts "$2"; shift ;; "-u"|"--umount") DO_UMOUNT=1 ;; "-v"|"--verbose") VERBOSE=1 ; ERRORS=1 ;; "-vv") VERBOSE=1 ; ERRORS=1 ; set -x ;;

1 0

master - WHATS_NEWS: update
by Zdenek Kabelac 08 Apr '20

08 Apr '20

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e10f20bc23088a2f9f752… Commit: e10f20bc23088a2f9f7529f8f2b40d9c1fcb54c6 Parent: 3dd11d9ea8b04a47e4eab7ebdd22c34fa18d4787 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Apr 8 15:22:25 2020 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Apr 8 15:37:24 2020 +0200 WHATS_NEWS: update --- WHATS_NEW | 1 + 1 file changed, 1 insertion(+) diff --git a/WHATS_NEW b/WHATS_NEW index bdeab78e4..89583f7ef 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.03.10 - ================================= + Fix support for lvconvert --repair used by foreign apps (i.e. Docker). Version 2.03.09 - 26th March 2020 =================================

1 0

master - test: repair of thin-pool used by foreign apps
by Zdenek Kabelac 08 Apr '20

08 Apr '20

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3dd11d9ea8b04a47e4eab… Commit: 3dd11d9ea8b04a47e4eab7ebdd22c34fa18d4787 Parent: 98e33ee3fbce8c43c312a2e6b8e42cddb3e6874c Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Apr 8 15:20:33 2020 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Apr 8 15:37:24 2020 +0200 test: repair of thin-pool used by foreign apps --- test/shell/thin-foreign-repair.sh | 72 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/test/shell/thin-foreign-repair.sh b/test/shell/thin-foreign-repair.sh new file mode 100644 index 000000000..147a9a073 --- /dev/null +++ b/test/shell/thin-foreign-repair.sh @@ -0,0 +1,72 @@ +#!/usr/bin/env bash + +# Copyright (C) 2020 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +# test foreing user of thin-pool + + +SKIP_WITH_LVMPOLLD=1 + +. lib/inittest + +cleanup_mounted_and_teardown() +{ + dmsetup remove $THIN || true + vgremove -ff $vg + aux teardown +} + +# +# Main +# +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="$TESTOLDPWD/lib/mke2fs.conf" + +aux prepare_vg 2 64 + +# Create named pool only +lvcreate -L2 -T $vg/pool + +POOL="$vg-pool" +THIN="${PREFIX}_thin" + +# Foreing user is using own ioctl command to create thin devices +dmsetup message $POOL 0 "create_thin 0" +dmsetup message $POOL 0 "set_transaction_id 0 2" + +# Once the transaction id has changed, lvm2 shall not be able to create thinLV +fail lvcreate -V10 $vg/pool + +trap 'cleanup_mounted_and_teardown' EXIT + +# 20M thin device +dmsetup create "$THIN" --table "0 40960 thin $DM_DEV_DIR/mapper/$POOL 0" + +mkfs.ext4 "$DM_DEV_DIR/mapper/$THIN" + +dmsetup remove "$THIN" + +lvchange -an $vg/pool + +# Repair thin-pool used by 'foreing' apps (setting their own tid) +lvconvert --repair $vg/pool 2>&1 | tee out + +not grep "Transaction id" out + +lvchange -ay $vg/pool + +dmsetup create "$THIN" --table "0 40960 thin $DM_DEV_DIR/mapper/$POOL 0" + +fsck -n "$DM_DEV_DIR/mapper/$THIN"

1 0

master - lvconvert: no validation for thin-pools not used by lvm2
by Zdenek Kabelac 08 Apr '20

08 Apr '20

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=98e33ee3fbce8c43c312a… Commit: 98e33ee3fbce8c43c312a2e6b8e42cddb3e6874c Parent: 06cbe3cfc6958b016d97243b807aaf29b9908b23 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Apr 8 11:46:42 2020 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Apr 8 15:22:44 2020 +0200 lvconvert: no validation for thin-pools not used by lvm2 lvm2 supports thin-pool to be later used by other tools doing virtual volumes themself (i.e. docker) - in this case we shall not validate transaction Id - is this is used by other tools and lvm2 keeps value 0 - so the transationId validation need to be skipped in this case. --- tools/lvconvert.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/lvconvert.c b/tools/lvconvert.c index f6d9a29f6..bb40930cb 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -2388,7 +2388,8 @@ static int _lvconvert_thin_pool_repair(struct cmd_context *cmd, goto deactivate_mlv; } - if (thin_dump[0]) { + /* Check matching transactionId when thin-pool is used by lvm2 (transactionId != 0) */ + if (first_seg(pool_lv)->transaction_id && thin_dump[0]) { argv[0] = thin_dump; argv[1] = pms_path; argv[2] = NULL;

1 0

stable-2.02 - WHATS_NEWS: update
by Zdenek Kabelac 08 Apr '20

08 Apr '20

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=bac7d5951dd3b5b04d453… Commit: bac7d5951dd3b5b04d4532b342c1034802f0d466 Parent: 70d2ff38c0dfb4e46648102ed655afa9f0929c60 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Apr 8 15:22:25 2020 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Apr 8 15:36:01 2020 +0200 WHATS_NEWS: update --- WHATS_NEW | 1 + WHATS_NEW_DM | 2 ++ 2 files changed, 3 insertions(+) diff --git a/WHATS_NEW b/WHATS_NEW index cdc2396e6..0e65ff172 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.188 - ================================== + Fix support for lvconvert --repair used by foreign apps (i.e. Docker). Version 2.02.187 - 24th March 2020 ================================== diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 925be5a7b..f1b4f2b6a 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,7 @@ Version 1.02.172 - ================================== + Fix dm_list interators with gcc 10 optimization (-ftree-pta). + Dmeventd handles timer without looping on short intervals. Version 1.02.170 - 24th March 2020 ==================================

1 0

stable-2.02 - test: repair of thin-pool used by foreign apps
by Zdenek Kabelac 08 Apr '20

08 Apr '20

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=70d2ff38c0dfb4e466481… Commit: 70d2ff38c0dfb4e46648102ed655afa9f0929c60 Parent: 1316cafbe988307264e4f87dbcffaf56bc2ab388 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Apr 8 15:20:33 2020 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Apr 8 15:31:17 2020 +0200 test: repair of thin-pool used by foreign apps --- test/shell/thin-foreign-repair.sh | 72 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/test/shell/thin-foreign-repair.sh b/test/shell/thin-foreign-repair.sh new file mode 100644 index 000000000..147a9a073 --- /dev/null +++ b/test/shell/thin-foreign-repair.sh @@ -0,0 +1,72 @@ +#!/usr/bin/env bash + +# Copyright (C) 2020 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +# test foreing user of thin-pool + + +SKIP_WITH_LVMPOLLD=1 + +. lib/inittest + +cleanup_mounted_and_teardown() +{ + dmsetup remove $THIN || true + vgremove -ff $vg + aux teardown +} + +# +# Main +# +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="$TESTOLDPWD/lib/mke2fs.conf" + +aux prepare_vg 2 64 + +# Create named pool only +lvcreate -L2 -T $vg/pool + +POOL="$vg-pool" +THIN="${PREFIX}_thin" + +# Foreing user is using own ioctl command to create thin devices +dmsetup message $POOL 0 "create_thin 0" +dmsetup message $POOL 0 "set_transaction_id 0 2" + +# Once the transaction id has changed, lvm2 shall not be able to create thinLV +fail lvcreate -V10 $vg/pool + +trap 'cleanup_mounted_and_teardown' EXIT + +# 20M thin device +dmsetup create "$THIN" --table "0 40960 thin $DM_DEV_DIR/mapper/$POOL 0" + +mkfs.ext4 "$DM_DEV_DIR/mapper/$THIN" + +dmsetup remove "$THIN" + +lvchange -an $vg/pool + +# Repair thin-pool used by 'foreing' apps (setting their own tid) +lvconvert --repair $vg/pool 2>&1 | tee out + +not grep "Transaction id" out + +lvchange -ay $vg/pool + +dmsetup create "$THIN" --table "0 40960 thin $DM_DEV_DIR/mapper/$POOL 0" + +fsck -n "$DM_DEV_DIR/mapper/$THIN"

1 0

stable-2.02 - lvconvert: no validation for thin-pools not used by lvm2
by Zdenek Kabelac 08 Apr '20

08 Apr '20

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1316cafbe988307264e4f… Commit: 1316cafbe988307264e4f87dbcffaf56bc2ab388 Parent: 5f766b32cf0d88644232a43a59247476a16fbc9c Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Apr 8 11:46:42 2020 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Apr 8 15:31:17 2020 +0200 lvconvert: no validation for thin-pools not used by lvm2 lvm2 supports thin-pool to be later used by other tools doing virtual volumes themself (i.e. docker) - in this case we shall not validate transaction Id - is this is used by other tools and lvm2 keeps value 0 - so the transationId validation need to be skipped in this case. --- tools/lvconvert.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 677bed134..0bc1a0128 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -2325,7 +2325,8 @@ static int _lvconvert_thin_pool_repair(struct cmd_context *cmd, goto deactivate_mlv; } - if (thin_dump[0]) { + /* Check matching transactionId when thin-pool is used by lvm2 (transactionId != 0) */ + if (first_seg(pool_lv)->transaction_id && thin_dump[0]) { argv[0] = thin_dump; argv[1] = pms_path; argv[2] = NULL;

1 0

stable-2.02 - container_of: use offsetof from stddef
by Zdenek Kabelac 08 Apr '20

08 Apr '20

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5f766b32cf0d88644232a… Commit: 5f766b32cf0d88644232a43a59247476a16fbc9c Parent: 5d93892d4ae67b355ab6b418c0c404e1536d055f Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Mar 5 12:58:34 2020 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Apr 8 15:22:54 2020 +0200 container_of: use offsetof from stddef Use standardized offsetof() macro from stddef. Helps to build valid code with latest gcc10 with -O2. --- base/memory/container_of.h | 6 ++++-- lib/device/bcache.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/base/memory/container_of.h b/base/memory/container_of.h index 4e4c662bf..ddb795935 100644 --- a/base/memory/container_of.h +++ b/base/memory/container_of.h @@ -1,4 +1,4 @@ -// Copyright (C) 2018 Red Hat, Inc. All rights reserved. +// Copyright (C) 2018 - 2020 Red Hat, Inc. All rights reserved. // // This file is part of LVM2. // @@ -13,10 +13,12 @@ #ifndef BASE_MEMORY_CONTAINER_OF_H #define BASE_MEMORY_CONTAINER_OF_H +#include <stddef.h> // offsetof + //---------------------------------------------------------------- #define container_of(v, t, head) \ - ((t *)((const char *)(v) - (const char *)&((t *) 0)->head)) + ((t *)((const char *)(v) - offsetof(t, head))) //---------------------------------------------------------------- diff --git a/lib/device/bcache.h b/lib/device/bcache.h index f9067f70c..c5e6da1ad 100644 --- a/lib/device/bcache.h +++ b/lib/device/bcache.h @@ -25,7 +25,7 @@ // FIXME: move somewhere more sensible #define container_of(v, t, head) \ - ((t *)((const char *)(v) - (const char *)&((t *) 0)->head)) + ((t *)((const char *)(v) - offsetof(t, head))) /*----------------------------------------------------------------*/

1 0

stable-2.02 - dmeventd: enhance time waiting loop
by Zdenek Kabelac 08 Apr '20

08 Apr '20

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5d93892d4ae67b355ab6b… Commit: 5d93892d4ae67b355ab6b418c0c404e1536d055f Parent: 8f3d2d5e11305b5f3fc7ced7bd2f81412c9e7d93 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Mar 4 15:56:09 2020 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Apr 8 15:22:54 2020 +0200 dmeventd: enhance time waiting loop dmeventd is 'scanning' statuses in loop (most usually in 10sec intervals) - and meanwhile it sleeps within: pthread_cond_timedwait() However this function call tends to wakeup sometimes a short amount of time sooner - and our code still believe the 'right time' has not yet arrived and basically for a moment 'busy-looped' on calling this function - so for systems with 'clock_gettime()' present we obtain time and we go 10ms to the future second - this avoids unneeded repeated invocation of our time scheduling loop. TODO: monitoring during 1 hour 'time-change'... --- daemons/dmeventd/dmeventd.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c index 8917422fc..1b84c28ba 100644 --- a/daemons/dmeventd/dmeventd.c +++ b/daemons/dmeventd/dmeventd.c @@ -752,7 +752,7 @@ static void _exit_timeout(void *unused __attribute__((unused))) static void *_timeout_thread(void *unused __attribute__((unused))) { struct thread_status *thread; - struct timespec timeout; + struct timespec timeout, real_time; time_t curr_time; int ret; @@ -763,7 +763,16 @@ static void *_timeout_thread(void *unused __attribute__((unused))) while (!dm_list_empty(&_timeout_registry)) { timeout.tv_sec = 0; timeout.tv_nsec = 0; +#ifndef HAVE_REALTIME curr_time = time(NULL); +#else + if (clock_gettime(CLOCK_REALTIME, &real_time)) { + log_error("Failed to read clock_gettime()."); + break; + } + /* 10ms back to the future */ + curr_time = real_time.tv_sec + ((real_time.tv_nsec > (1000000000 - 10000000)) ? 1 : 0); +#endif dm_list_iterate_items_gen(thread, &_timeout_registry, timeout_list) { if (thread->next_time <= curr_time) {

1 0

stable-2.02 - libdm: fix dm_list pointer arithmentic for new gcc 10 optimization
by Zdenek Kabelac 08 Apr '20

08 Apr '20

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8f3d2d5e11305b5f3fc7c… Commit: 8f3d2d5e11305b5f3fc7ced7bd2f81412c9e7d93 Parent: 2e3791b421a773b637705a3ca7a2ffc4efc8c873 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Mar 4 16:07:22 2020 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Apr 8 15:22:54 2020 +0200 libdm: fix dm_list pointer arithmentic for new gcc 10 optimization --- libdm/libdevmapper.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index 18fe9f9fd..03a43eb45 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -30,6 +30,7 @@ #include <string.h> #include <stdlib.h> #include <stdio.h> +#include <stddef.h> /* offsetof */ #ifndef __GNUC__ # define __typeof__ typeof @@ -2470,7 +2471,7 @@ struct dm_list *dm_list_next(const struct dm_list *head, const struct dm_list *e * contained in a structure of type t, return the containing structure. */ #define dm_list_struct_base(v, t, head) \ - ((t *)((const char *)(v) - (const char *)&((t *) 0)->head)) + ((t *)((const char *)(v) - offsetof(t, head))) /* * Given the address v of an instance of 'struct dm_list list' contained in @@ -2483,7 +2484,7 @@ struct dm_list *dm_list_next(const struct dm_list *head, const struct dm_list *e * return another element f. */ #define dm_struct_field(v, t, e, f) \ - (((t *)((uintptr_t)(v) - (uintptr_t)&((t *) 0)->e))->f) + (((t *)((uintptr_t)(v) - offsetof(t, e))->f) /* * Given the address v of a known element e in a known structure of type t,

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits April 2020