master - blkdeactivate: fix long form of options
by Peter Rajnoha
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=4d7a4554f40f99...
Commit: 4d7a4554f40f990b9cb43a5a6039251eec3b94c3
Parent: 2679c68689628e71749ebcfc8b2969e32ed6cb3c
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Fri Oct 12 15:42:24 2012 +0200
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Fri Oct 12 15:42:24 2012 +0200
blkdeactivate: fix long form of options
Actually, long form for -d and -l option is --dmoption and --lvmoption respectively.
---
scripts/blkdeactivate.sh.in | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in
index 031f5f6..740bac5 100644
--- a/scripts/blkdeactivate.sh.in
+++ b/scripts/blkdeactivate.sh.in
@@ -302,8 +302,8 @@ while test $# -ne 0; do
case "$1" in
"") ;;
"-h"|"--help") usage ;;
- "-d"|"--dmopts") get_dmopts "$2" ; shift ;;
- "-l"|"--lvmopts") get_lvmopts "$2" ; shift ;;
+ "-d"|"--dmoption ") get_dmopts "$2" ; shift ;;
+ "-l"|"--lvmoption ") get_lvmopts "$2" ; shift ;;
"-u"|"--umount") DO_UMOUNT=1 ;;
*) break ;;
esac
11 years, 6 months
master - WHATS_NEW: update
by Peter Rajnoha
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2679c68689628e...
Commit: 2679c68689628e71749ebcfc8b2969e32ed6cb3c
Parent: a70d6b350f98bd6e9068ce723a275f31e9f27b7e
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Fri Oct 12 14:47:40 2012 +0200
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Fri Oct 12 14:47:40 2012 +0200
WHATS_NEW: update
---
WHATS_NEW | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 8ae3a22..a170bfe 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.98 -
=================================
+ Introduce blkdeactivate script.
Implement devices/global_filter (affects lvmetad).
Make vgscan --cache an alias to pvscan --cache.
Clear lvmetad metadata/PV cache before a rescan.
11 years, 6 months
master - configure: autoreconf
by Peter Rajnoha
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a70d6b350f98bd...
Commit: a70d6b350f98bd6e9068ce723a275f31e9f27b7e
Parent: c698ee14bbb1310cf2383c8977d14a8e29139f8c
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Fri Oct 12 14:45:26 2012 +0200
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Fri Oct 12 14:45:26 2012 +0200
configure: autoreconf
---
configure | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
index add489a..b58c52d 100755
--- a/configure
+++ b/configure
@@ -651,6 +651,7 @@ INTL_PACKAGE
INTL
HAVE_REALTIME
HAVE_LIBDL
+BLKDEACTIVATE
FSADM
ELDFLAGS
DM_LIB_PATCHLEVEL
@@ -854,6 +855,7 @@ enable_python_bindings
enable_pkgconfig
enable_write_install
enable_fsadm
+enable_blkdeactivate
enable_dmeventd
enable_selinux
enable_nls
@@ -1558,6 +1560,7 @@ Optional Features:
--enable-pkgconfig install pkgconfig support
--enable-write_install install user writable files
--disable-fsadm disable fsadm
+ --disable-blkdeactivate disable blkdeactivate
--enable-dmeventd enable the device-mapper event daemon
--disable-selinux disable selinux support
--enable-nls enable Native Language Support
@@ -2883,6 +2886,7 @@ case "$host_os" in
SELINUX=yes
CLUSTER=internal
FSADM=yes
+ BLKDEACTIVATE=yes
;;
darwin*)
CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
@@ -2898,6 +2902,7 @@ case "$host_os" in
SELINUX=no
CLUSTER=none
FSADM=no
+ BLKDEACTIVATE=no
;;
esac
@@ -9340,6 +9345,17 @@ fi
$as_echo "$FSADM" >&6; }
################################################################################
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install blkdeactivate" >&5
+$as_echo_n "checking whether to install blkdeactivate... " >&6; }
+# Check whether --enable-blkdeactivate was given.
+if test "${enable_blkdeactivate+set}" = set; then :
+ enableval=$enable_blkdeactivate; BLKDEACTIVATE=$enableval
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BLKDEACTIVATE" >&5
+$as_echo "$BLKDEACTIVATE" >&6; }
+
+################################################################################
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use dmeventd" >&5
$as_echo_n "checking whether to use dmeventd... " >&6; }
# Check whether --enable-dmeventd was given.
@@ -10770,8 +10786,9 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'`
+
################################################################################
-ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/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/lvmetad/Makefile doc/Makefile doc/example.conf include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile lib/misc/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/lvm2_lvm
etad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/dm_event_systemd_red_hat.socket scripts/dm_event_systemd_red_hat.service scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_tmpfiles_red_hat.conf scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile"
+ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/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/lvmetad/Makefile doc/Makefile doc/example.conf include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile lib/misc/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/bl
k_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/dm_event_systemd_red_hat.socket scripts/dm_event_systemd_red_hat.service scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_tmpfiles_red_hat.conf scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -11499,6 +11516,9 @@ do
"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" ;;
"scripts/clvmd_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/clvmd_init_red_hat" ;;
"scripts/cmirrord_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/cmirrord_init_red_hat" ;;
"scripts/lvm2_lvmetad_init_red_hat") CONFIG_FILES="$CONFIG_FILES scripts/lvm2_lvmetad_init_red_hat" ;;
11 years, 6 months
master - scripts: introduce blkdeactivate
by Peter Rajnoha
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c698ee14bbb131...
Commit: c698ee14bbb1310cf2383c8977d14a8e29139f8c
Parent: f8781ea6a0567940f3dd3de78870be3ae880d909
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Fri Oct 12 14:37:57 2012 +0200
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Fri Oct 12 14:44:24 2012 +0200
scripts: introduce blkdeactivate
blkdeactivate - utility to deactivate block devices
Traverses the tree of block devices and tries to deactivate them.
Currently, it supports device-mapper-based devices together with LVM.
See man/blkdeactivate.8 for more info.
It is targeted for use during shutdown to properly deactivate the
whole block device stack - systemd and init scripts are provided as
well. However, it might be used directly on command line too.
Please, see the commentary at the top of the blkdeactivate script
for dependencies and versions of other utilities required.
---
configure.in | 13 +
man/Makefile.in | 10 +-
man/blkdeactivate.8.in | 72 +++++
scripts/Makefile.in | 10 +
scripts/blk_availability_init_red_hat.in | 58 ++++
.../blk_availability_systemd_red_hat.service.in | 14 +
scripts/blkdeactivate.sh.in | 313 ++++++++++++++++++++
7 files changed, 488 insertions(+), 2 deletions(-)
diff --git a/configure.in b/configure.in
index eb20908..75e0d84 100644
--- a/configure.in
+++ b/configure.in
@@ -44,6 +44,7 @@ case "$host_os" in
SELINUX=yes
CLUSTER=internal
FSADM=yes
+ BLKDEACTIVATE=yes
;;
darwin*)
CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
@@ -59,6 +60,7 @@ case "$host_os" in
SELINUX=no
CLUSTER=none
FSADM=no
+ BLKDEACTIVATE=no
;;
esac
@@ -1081,6 +1083,13 @@ AC_ARG_ENABLE(fsadm, AC_HELP_STRING([--disable-fsadm], [disable fsadm]),
AC_MSG_RESULT($FSADM)
################################################################################
+dnl -- Enable blkdeactivate
+AC_MSG_CHECKING(whether to install blkdeactivate)
+AC_ARG_ENABLE(blkdeactivate, AC_HELP_STRING([--disable-blkdeactivate], [disable blkdeactivate]),
+ BLKDEACTIVATE=$enableval)
+AC_MSG_RESULT($BLKDEACTIVATE)
+
+################################################################################
dnl -- enable dmeventd handling
AC_MSG_CHECKING(whether to use dmeventd)
AC_ARG_ENABLE(dmeventd, AC_HELP_STRING([--enable-dmeventd],
@@ -1531,6 +1540,7 @@ AC_SUBST(DM_LIB_VERSION)
AC_SUBST(DM_LIB_PATCHLEVEL)
AC_SUBST(ELDFLAGS)
AC_SUBST(FSADM)
+AC_SUBST(BLKDEACTIVATE)
AC_SUBST(HAVE_LIBDL)
AC_SUBST(HAVE_REALTIME)
AC_SUBST(INTL)
@@ -1645,6 +1655,9 @@ 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/clvmd_init_red_hat
scripts/cmirrord_init_red_hat
scripts/lvm2_lvmetad_init_red_hat
diff --git a/man/Makefile.in b/man/Makefile.in
index c132a3f..8be34c3 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -22,6 +22,12 @@ else
FSADMMAN =
endif
+ifeq ("@BLKDEACTIVATE@", "yes")
+BLKDEACTIVATEMAN = blkdeactivate.8
+else
+BLKDEACTIVATEMAN =
+endif
+
ifeq ("@DMEVENTD@", "yes")
DMEVENTDMAN = dmeventd.8
else
@@ -42,7 +48,7 @@ MAN8=lvchange.8 lvconvert.8 lvcreate.8 lvdisplay.8 lvextend.8 lvm.8 \
pvresize.8 pvs.8 pvscan.8 vgcfgbackup.8 vgcfgrestore.8 vgchange.8 \
vgck.8 vgcreate.8 vgconvert.8 vgdisplay.8 vgexport.8 vgextend.8 \
vgimport.8 vgimportclone.8 vgmerge.8 vgmknodes.8 vgreduce.8 vgremove.8 \
- vgrename.8 vgs.8 vgscan.8 vgsplit.8 $(FSADMMAN) $(LVMETAD)
+ vgrename.8 vgs.8 vgscan.8 vgsplit.8 $(FSADMMAN) $(BLKDEACTIVATEMAN) $(LVMETAD)
ifneq ("@CLVMD@", "none")
MAN8CLUSTER=clvmd.8
@@ -57,7 +63,7 @@ MAN8DM=dmsetup.8 $(DMEVENTDMAN)
MAN5DIR=$(mandir)/man5
MAN8DIR=$(mandir)/man8
-CLEAN_TARGETS=$(MAN5) $(MAN8) $(MAN8CLUSTER) $(FSADMMAN) $(DMEVENTDMAN) $(MAN8DM)
+CLEAN_TARGETS=$(MAN5) $(MAN8) $(MAN8CLUSTER) $(FSADMMAN) $(BLKDEACTIVATEMAN) $(DMEVENTDMAN) $(MAN8DM)
DISTCLEAN_TARGETS=fsadm.8 clvmd.8 cmirrord.8 dmeventd.8
include $(top_builddir)/make.tmpl
diff --git a/man/blkdeactivate.8.in b/man/blkdeactivate.8.in
new file mode 100644
index 0000000..6e566c8
--- /dev/null
+++ b/man/blkdeactivate.8.in
@@ -0,0 +1,72 @@
+.TH "BLKDEACTIVATE" "8" "LVM TOOLS #VERSION#" "Red Hat, Inc" "\""
+.SH "NAME"
+blkdeactivate \- utility to deactivate block devices
+.SH SYNOPSIS
+.B blkdeactivate
+.RI [ options ]
+.RI [ device... ]
+.sp
+.SH DESCRIPTION
+blkdeactivate utility deactivates block devices. If a device
+is mounted, the utility can unmount it automatically before
+trying to deactivate. The utility currently supports
+\fIdevice-mapper\fP devices, including \fILVM\fP volumes.
+LVM volumes are handled directly using the \fIlvm\fP command.
+Other device-mapper based devices are handled using the
+\fIdmsetup\fP command.
+.SH OPTIONS
+.IP "\fB\-h, \-\-help\fP"
+Display the help text.
+.IP "\fB\-u, \-\-umount\fP"
+Unmount a mounted device before trying to deactivate it.
+Without this option used, a device that is mounted is not deactivated.
+.IP "\fB\-d, \-\-dmoption\fP \fIdm_options\fP"
+Comma separated list of device-mapper specific options.
+.IP "\fB\-l, \-\-lvmoption\fP \fIlvm_options\fP"
+Comma separated list of LVM specific options.
+.SH DM_OPTIONS
+.IP "\fBretry\fP"
+Retry removal several times in case of failure.
+.IP "\fBforce\fP"
+Force device removal. See \fBdmsetup\fP(8) for more information.
+.SH LVM_OPTIONS
+.IP "\fBretry\fP"
+Retry removal several times in case of failure.
+.IP "\fBwholevg\fP"
+Deactivate the whole LVM Volume Group when processing a Logical Volume.
+Deactivating Volume Group as a whole takes less time than deactivating
+each Logical Volume separately.
+
+.SH EXAMPLES
+.sp
+Deactivate all supported block devices found in the system. If a device
+is mounted, skip its deactivation.
+.sp
+.B blkdeactivate
+
+Deactivate all supported block devices found in the system. If a device
+is mounted, unmount it first if possible.
+.sp
+.B blkdeactivate \-u
+
+Deactivate supplied device together with all its holders. If any of the
+devices processed is mounted, unmount it first if possible.
+.sp
+.B blkdeactivate \-u /dev/vg/lvol0
+
+Deactivate all supported block devices found in the system. Retry deactivation
+of device-mapper devices in case the deactivation fails. Deactivate the whole
+Volume Group at once when processing an LVM Logical Volume.
+.sp
+.B blkdeactivate \-u -d retry -l wholevg
+
+Deactivate all supported block devices found in the system. Retry deactivation
+of device-mapper devices in case the deactivation fails and force removal.
+.sp
+.B blkdeactivate -d force,retry
+
+.SH SEE ALSO
+.BR lsblk (8)
+.BR umount (8)
+.BR dmsetup (8)
+.BR lvm (8)
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index df13c3d..91e2e94 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -38,6 +38,10 @@ ifeq ("@FSADM@", "yes")
SCRIPTS += fsadm.sh
endif
+ifeq ("@BLKDEACTIVATE@", "yes")
+ SCRIPTS += blkdeactivate.sh
+endif
+
OCF_SCRIPTS =
ifeq ("@OCF@", "yes")
OCF_SCRIPTS += VolumeGroup.ocf
@@ -74,6 +78,9 @@ endif
ifeq ("@BUILD_CMIRRORD@", "yes")
$(INSTALL_SCRIPT) cmirrord_init_red_hat $(initdir)/cmirrord
endif
+ifeq ("@BLKDEACTIVATE@", "yes")
+ $(INSTALL_SCRIPT) blk_availability_init_red_hat $(initdir)/blk-availability
+endif
lvm2_activation_generator_systemd_red_hat: $(OBJECTS) $(DEPLIBS)
$(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(LVMLIBS)
@@ -94,6 +101,9 @@ ifeq ("@BUILD_DMEVENTD@", "yes")
$(INSTALL_DATA) dm_event_systemd_red_hat.service $(systemd_unit_dir)/dm-event.service
$(INSTALL_DATA) lvm2_monitoring_systemd_red_hat.service $(systemd_unit_dir)/lvm2-monitor.service
endif
+ifeq ("@BLKDEACTIVATE@", "yes")
+ $(INSTALL_DATA) blk_availability_systemd_red_hat.service $(systemd_unit_dir)/blk-availability.service
+endif
ifeq ("@BUILD_LVMETAD@", "yes")
$(INSTALL_DATA) lvm2_lvmetad_systemd_red_hat.socket $(systemd_unit_dir)/lvm2-lvmetad.socket
$(INSTALL_DATA) lvm2_lvmetad_systemd_red_hat.service $(systemd_unit_dir)/lvm2-lvmetad.service
diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in
new file mode 100644
index 0000000..b6c4a67
--- /dev/null
+++ b/scripts/blk_availability_init_red_hat.in
@@ -0,0 +1,58 @@
+#!/bin/bash
+#
+# Copyright (C) 2012 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# This file is part of LVM2.
+# It is required for the proper handling of failures of LVM2 mirror
+# devices that were created using the -m option of lvcreate.
+#
+#
+# chkconfig: 12345 10 80
+# description: Controls availability of block devices
+#
+# For Red-Hat-based distributions such as Fedora, RHEL, CentOS.
+#
+### BEGIN INIT INFO
+# Provides: blk-availability
+# Required-Start:
+# Required-Stop:
+# Default-Start: 1 2 3 4 5
+# Default-Stop: 0 6
+# Short-Description: Availability of block devices
+### END INIT INFO
+
+. /etc/init.d/functions
+
+sbindir=@sbindir@
+script=blkdeactivate
+options="-u -l wholevg"
+
+LOCK_FILE="/var/lock/subsys/$script"
+
+
+rtrn=1
+
+case "$1" in
+ start)
+ touch $LOCK_FILE
+ ;;
+
+ stop)
+ action "Stopping blk-availability" $sbindir/$script $options
+ rm -f $LOCK_FILE
+ ;;
+
+ status)
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status}"
+ ;;
+esac
diff --git a/scripts/blk_availability_systemd_red_hat.service.in b/scripts/blk_availability_systemd_red_hat.service.in
new file mode 100644
index 0000000..fef919b
--- /dev/null
+++ b/scripts/blk_availability_systemd_red_hat.service.in
@@ -0,0 +1,14 @@
+[Unit]
+Description=Availability of block devices
+After=lvm2-activation.service lvm2-lvmetad.service iscsi.service iscsid.service
+DefaultDependencies=no
+Conflicts=shutdown.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/true
+ExecStop=@sbindir@/blkdeactivate -u -l wholevg
+RemainAfterExit=yes
+
+[Install]
+WantedBy=sysinit.target
diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in
new file mode 100644
index 0000000..031f5f6
--- /dev/null
+++ b/scripts/blkdeactivate.sh.in
@@ -0,0 +1,313 @@
+#!/bin/bash
+#
+# Copyright (C) 2012 Red Hat, Inc. All rights reserved.
+#
+# This file is part of LVM2.
+#
+# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# Author: Peter Rajnoha <prajnoha at redhat.com>
+#
+# Script for deactivating block devices
+#
+# Requires:
+# bash >= 4.0 (associative array support)
+# lsblk >= 2.22 (lsblk -s support)
+# umount
+# dmsetup >= 1.02.68 (--retry option support)
+# lvm >= 2.2.89 (activation/retry_deactivation config support)
+#
+
+#set -x
+shopt -s dotglob nullglob
+
+TOOL=blkdeactivate
+
+DEV_DIR='/dev'
+SYS_BLK_DIR='/sys/block'
+
+UMOUNT="/bin/umount"
+DMSETUP="@sbindir@/dmsetup"
+LVM="@sbindir@/lvm"
+
+LSBLK="/bin/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT"
+LSBLK_VARS="local devtype local kname local name local mnt"
+LSBLK_READ="read -r devtype kname name mnt"
+
+# Do not unmount mounted devices by default.
+DO_UMOUNT=0
+
+# Deactivate each LV separately by default (not the whole VG).
+LVM_DO_WHOLE_VG=0
+# Do not retry LV deactivation by default.
+LVM_CONFIG="activation{retry_deactivation=0}"
+
+#
+# List of device names and/or VGs to be skipped.
+# Device name is the KNAME from lsblk output.
+#
+# If deactivation of any device fails, it's automatically
+# added to the SKIP_DEVICE_LIST (also a particular VG
+# added to the SKIP_VG_LIST for a device that is an LV).
+#
+# These lists provide device tree pruning to skip
+# particular device/VG deactivation that failed already.
+# (lists are associative arrays!)
+#
+declare -A SKIP_DEVICE_LIST=()
+declare -A SKIP_VG_LIST=()
+
+#
+# List of mountpoints to be skipped. Any device that is mounted on the mountpoint
+# listed here will be added to SKIP_DEVICE_LIST (and SKIP_VG_LIST) automatically.
+# (list is an associative array!)
+#
+declare -A SKIP_UMOUNT_LIST=(["/"]=1 ["/boot"]=1 \
+ ["/lib"]=1 ["/lib64"]=1 \
+ ["/bin"]=1 ["/sbin"]=1 \
+ ["/usr"]=1 \
+ ["/usr/lib"]=1 ["/usr/lib64"]=1 \
+ ["/usr/sbin"]=1 ["/usr/bin"]=1)
+# Bash can't properly handle '[' and ']' used as a subscript
+# within the '()'initialization - it needs to be done separately!
+SKIP_UMOUNT_LIST["[SWAP]"]=1
+
+usage() {
+ echo "${TOOL}: Utility to deactivate block devices"
+ echo
+ echo " ${TOOL} [options] [device...]"
+ echo " - Deactivate block device tree."
+ echo " If devices are specified, deactivate only supplied devices and their holders."
+ echo
+ echo " Options:"
+ echo " -h | --help Show this help message"
+ echo " -d | --dmoption DM_OPTIONS Comma separated DM specific options"
+ echo " -l | --lvmoption LVM_OPTIONS Comma separated LVM specific options"
+ echo " -u | --umount Unmount the device if mounted"
+ echo
+ echo " Device specific options:"
+ echo " DM_OPTIONS:"
+ echo " retry retry removal several times in case of failure"
+ echo " force force device removal"
+ echo " LVM_OPTIONS:"
+ echo " retry retry removal several times in case of failure"
+ echo " wholevg deactivate the whole VG when processing an LV"
+
+ exit
+}
+
+add_device_to_skip_list() {
+ SKIP_DEVICE_LIST+=(["$kname"]=1)
+ return 1
+}
+
+add_vg_to_skip_list() {
+ SKIP_VG_LIST+=(["$DM_VG_NAME"]=1)
+ return 1
+}
+
+is_top_level_device() {
+ # top level devices do not have any holders, that is
+ # the SYS_BLK_DIR/<device_name>/holders dir is empty
+ files="`echo $SYS_BLK_DIR/$kname/holders/*`"
+ test -z "$files"
+}
+
+device_umount () {
+ test -z "$mnt" && return 0;
+
+ if test -z "${SKIP_UMOUNT_LIST["$mnt"]}" -a "$DO_UMOUNT" -eq "1"; then
+ echo " UMOUNT: unmounting $name ($kname) mounted on $mnt"
+ $UMOUNT "$mnt" || add_device_to_skip_list
+ else
+ echo " [SKIP]: unmount of $name ($kname) mounted on $mnt"
+ add_device_to_skip_list
+ fi
+}
+
+deactivate_holders () {
+ local skip=1; $LSBLK_VARS
+
+ # Get holders for the device - either a mount or another device.
+ # First line on the lsblk output is the device itself - skip it for
+ # the deactivate call as this device is already being deactivated.
+ while $LSBLK_READ; do
+ test -e $SYS_BLK_DIR/$kname || continue
+ # check if the device not on the skip list already
+ test -z ${SKIP_DEVICE_LIST["$kname"]} || return 1
+
+ # try to unmount it if mounted
+ device_umount || return 1
+
+ # try to deactivate the holder
+ test $skip -eq 1 && skip=0 && continue
+ deactivate || return 1
+ done <<< "`$LSBLK $1`"
+}
+
+deactivate_dm () {
+ local name=$(printf $name)
+ test -b "$DEV_DIR/mapper/$name" || return 0
+ test -z ${SKIP_DEVICE_LIST["$kname"]} || return 1
+
+ deactivate_holders "$DEV_DIR/mapper/$name" || return 1
+
+ echo " DM: deactivating $devtype device $name ($kname)"
+ $DMSETUP $DMSETUP_OPTS remove "$name" || add_device_to_skip_list
+}
+
+deactivate_lvm () {
+ local DM_VG_NAME; local DM_LV_NAME; local DM_LV_LAYER
+
+ eval $($DMSETUP splitname --nameprefixes --noheadings --rows "$name" LVM)
+ test -b "$DEV_DIR/$DM_VG_NAME/$DM_LV_NAME" || return 0
+ test -z ${SKIP_VG_LIST["$DM_VG_NAME"]} || return 1
+
+ # Deactivating only the LV specified
+ test $LVM_DO_WHOLE_VG -eq 0 && {
+ deactivate_holders "$DEV_DIR/$DM_VG_NAME/$DM_LV_NAME" || {
+ add_device_to_skip_list
+ return 1
+ }
+
+ echo " LVM: deactivating Logical Volume $DM_VG_NAME/$DM_LV_NAME"
+ $LVM lvchange --config "log{prefix=\"\"} $LVM_CONFIG" -aln $DM_VG_NAME/$DM_LV_NAME || {
+ add_device_to_skip_list
+ return 1
+ }
+ return 0
+ }
+
+ # Deactivating the whole VG the LV is part of
+ lv_list=$($LVM vgs --config "$LVM_CONFIG" --noheadings --rows -o lv_name $DM_VG_NAME)
+ for lv in $lv_list; do
+ test -b "$DEV_DIR/$DM_VG_NAME/$lv" || continue
+ deactivate_holders "$DEV_DIR/$DM_VG_NAME/$lv" || {
+ add_vg_to_skip_list
+ return 1
+ }
+ done
+
+ echo " LVM: deactivating Volume Group $DM_VG_NAME"
+ $LVM vgchange --config "log{prefix=\" \"} $LVM_CONFIG" -aln $DM_VG_NAME || add_vg_to_skip_list
+}
+
+deactivate () {
+ ######################################################################
+ # DEACTIVATION HOOKS FOR NEW DEVICE TYPES GO HERE! #
+ # #
+ # Identify a new device type either by inspecting the TYPE provided #
+ # by lsblk directly ($devtype) or by any other mean that is suitable #
+ # e.g. the KNAME provided by lsblk ($kname). See $LSBLK_VARS for #
+ # complete list of variables that may be used. Then call a #
+ # device-specific deactivation function that handles the exact type. #
+ # #
+ # This device-specific function will certainly need to call #
+ # deactivate_holders first to recursively deactivate any existing #
+ # holders it might have before deactivating the device it processes. #
+ ######################################################################
+ if test "$devtype" = "lvm"; then
+ deactivate_lvm
+ elif test "${kname:0:3}" = "dm-"; then
+ deactivate_dm
+ fi
+}
+
+deactivate_all() {
+ $LSBLK_VARS
+ skip=0
+
+ echo "Deactivating block devices:"
+
+ if test $# -eq 0; then
+ # Deactivate all devices
+ while $LSBLK_READ; do
+ # 'disk' is at the bottom already and it's a real device
+ test "$devtype" = "disk" && continue
+
+ # if deactivation of any device fails, skip processing
+ # any subsequent devices within its subtree as the
+ # top-level device could not be deactivated anyway
+ test $skip -eq 1 && {
+ # reset 'skip' on top level device
+ is_top_level_device && skip=0 || continue
+ }
+
+ # check if the device is not on the skip list already
+ test -z ${SKIP_DEVICE_LIST["$kname"]} || continue
+
+ # try to deactivate top-level device, set 'skip=1'
+ # if it fails to do so - this will cause all the
+ # device's subtree to be skipped when processing
+ # devices further in this loop
+ deactivate || skip=1
+ done <<< "`$LSBLK -s`"
+ else
+ # Deactivate only specified devices
+ while test $# -ne 0; do
+ # Single dm device tree deactivation.
+ if test -b "$1"; then
+ $LSBLK_READ <<< "`$LSBLK --nodeps $1`"
+
+ # check if the device is not on the skip list already
+ test -z ${SKIP_DEVICE_LIST["$kname"]} || continue
+
+ deactivate
+ else
+ echo "$1: device not found"
+ return 1
+ fi
+ shift
+ done;
+ fi
+}
+
+get_dmopts() {
+ ORIG_IFS=$IFS; IFS=','
+
+ for opt in $1; do
+ case $opt in
+ "") ;;
+ "retry") DMSETUP_OPTS+="--retry " ;;
+ "force") DMSETUP_OPTS+="--force " ;;
+ *) echo "$opt: unknown DM option"
+ esac
+ done
+
+ IFS=$ORIG_IFS
+}
+
+get_lvmopts() {
+ ORIG_IFS=$IFS; IFS=','
+
+ for opt in $1; do
+ case "$opt" in
+ "") ;;
+ "retry") LVM_CONFIG="activation{retry_deactivation=1}" ;;
+ "wholevg") LVM_DO_WHOLE_VG=1 ;;
+ *) echo "$opt: unknown LVM option"
+ esac
+ done
+
+ IFS=$ORIG_IFS
+}
+
+while test $# -ne 0; do
+ case "$1" in
+ "") ;;
+ "-h"|"--help") usage ;;
+ "-d"|"--dmopts") get_dmopts "$2" ; shift ;;
+ "-l"|"--lvmopts") get_lvmopts "$2" ; shift ;;
+ "-u"|"--umount") DO_UMOUNT=1 ;;
+ *) break ;;
+ esac
+ shift
+done
+
+deactivate_all "$@"
11 years, 6 months
master - systemd: add deps to order units more properly
by Peter Rajnoha
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f8781ea6a05679...
Commit: f8781ea6a0567940f3dd3de78870be3ae880d909
Parent: 141f26035d67d3d8b6bab98960a219322fc30f32
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Fri Oct 12 14:21:25 2012 +0200
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Fri Oct 12 14:24:54 2012 +0200
systemd: add deps to order units more properly
lvm2-activation-early.service (generated by activation generator) should
be ordered before cryptsetup.target.
lvm2-monitor.service should be ordered after lvm2-activation.service,
if used. The lvm2-activation.service will replace fedora-storage-init.service
and fedora-storage-init-late.service in the end, but let's have it
prepared now.
---
.../lvm2_activation_generator_systemd_red_hat.c | 5 +++--
scripts/lvm2_monitoring_systemd_red_hat.service.in | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/scripts/lvm2_activation_generator_systemd_red_hat.c b/scripts/lvm2_activation_generator_systemd_red_hat.c
index 786d795..b8d1cfc 100644
--- a/scripts/lvm2_activation_generator_systemd_red_hat.c
+++ b/scripts/lvm2_activation_generator_systemd_red_hat.c
@@ -115,9 +115,10 @@ static int generate_unit(const char *dir, int early)
"SourcePath=/etc/lvm/lvm.conf\n"
"DefaultDependencies=no\n", f);
- if (early)
+ if (early) {
fputs("After=systemd-udev-settle.service\n", f);
- else
+ fputs("Before=cryptsetup.target\n", f);
+ } else
fputs("After=lvm2-activation-early.service cryptsetup.target\n", f);
fputs("Before=local-fs.target shutdown.target\n"
diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in
index 425cb0d..6c4c55f 100644
--- a/scripts/lvm2_monitoring_systemd_red_hat.service.in
+++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in
@@ -2,7 +2,7 @@
Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling
Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8)
Requires=dm-event.socket
-After=dm-event.socket fedora-storage-init.service fedora-storage-init-late.service lvm2-lvmetad.service
+After=dm-event.socket fedora-storage-init.service fedora-storage-init-late.service lvm2-activation.service lvm2-lvmetad.service
Before=local-fs.target
DefaultDependencies=no
Conflicts=shutdown.target
11 years, 6 months
master - Update WHATS_NEW.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=141f26035d67d3...
Commit: 141f26035d67d3d8b6bab98960a219322fc30f32
Parent: 3058f662cf08bee36e7ff465e6f222cd8ced0ad2
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Fri Oct 12 13:24:06 2012 +0200
Committer: Petr Rockai <prockai(a)redhat.com>
CommitterDate: Fri Oct 12 13:24:06 2012 +0200
Update WHATS_NEW.
---
WHATS_NEW | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 211d1bb..8ae3a22 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,22 @@
Version 2.02.98 -
=================================
+ Implement devices/global_filter (affects lvmetad).
+ Make vgscan --cache an alias to pvscan --cache.
+ Clear lvmetad metadata/PV cache before a rescan.
+ Fix a segmentation fault upon receiving a corrupt lvmetad response.
+ Give inconsistent metadata warnings in pvscan --cache.
+ Make lvremove ask before discarding data areas.
+ Avoid overlapping locks that could cause a deadlock in lvmetad.
+ Fix memory leaks in libdaemon and lvmetad.
+ Optimize libdaemon logging for a fast no-output path.
+ example.conf: Warn about running lvmetad with use_lvmetad = 0.
+ Only create lvmetad pidfile when running as a daemon (no -f).
+ Warn if lvmetad is running but disabled.
+ Update lvmetad help output (flags and their meaning).
+ Make pvscan --cache read metadata from LVM1 PVs.
+ Make libdaemon buffer handling asymptotically more efficient.
+ Add lvmdump -l, to collect a state dump from lvmetad.
+ Make --sysinit suppress lvmetad connection failure warnings.
Prohibit usage of lvcreate --thinpool with --mirrors.
Fix lvm2api origin reporting for thin snapshot volume.
Add configure --enable-python_bindings for liblvm2app to new python subdir.
@@ -23,7 +40,6 @@ Version 2.02.98 -
Fix inability to create, extend or convert to a large (> 1TiB) RAID LV.
Add (p)artial attribute to lvs.
Don't try to issue discards to a missing PV to avoid segfault.
- Prevent lvremove from removing LVs that have any part missing.
Clear LV_NOSYNCED flag when a RAID1 LV is converted to a linear LV.
Disallow RAID1 upconvert if the LV was created with --nosync.
Depend on systemd-udev-settle in units generated by activation generator.
11 years, 6 months
master - thin: prohibit lvcreate --thinpool with mirrors
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3058f662cf08be...
Commit: 3058f662cf08bee36e7ff465e6f222cd8ced0ad2
Parent: be291e106458a0ae1024bd517a37d471c032c505
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Oct 12 12:18:06 2012 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Oct 12 12:21:45 2012 +0200
thin: prohibit lvcreate --thinpool with mirrors
Disable --thinpool to be used with mirror on lvcreate.
---
WHATS_NEW | 1 +
test/shell/lvcreate-thin.sh | 8 ++++++--
tools/lvcreate.c | 5 +++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 047e2ed..211d1bb 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.98 -
=================================
+ Prohibit usage of lvcreate --thinpool with --mirrors.
Fix lvm2api origin reporting for thin snapshot volume.
Add configure --enable-python_bindings for liblvm2app to new python subdir.
Add implementation of lvm2api function lvm_percent_to_float.
diff --git a/test/shell/lvcreate-thin.sh b/test/shell/lvcreate-thin.sh
index 6f60976..8ac5468 100644
--- a/test/shell/lvcreate-thin.sh
+++ b/test/shell/lvcreate-thin.sh
@@ -174,14 +174,18 @@ not lvcreate -L4M --chunksize 2G -T $vg/pool1
lvcreate -L4M -V2G --name lv1 -T $vg/pool1
# Origin name is not accepted
not lvcreate -s $vg/lv1 -L4M -V2G --name $vg/lv4
-vgremove -ff $vg
+# Check we cannot create mirror and thin or thinpool together
+not lvcreate -T mirpool -L4M --alloc anywhere -m1 $vg
+not lvcreate --thinpool mirpool -L4M --alloc anywhere -m1 $vg
+
+vgremove -ff $vg
# Test --poolmetadatasize range
# allocating large devices for testing
aux teardown_devs
aux prepare_pvs 10 16500
-vgcreate $clustered $vg -s 64K $(cat DEVICES)
+vgcreate $vg -s 64K $(cat DEVICES)
lvcreate -L4M --chunksize 128 --poolmetadatasize 0 -T $vg/pool1 2>out
grep "WARNING: Minimum" out
diff --git a/tools/lvcreate.c b/tools/lvcreate.c
index 7d01685..53c4940 100644
--- a/tools/lvcreate.c
+++ b/tools/lvcreate.c
@@ -694,8 +694,9 @@ static int _lvcreate_params(struct lvcreate_params *lp,
* Check selected options are compatible and determine segtype
*/
// FIXME -m0 implies *striped*
- if (arg_count(cmd, thin_ARG) && arg_count(cmd,mirrors_ARG)) {
- log_error("--thin and --mirrors are incompatible.");
+ if ((arg_count(cmd, thin_ARG) || arg_count(cmd, thinpool_ARG)) &&
+ arg_count(cmd,mirrors_ARG)) {
+ log_error("--thin,--thinpool and --mirrors are incompatible.");
return 0;
}
11 years, 6 months
master - thin: lvm2api return origin property for thin LV
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=be291e106458a0...
Commit: be291e106458a0ae1024bd517a37d471c032c505
Parent: abb07a1b5ee2bbe4def9218c6fdf05b0a5718e12
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Oct 12 12:02:15 2012 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Oct 12 12:20:55 2012 +0200
thin: lvm2api return origin property for thin LV
---
WHATS_NEW | 1 +
lib/metadata/lv.c | 4 ++++
test/api/thin_percent.c | 4 ++++
3 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index e419a46..047e2ed 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.98 -
=================================
+ Fix lvm2api origin reporting for thin snapshot volume.
Add configure --enable-python_bindings for liblvm2app to new python subdir.
Add implementation of lvm2api function lvm_percent_to_float.
Allow non power of 2 thin chunk sizes if thin pool driver supports that.
diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c
index 33e3270..4032f34 100644
--- a/lib/metadata/lv.c
+++ b/lib/metadata/lv.c
@@ -160,6 +160,10 @@ char *lv_origin_dup(struct dm_pool *mem, const struct logical_volume *lv)
{
if (lv_is_cow(lv))
return lv_name_dup(mem, origin_from_cow(lv));
+
+ if (lv_is_thin_volume(lv) && first_seg(lv)->origin)
+ return lv_name_dup(mem, first_seg(lv)->origin);
+
return NULL;
}
diff --git a/test/api/thin_percent.c b/test/api/thin_percent.c
index 5338164..2c8b19b 100644
--- a/test/api/thin_percent.c
+++ b/test/api/thin_percent.c
@@ -57,6 +57,10 @@ int main(int argc, char *argv[])
assert(v.is_valid);
assert(v.value.integer == PERCENT_INVALID);
+ v = lvm_lv_get_property(lv, "origin");
+ assert(v.is_valid);
+ assert(strcmp(v.value.string, "thin") == 0);
+
lvm_vg_close(vg);
lvm_quit(handle);
11 years, 6 months
master - libdm: remove dm dev without error even with malformed UUID
by Peter Rajnoha
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=abb07a1b5ee2bb...
Commit: abb07a1b5ee2bbe4def9218c6fdf05b0a5718e12
Parent: 5a958655ddd63a7e9feeda444788313f9380aef1
Author: Peter Rajnoha <prajnoha(a)redhat.com>
AuthorDate: Fri Oct 12 11:53:04 2012 +0200
Committer: Peter Rajnoha <prajnoha(a)redhat.com>
CommitterDate: Fri Oct 12 11:53:04 2012 +0200
libdm: remove dm dev without error even with malformed UUID
On each ioctl return, the device UUID is decoded from \xNN format.
If the UUID of the device being *removed* is malformed (e.g. it
hasn't been corrected before), just remove it without any error
as the UUID is not needed anymore - the device is gone anyway.
Otherwise a misleading error message would be issued just after
the removal:
# dmsetup remove test
The UUID "a b" should be mangled but it contains blacklisted characters.
Command failed
---
libdm/ioctl/libdm-iface.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c
index 3b6731d..9e78e1c 100644
--- a/libdm/ioctl/libdm-iface.c
+++ b/libdm/ioctl/libdm-iface.c
@@ -1762,7 +1762,8 @@ static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command,
if (!_dm_ioctl_unmangle_names(dmt->type, dmi))
goto error;
- if (!_dm_ioctl_unmangle_uuids(dmt->type, dmi))
+ if (dmt->type != DM_DEVICE_REMOVE &&
+ !_dm_ioctl_unmangle_uuids(dmt->type, dmi))
goto error;
#else /* Userspace alternative for testing */
11 years, 6 months
master - lvmetad: fix test for dm_asprintf
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5a958655ddd63a...
Commit: 5a958655ddd63a7e9feeda444788313f9380aef1
Parent: d6d207006a8f337e9d6919ffddedfa08dac128c6
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Oct 12 11:34:15 2012 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Oct 12 11:36:01 2012 +0200
lvmetad: fix test for dm_asprintf
---
libdaemon/client/config-util.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libdaemon/client/config-util.c b/libdaemon/client/config-util.c
index 8a6dced..9b893c6 100644
--- a/libdaemon/client/config-util.c
+++ b/libdaemon/client/config-util.c
@@ -38,18 +38,18 @@ int buffer_append_vf(struct buffer *buf, va_list ap)
keylen = strchr(next, '=') - next;
if (strstr(next, "%d") || strstr(next, "%" PRId64)) {
value = va_arg(ap, int64_t);
- if (!dm_asprintf(&append, "%.*s= %" PRId64 "\n", keylen, next, value) < 0)
+ if (dm_asprintf(&append, "%.*s= %" PRId64 "\n", keylen, next, value) < 0)
goto fail;
} else if (strstr(next, "%s")) {
string = va_arg(ap, char *);
- if (!dm_asprintf(&append, "%.*s= \"%s\"\n", keylen, next, string) < 0)
+ if (dm_asprintf(&append, "%.*s= \"%s\"\n", keylen, next, string) < 0)
goto fail;
} else if (strstr(next, "%b")) {
if (!(block = va_arg(ap, char *)))
continue;
- if (!dm_asprintf(&append, "%.*s%s", keylen, next, block) < 0)
+ if (dm_asprintf(&append, "%.*s%s", keylen, next, block) < 0)
goto fail;
- } else if (!dm_asprintf(&append, "%s", next) < 0)
+ } else if (dm_asprintf(&append, "%s", next) < 0)
goto fail;
if (!append ||
11 years, 6 months