From: Rafał Miłecki <rafal@milecki.pl>
Date: Wed, 3 Jan 2018 10:31:22 +0000 (+0100)
Subject: mount: remove directory if mounting fails
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmountd.git;a=commitdiff_plain;h=e31565a287c6b44763d5b11bdc88c2d79c5e508e;ds=sidebyside

mount: remove directory if mounting fails

Aside from just cleaning up mountd's tmp dir it's also important for
autofs support. With such an empty directory autofs_process_request
believed device is mounted and it kept replying AUTOFS_IOC_READY to the
kernel. It was causing a log storm like:
mountd[1015]: Got a autofs packet
mountd[1015]: kernel is requesting a mount -> sda1
mountd[1015]: Got a autofs packet
mountd[1015]: kernel is requesting a mount -> sda1
mountd[1015]: Got a autofs packet
mountd[1015]: kernel is requesting a mount -> sda1

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/mount.c b/mount.c
index 803acc1..a88ca6d 100644
--- a/mount.c
+++ b/mount.c
@@ -292,8 +292,10 @@ int mount_new(char *path, char *dev)
 	pid = waitpid(pid, &ret, 0);
 	ret = WEXITSTATUS(ret);
 	log_printf("----------> mount ret = %d\n", ret);
-	if(ret && (ret != 0xff))
+	if (ret && ret != 0xff) {
+		rmdir(tmp);
 		return -1;
+	}
 	if(mount_wait_for_disc(mount->dev) == 0)
 	{
 		mount->mounted = 1;