From: Miklos Szeredi <miklos@szeredi.hu>
Date: Mon, 12 Nov 2007 13:57:12 +0000 (+0000)
Subject: 'fusermount -u' did not umount the filesystem if /etc/mtab was a symlink
X-Git-Tag: fuse_2_7_2_before_indent~1
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0b47f6bc8bfe939f12266ef41cba31a2eb2c5f30;p=qemu-gpiodev%2Flibfuse.git

'fusermount -u' did not umount the filesystem if /etc/mtab was a symlink
---

diff --git a/ChangeLog b/ChangeLog
index c0313d2..5cdbc9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-12  Miklos Szeredi <miklos@szeredi.hu>
+
+	* 'fusermount -u' did not umount the filesystem if /etc/mtab was a
+	symlink.  This bug was introduced in 2.7.1 by "Don't call
+	/bin/[u]mount if /etc/mtab is a symlink".  Found by robertsong.
+
 2007-10-16  Miklos Szeredi <miklos@szeredi.hu>
 
 	* Released 2.7.1
diff --git a/lib/mount_util.c b/lib/mount_util.c
index c7b2123..9ce431a 100644
--- a/lib/mount_util.c
+++ b/lib/mount_util.c
@@ -17,6 +17,7 @@
 #include <mntent.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <sys/mount.h>
 
 static int mtab_needs_update(const char *mnt)
 {
@@ -91,8 +92,13 @@ int fuse_mnt_umount(const char *progname, const char *mnt, int lazy)
     int res;
     int status;
 
-    if (!mtab_needs_update(mnt))
-        return 0;
+    if (!mtab_needs_update(mnt)) {
+        res = umount2(mnt, lazy ? 2 : 0);
+        if (res == -1)
+            fprintf(stderr, "%s: failed to unmount %s: %s\n", progname,
+                    mnt, strerror(errno));
+        return res;
+    }
 
     res = fork();
     if (res == -1) {