From e31565a287c6b44763d5b11bdc88c2d79c5e508e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 3 Jan 2018 11:31:22 +0100 Subject: [PATCH] mount: remove directory if mounting fails MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- mount.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; -- 2.25.1