diff options
author | Sander Vrijders <[email protected]> | 2020-11-11 11:33:39 +0100 |
---|---|---|
committer | Dimitri Staessens <[email protected]> | 2020-11-11 12:14:19 +0100 |
commit | 210a597f0a0e9f369f4667cbf9d89faf16a86f32 (patch) | |
tree | 93a10fe5f0c5711efc3e968ae12dc37ae059ad82 | |
parent | 83e14d0dbd2b0603daeb7f090e4ed7143926525e (diff) | |
download | ouroboros-210a597f0a0e9f369f4667cbf9d89faf16a86f32.tar.gz ouroboros-210a597f0a0e9f369f4667cbf9d89faf16a86f32.zip |
Revert "lib: Unmount stale RIB directories"
This reverts commit 978266fe4beba21292daad2d341fe5ff22e08aba.
We were incorrectly unmounting the directory under normal conditions.
Signed-off-by: Sander Vrijders <[email protected]>
Signed-off-by: Dimitri Staessens <[email protected]>
-rw-r--r-- | src/lib/rib.c | 11 |
1 files changed, 1 insertions, 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); |