diff options
| author | Peter Rajnoha <prajnoha@redhat.com> | 2016-11-01 16:41:30 +0100 |
|---|---|---|
| committer | Peter Rajnoha <prajnoha@redhat.com> | 2016-11-01 16:52:51 +0100 |
| commit | 4585785613320f2400b5645a47375308f1ee5289 (patch) | |
| tree | a73614da219756b5f88d1f81f21077a86344532e | |
| parent | a9651adc84210d88828f9c3c82a0f382a899a650 (diff) | |
| download | lvm2-4585785613320f2400b5645a47375308f1ee5289.tar.gz | |
blkdeactivate: deactivate dev stack if dev on top already unmounted
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
| -rw-r--r-- | WHATS_NEW | 1 | ||||
| -rw-r--r-- | scripts/blkdeactivate.sh.in | 5 |
2 files changed, 5 insertions, 1 deletions
@@ -1,5 +1,6 @@ Version 2.02.167 - ====================================== + Fix blkdeactivate to deactivate dev stack if dev on top already unmounted. Prevent non-synced raid1 repair unless --force Prevent raid4 creation/conversion on non-supporting kernels Add direct striped -> raid4 conversion diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in index 50ea2d10f..443af9cb2 100644 --- a/scripts/blkdeactivate.sh.in +++ b/scripts/blkdeactivate.sh.in @@ -34,6 +34,7 @@ TOOL=blkdeactivate DEV_DIR='/dev' SYS_BLK_DIR='/sys/block' +MOUNTPOINT="/bin/mountpoint" UMOUNT="/bin/umount" DMSETUP="@sbindir@/dmsetup" LVM="@sbindir@/lvm" @@ -157,9 +158,11 @@ device_umount_one() { echo -n " [UMOUNT]: unmounting $name ($kname) mounted on $mnt... " if eval $UMOUNT $UMOUNT_OPTS "$(printf "%s" "$mnt")" $OUT $ERR; then echo "done" - else + elif $MOUNTPOINT -q "$mnt"; then echo "skipping" add_device_to_skip_list + else + echo "already unmounted" fi else echo " [SKIP]: unmount of $name ($kname) mounted on $mnt" |