fusermount: don't save/restore cwd

Remove unnecessary restoring of current working directory in
"fusermount -u"

diff --git a/ChangeLog b/ChangeLog
index ab5eca134843a6ab5db6d63e45247f3d83828f5d..58649b36a5e06d168f308de82237a0064f81b10f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@
        which may be used in event loop implementations to replace
        fuse_chan_recv() and fuse_session_process() respectively.
 
+       * Remove unnecessary restoring of current working directory in
+       "fusermount -u"
+
 2010-10-14  Miklos Szeredi <miklos@szeredi.hu>
 
        * Use LTLIBICONV when linking libfuse.  This fixes building against

diff --git a/util/fusermount.c b/util/fusermount.c
index 3b4125ead1f7d4a31c8c3525d369426c143e3144..588d1bfb8ca4b5b77b3093b1f5a8fc2cb8d0ef38 100644 (file)
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -335,7 +335,7 @@ static int check_is_mount(const char *last, const char *mnt)
        return 0;
 }
 
-static int chdir_to_parent(char *copy, const char **lastp, int *currdir_fd)
+static int chdir_to_parent(char *copy, const char **lastp)
 {
        char *tmp;
        const char *parent;
@@ -360,14 +360,6 @@ static int chdir_to_parent(char *copy, const char **lastp, int *currdir_fd)
                parent = "/";
        }
 
-       *currdir_fd = open(".", O_RDONLY);
-       if (*currdir_fd == -1) {
-               fprintf(stderr,
-                       "%s: failed to open current directory: %s\n",
-                       progname, strerror(errno));
-               return -1;
-       }
-
        res = chdir(parent);
        if (res == -1) {
                fprintf(stderr, "%s: failed to chdir to %s: %s\n",
@@ -392,7 +384,6 @@ static int chdir_to_parent(char *copy, const char **lastp, int *currdir_fd)
 
 static int unmount_fuse_legacy(const char *mnt, int lazy)
 {
-       int currdir_fd = -1;
        char *copy;
        const char *last;
        int res;
@@ -403,7 +394,7 @@ static int unmount_fuse_legacy(const char *mnt, int lazy)
                return -1;
        }
 
-       res = chdir_to_parent(copy, &last, &currdir_fd);
+       res = chdir_to_parent(copy, &last);
        if (res == -1)
                goto out;
 
@@ -415,10 +406,6 @@ static int unmount_fuse_legacy(const char *mnt, int lazy)
 
 out:
        free(copy);
-       if (currdir_fd != -1) {
-               fchdir(currdir_fd);
-               close(currdir_fd);
-       }
 
        return res;
 }