From: Rafał Miłecki <rafal@milecki.pl>
Date: Mon, 10 Dec 2018 06:48:50 +0000 (+0100)
Subject: block: remove target directory after unmounting
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=28753b3f027084fa2ca184bc8f8c54db36cc2421;p=project%2Ffstools.git

block: remove target directory after unmounting

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 <rafal@milecki.pl>
---

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;