From 210a597f0a0e9f369f4667cbf9d89faf16a86f32 Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Wed, 11 Nov 2020 11:33:39 +0100 Subject: Revert "lib: Unmount stale RIB directories" This reverts commit 978266fe4beba21292daad2d341fe5ff22e08aba. We were incorrectly unmounting the directory under normal conditions. Signed-off-by: Sander Vrijders Signed-off-by: Dimitri Staessens --- src/lib/rib.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/lib/rib.c b/src/lib/rib.c index 6aacb0be..684c5dcd 100644 --- a/src/lib/rib.c +++ b/src/lib/rib.c @@ -271,7 +271,6 @@ int rib_init(const char * mountpt) { #ifdef HAVE_FUSE struct stat st; - struct stat prefix_st; char * argv[] = {"-f", "-o", "ro," @@ -281,7 +280,7 @@ int rib_init(const char * mountpt) NULL}; struct fuse_args args = FUSE_ARGS_INIT(3, argv); - if (stat(FUSE_PREFIX, &prefix_st) == -1) + if (stat(FUSE_PREFIX, &st) == -1) return -1; sprintf(rib.mnt, FUSE_PREFIX "/%s", mountpt); @@ -299,14 +298,6 @@ int rib_init(const char * mountpt) return -1; } - /* - * If parent directory is a different filesystem, - * then directory was already mounted in a previous - * Ouroboros instance that was killed. - */ - if (st.st_dev != prefix_st.st_dev) - fuse_unmount(rib.mnt, rib.ch); - fuse_opt_parse(&args, NULL, NULL, NULL); list_head_init(&rib.reg_comps); -- cgit v1.2.3