From 28753b3f027084fa2ca184bc8f8c54db36cc2421 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Mon, 10 Dec 2018 07:48:50 +0100 Subject: [PATCH] block: remove target directory after unmounting MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This removes dangling directory fixing two issues: 1) Non autofs case Leaving directory in /mnt/ and switching to autofs would result in blockd failing to symlink(). 2) autofs case Leaving directory in /var/run/blockd/ could result in apps trying to access it causing errors like: blockd: kernel is requesting a mount -> sda1 blockd: failed to run block. add/sda1 Signed-off-by: Rafał Miłecki --- block.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 091375f..f7fdc27 100644 --- a/block.c +++ b/block.c @@ -1130,11 +1130,13 @@ static int umount_device(char *path) hotplug_call_mount("remove", basename(path)); err = umount2(mp, MNT_DETACH); - if (err) + if (err) { ULOG_ERR("unmounting %s (%s) failed (%d) - %m\n", path, mp, errno); - else + } else { ULOG_INFO("unmounted %s (%s)\n", path, mp); + rmdir(mp); + } free(mp); return err; -- 2.25.1