From: Xiubo Li <xiubli@redhat.com>
Date: Thu, 23 Apr 2020 22:14:47 +0000 (-0400)
Subject: ceph-fuse: compatible with libfuse3.5 or higher
X-Git-Tag: v15.2.4~22^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f1e7ea418b297b352e4eed6946a7b9c24a4edba3;p=ceph.git

ceph-fuse: compatible with libfuse3.5 or higher

Fixes: https://tracker.ceph.com/issues/45396
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 377c65693ff363d1c8a1d024cbf613ac778ceb45)
---

diff --git a/src/client/fuse_ll.cc b/src/client/fuse_ll.cc
index 184950763b39..2eec01d583f5 100644
--- a/src/client/fuse_ll.cc
+++ b/src/client/fuse_ll.cc
@@ -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);