tree-wide: fix HAVE_FUSE3 checks

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxcfs.c b/src/lxcfs.c
index b6e404d04f9a3d3c145df4ab6f39f051e7d67f61..232da6044196a657b58fc5c3a05434f99cfdd7f3 100644 (file)
--- a/src/lxcfs.c
+++ b/src/lxcfs.c
@@ -607,7 +607,7 @@ static int do_sys_releasedir(const char *path, struct fuse_file_info *fi)
        return __sys_releasedir(path, fi);
 }
 
-#ifdef HAVE_FUSE3
+#if HAVE_FUSE3
 static int lxcfs_getattr(const char *path, struct stat *sb, struct fuse_file_info *fi)
 #else
 static int lxcfs_getattr(const char *path, struct stat *sb)
@@ -678,7 +678,7 @@ static int lxcfs_opendir(const char *path, struct fuse_file_info *fi)
        return -ENOENT;
 }
 
-#ifdef HAVE_FUSE3
+#if HAVE_FUSE3
 static int lxcfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
                         off_t offset, struct fuse_file_info *fi, enum fuse_readdir_flags flags)
 #else
@@ -926,7 +926,7 @@ int lxcfs_mkdir(const char *path, mode_t mode)
        return -EPERM;
 }
 
-#ifdef HAVE_FUSE3
+#if HAVE_FUSE3
 int lxcfs_chown(const char *path, uid_t uid, gid_t gid, struct fuse_file_info *fi)
 #else
 int lxcfs_chown(const char *path, uid_t uid, gid_t gid)
@@ -955,7 +955,7 @@ int lxcfs_chown(const char *path, uid_t uid, gid_t gid)
  * really make sense for cgroups.  So just return 0 always but do
  * nothing.
  */
-#ifdef HAVE_FUSE3
+#if HAVE_FUSE3
 int lxcfs_truncate(const char *path, off_t newsize, struct fuse_file_info *fi)
 #else
 int lxcfs_truncate(const char *path, off_t newsize)
@@ -984,7 +984,7 @@ int lxcfs_rmdir(const char *path)
        return -EPERM;
 }
 
-#ifdef HAVE_FUSE3
+#if HAVE_FUSE3
 int lxcfs_chmod(const char *path, mode_t mode, struct fuse_file_info *fi)
 #else
 int lxcfs_chmod(const char *path, mode_t mode)
@@ -1008,7 +1008,7 @@ int lxcfs_chmod(const char *path, mode_t mode)
        return -ENOENT;
 }
 
-#ifdef HAVE_FUSE3
+#if HAVE_FUSE3
 static void *lxcfs_init(struct fuse_conn_info *conn, struct fuse_config *cfg)
 #else
 static void *lxcfs_init(struct fuse_conn_info *conn)
@@ -1048,11 +1048,11 @@ const struct fuse_operations lxcfs_ops = {
 
        .create         = NULL,
        .destroy        = NULL,
-#ifndef HAVE_FUSE3
+#if !HAVE_FUSE3
        .fgetattr       = NULL,
 #endif
        .fsyncdir       = NULL,
-#ifndef HAVE_FUSE3
+#if !HAVE_FUSE3
        .ftruncate      = NULL,
        .getdir         = NULL,
 #endif
@@ -1066,7 +1066,7 @@ const struct fuse_operations lxcfs_ops = {
        .statfs         = NULL,
        .symlink        = NULL,
        .unlink         = NULL,
-#ifndef HAVE_FUSE3
+#if !HAVE_FUSE3
        .utime          = NULL,
 #endif
 };
@@ -1181,7 +1181,7 @@ int main(int argc, char *argv[])
        char *pidfile = NULL, *token = NULL;
        char pidfile_buf[STRLITERALLEN(RUNTIME_PATH) + STRLITERALLEN("/lxcfs.pid") + 1] = {};
        bool debug = false, foreground = false;
-#ifndef HAVE_FUSE3
+#if !HAVE_FUSE3
        bool nonempty = false;
 #endif
        bool load_use = false;
@@ -1307,7 +1307,7 @@ int main(int argc, char *argv[])
 
                        /* default with fuse3 */
                        if (strcmp(token, "nonempty") == 0) {
-                               #ifndef HAVE_FUSE3
+                               #if !HAVE_FUSE3
                                nonempty = true;
                                #endif
                                continue;
@@ -1327,7 +1327,7 @@ int main(int argc, char *argv[])
                goto out;
        }
 
-#ifndef HAVE_FUSE3
+#if !HAVE_FUSE3
        if (nonempty) {
                if (append_comma_separate(&new_fuse_opts, "nonempty")) {
                        lxcfs_error("Failed to copy fuse argument \"nonempty\"");

diff --git a/src/lxcfs_fuse_compat.h b/src/lxcfs_fuse_compat.h
index 9c61af04b2bdf5d292597003167f04cd0e960ba2..fcf2da2f1c4606089c6ae3af11491210e8ac5f6b 100644 (file)
--- a/src/lxcfs_fuse_compat.h
+++ b/src/lxcfs_fuse_compat.h
@@ -3,13 +3,12 @@
 #ifndef __LXCFS_FUSE_COMPAT_H
 #define __LXCFS_FUSE_COMPAT_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
+#include "config.h"
 
-#ifdef HAVE_FUSE3
+#if HAVE_FUSE3
 #define DIR_FILLER(F,B,N,S,O) F(B,N,S,O,FUSE_FILL_DIR_PLUS)
 #else
 #define DIR_FILLER(F,B,N,S,O) F(B,N,S,O)
 #endif
+
 #endif /* __LXCFS_FUSE_COMPAT_H */