shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

blkdeactivate: deactivate dev stack if dev on top already unmounted

Browse Source 
If blkdeactivate finds out that the device on top of device stack
is already unmounted, it still proceeds with device stack deactivation
underneath now.

This situation can happen if blkdeactivate is started and the mount
point is unmounted in parallel by chance (so when blkdeactivate
gets the the actual umount call, the device is not mounted anymore).
Before, the blkdeactivate added such device to skip list which caused
all the stack underneath to be skipped too on deactivation. Now, we
proceed just as if blkdeactivate did the umount itself.

For example, in the example below, the vg-lvol0 is mounted on /mnt/test
when blkdeactivate is called, but it gets unmounted in parallel later
on when blkdeactivate gets to the actual umount call.

Before this patch (vg-lvol0 underneath not deactivated):

  $ blkdeactivate -u
  Deactivating block devices:
    [UMOUNT]: unmounting vg-lvol0 (dm-2) mounted on /mnt/test... skipping

With this patch applied (vg-lvol0 underneath still deactivated):

  $ blkdeactivate -u
  Deactivating block devices:
    [UMOUNT]: unmounting vg-lvol0 (dm-2) mounted on /mnt/test... already unmounted
    [LVM]: deactivating Logical Volume vg/lvol0... done
This commit is contained in:
Peter Rajnoha 2016-11-01 16:41:30 +01:00
parent a9651adc84
commit 4585785613
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.167 - Version 2.02.167 -
====================================== ======================================
Fix blkdeactivate to deactivate dev stack if dev on top already unmounted.
Prevent non-synced raid1 repair unless --force Prevent non-synced raid1 repair unless --force
Prevent raid4 creation/conversion on non-supporting kernels Prevent raid4 creation/conversion on non-supporting kernels
Add direct striped -> raid4 conversion Add direct striped -> raid4 conversion

5
scripts/blkdeactivate.sh.in
View File

@ -34,6 +34,7 @@ TOOL=blkdeactivate
DEV_DIR='/dev' DEV_DIR='/dev'
SYS_BLK_DIR='/sys/block' SYS_BLK_DIR='/sys/block'
MOUNTPOINT="/bin/mountpoint"
UMOUNT="/bin/umount" UMOUNT="/bin/umount"
DMSETUP="@sbindir@/dmsetup" DMSETUP="@sbindir@/dmsetup"
LVM="@sbindir@/lvm" LVM="@sbindir@/lvm"
@ -157,9 +158,11 @@ device_umount_one() {
echo -n " [UMOUNT]: unmounting $name ($kname) mounted on $mnt... " echo -n " [UMOUNT]: unmounting $name ($kname) mounted on $mnt... "
if eval $UMOUNT $UMOUNT_OPTS "$(printf "%s" "$mnt")" $OUT $ERR; then if eval $UMOUNT $UMOUNT_OPTS "$(printf "%s" "$mnt")" $OUT $ERR; then
echo "done" echo "done"
else elif $MOUNTPOINT -q "$mnt"; then
echo "skipping" echo "skipping"
add_device_to_skip_list add_device_to_skip_list
else
echo "already unmounted"
fi fi
else else
echo " [SKIP]: unmount of $name ($kname) mounted on $mnt" echo " [SKIP]: unmount of $name ($kname) mounted on $mnt"