In case of failure to add to /etc/mtab don't umount.

Reported by Marc Deslauriers

diff --git a/ChangeLog b/ChangeLog
index 1e9173fedb3414695edeebf558e39dd52cfb7292..4221c8eaab77e9438f73af7133ad274bd616e1ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-11  Miklos Szeredi <miklos@szeredi.hu>
+
+       * In case of failure to add to /etc/mtab don't umount.  Reported
+       by Marc Deslauriers
+
 2011-02-02  Miklos Szeredi <miklos@szeredi.hu>
 
        * libfuse: In fuse_session_loop_mt() don't pause when exiting the

diff --git a/util/fusermount.c b/util/fusermount.c
index 48f23fa8630afff3d0706be5ed0ca4c13993e6c6..cd8a9c3dadcce13e98cd0f9b1f45ecef15b3ada2 100644 (file)
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -1082,7 +1082,7 @@ static int mount_fuse(const char *mnt, const char *opts)
        if (geteuid() == 0) {
                res = add_mount(source, mnt, type, mnt_opts);
                if (res == -1) {
-                       umount2(mnt, UMOUNT_DETACH); /* lazy umount */
+                       /* Can't clean up mount in a non-racy way */
                        close(fd);
                        return -1;
                }