summaryrefslogtreecommitdiffstats
path: root/fusetrace
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2020-06-03 17:29:07 +0200
committerJeff Layton <jlayton@redhat.com>2020-06-03 20:03:31 +0200
commitcfbc0fb48a9880dabe8f332e9bf67d81867ae198 (patch)
treec2ec6cb4b0772d9b5897bc44ee1f551030b871e1 /fusetrace
parentMerge pull request #35363 from tchaikov/wip-qa-cronjob (diff)
downloadceph-cfbc0fb48a9880dabe8f332e9bf67d81867ae198.tar.xz
ceph-cfbc0fb48a9880dabe8f332e9bf67d81867ae198.zip
fuse: update to newer FUSE_USE_VERSION
The build was failing for me against fuse-devel v3.9.1. The prototype for fuse_ll_ioctl was wrong, as it was expecting the old-style one with signed int args. In newer libfuse versions, the prototype varies based on FUSE_USE_VERSION. Update to a newer FUSE_USE_VERSION value to ensure that we use the newer ioctl prototype. This also means that we need to handle a new prototype for fuse_session_loop_mt as well. While we're in here, move the definition of FUSE_USE_VERSION to ceph_fuse.h so we have the definition in one place. This does mean we need to reorganize the includes in a few places. Fixes: https://tracker.ceph.com/issues/45866 Signed-off-by: Jeff Layton <jlayton@redhat.com>
Diffstat (limited to 'fusetrace')
-rw-r--r--fusetrace/fusetrace_ll.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/fusetrace/fusetrace_ll.cc b/fusetrace/fusetrace_ll.cc
index b411a83fe20..f10c29fd22e 100644
--- a/fusetrace/fusetrace_ll.cc
+++ b/fusetrace/fusetrace_ll.cc
@@ -11,8 +11,6 @@
gcc -Wall `pkg-config fuse --cflags --libs` -lulockmgr fusexmp_fh.c -o fusexmp_fh
*/
-#define FUSE_USE_VERSION 30
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif