1 files changed, 11 insertions, 7 deletions
diff --git a/lib/mount.c b/lib/mount.c
index 4f74841..cb5d190 100644
--- a/lib/mount.c
+++ b/lib/mount.c
@@ -294,23 +294,24 @@ void fuse_kern_unmount(const char *mountpoint, int fd)
 	int res;
 	int pid;
 
-	if (!mountpoint)
-		return;
-
 	if (fd != -1) {
 		struct pollfd pfd;
 
 		pfd.fd = fd;
 		pfd.events = 0;
 		res = poll(&pfd, 1, 0);
+
+		/* Need to close file descriptor, otherwise synchronous umount
+		   would recurse into filesystem, and deadlock.
+
+		   Caller expects fuse_kern_unmount to close the fd, so close it
+		   anyway. */
+		close(fd);
+
 		/* If file poll returns POLLERR on the device file descriptor,
 		   then the filesystem is already unmounted */
 		if (res == 1 && (pfd.revents & POLLERR))
 			return;
-
-		/* Need to close file descriptor, otherwise synchronous umount
-		   would recurse into filesystem, and deadlock */
-		close(fd);
 	}
 
 	if (geteuid() == 0) {
@@ -403,6 +404,9 @@ static int fuse_mount_fusermount(const char *mountpoint, struct mount_opts *mo,
 		waitpid(pid, NULL, 0); /* bury zombie */
 	}
 
+	if (rv >= 0)
+		fcntl(rv, F_SETFD, FD_CLOEXEC);
+
 	return rv;
 }