merge 2_5_bugfix branch

2 files changed, 3 insertions, 2 deletions

diff --git a/lib/fuse.c b/lib/fuse.c
index f930404..0ce05a6 100644
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -603,8 +603,9 @@ static void reply_entry(fuse_req_t req, const struct fuse_entry_param *e,
                         int err)
 {
     if (!err) {
+        struct fuse *f = req_fuse(req);
         if (fuse_reply_entry(req, e) == -ENOENT)
-            forget_node(req_fuse(req), e->ino, 1);
+            forget_node(f, e->ino, 1);
     } else
         reply_err(req, err);
 }
diff --git a/lib/mount.c b/lib/mount.c
index 2840a54..0a14df3 100644
--- a/lib/mount.c
+++ b/lib/mount.c
@@ -292,4 +292,4 @@ int fuse_mount_compat1(const char *mountpoint, const char *args[])
     return fuse_mount_compat22(mountpoint, NULL);
 }
 
-__asm__(".symver fuse_mount_compat22,fuse_mount@");
+__asm__(".symver fuse_mount_compat22,fuse_mount@FUSE_2.2");