]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-fuse: compatible with libfuse3.5 or higher
authorXiubo Li <xiubli@redhat.com>
Thu, 23 Apr 2020 22:14:47 +0000 (18:14 -0400)
committerNathan Cutler <ncutler@suse.com>
Sat, 6 Jun 2020 08:58:06 +0000 (10:58 +0200)
Fixes: https://tracker.ceph.com/issues/45396
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 377c65693ff363d1c8a1d024cbf613ac778ceb45)

src/client/fuse_ll.cc

index 184950763b393cb8a0c3c01dab3d0e7b1a109c0b..2eec01d583f59fcd8faaeb8114ee76b7c96b7113 100644 (file)
@@ -641,7 +641,13 @@ static void fuse_ll_flush(fuse_req_t req, fuse_ino_t ino,
 }
 
 #ifdef FUSE_IOCTL_COMPAT
-static void fuse_ll_ioctl(fuse_req_t req, fuse_ino_t ino, int cmd, void *arg, struct fuse_file_info *fi,
+static void fuse_ll_ioctl(fuse_req_t req, fuse_ino_t ino,
+#if FUSE_VERSION >= FUSE_MAKE_VERSION(3, 5)
+                          unsigned int cmd,
+#else
+                          int cmd,
+#endif
+                          void *arg, struct fuse_file_info *fi,
                          unsigned flags, const void *in_buf, size_t in_bufsz, size_t out_bufsz)
 {
   CephFuse::Handle *cfuse = fuse_ll_req_prepare(req);