From d6bec4020fddd4dd67248789a1af600580f2cbda Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Fri, 11 Mar 2011 13:51:49 +0100 Subject: In case of failure to add to /etc/mtab don't umount. Reported by Marc Deslauriers --- ChangeLog | 5 +++++ util/fusermount.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1e9173f..4221c8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-03-11 Miklos Szeredi + + * In case of failure to add to /etc/mtab don't umount. Reported + by Marc Deslauriers + 2011-02-02 Miklos Szeredi * libfuse: In fuse_session_loop_mt() don't pause when exiting the diff --git a/util/fusermount.c b/util/fusermount.c index 48f23fa..cd8a9c3 100644 --- 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; } -- cgit v1.2.3