From: Allison Karlitskaya <allison.karlitskaya@redhat.com>
Date: Mon, 26 May 2025 18:38:16 +0000 (+0200)
Subject: fuse2fs: fix old libfuse compatibility issue
X-Git-Tag: v1.47.3-rc1~10^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=015c3f4a4e1b6740843ffad6f66e5e898c723d98;p=thirdparty%2Fe2fsprogs.git

fuse2fs: fix old libfuse compatibility issue

We only have the 'cfg' parameter defined here #if FUSE_VERSION >=
FUSE_MAKE_VERSION(3, 0), so only attempt to access it in that case as
well.

In particular, this fixes an issue when building on the GitHub Actions
runners.

Signed-off-by: Allison Karlitskaya <allison.karlitskaya@redhat.com>
---

diff --git a/misc/fuse2fs.c b/misc/fuse2fs.c
index 71dbdc1a..b26303a2 100644
--- a/misc/fuse2fs.c
+++ b/misc/fuse2fs.c
@@ -759,6 +759,8 @@ static void *op_init(struct fuse_conn_info *conn
 #if FUSE_VERSION >= FUSE_MAKE_VERSION(3, 0)
 	conn->time_gran = 1;
 	cfg->use_ino = 1;
+	if (ff->debug)
+		cfg->debug = 1;
 #endif
 	if (fs->flags & EXT2_FLAG_RW) {
 		fs->super->s_mnt_count++;
@@ -769,8 +771,6 @@ static void *op_init(struct fuse_conn_info *conn
 		if (err)
 			translate_error(fs, 0, err);
 	}
-	if (ff->debug)
-		cfg->debug = 1;
 
 	if (ff->kernel) {
 		char uuid[UUID_STR_SIZE];