- fix libfuse3 api usage

diff --git a/ceph.spec b/ceph.spec
index bbe3059abb8fce71a33205fca5786bb65341f9c9..b2b6f5dc923d4735894024cec080690e9ae2ddc5 100644 (file)
--- a/ceph.spec
+++ b/ceph.spec
@@ -52,6 +52,7 @@ Patch6:               types.patch
 Patch7:                use-provided-cpu-flag-values.patch
 Patch8:                ix86-no-asm.patch
 Patch9:                long-int-time_t.patch
+Patch10:       fuse3-api.patch
 URL:           https://ceph.io/
 %{?with_accelio:BuildRequires: accelio-devel}
 %{?with_babeltrace:BuildRequires:      babeltrace-devel}
@@ -78,7 +79,7 @@ BuildRequires:        libaio-devel
 BuildRequires: libatomic_ops
 BuildRequires: libblkid-devel >= 2.17
 BuildRequires: libedit-devel >= 2.11
-BuildRequires: libfuse-devel
+BuildRequires: libfuse3-devel
 # +RDMA?
 %{?with_accelio:BuildRequires: libibverbs-devel}
 BuildRequires: libltdl-devel
@@ -283,6 +284,7 @@ uruchamiania demonów.
 %ifarch %{ix86}
 %patch9 -p1
 %endif
+%patch10 -p1
 
 %build
 install -d build

diff --git a/fuse3-api.patch b/fuse3-api.patch
new file mode 100644 (file)
index 0000000..f7b25ce
--- /dev/null
+++ b/fuse3-api.patch
@@ -0,0 +1,11 @@
+--- ceph-16.2.7/src/client/fuse_ll.cc~ 2021-12-07 17:15:49.000000000 +0100
++++ ceph-16.2.7/src/client/fuse_ll.cc  2022-02-13 13:00:03.661557137 +0100
+@@ -247,7 +247,7 @@
+ }
+ 
+ static void fuse_ll_forget(fuse_req_t req, fuse_ino_t ino,
+-                         long unsigned nlookup)
++                         uint64_t nlookup)
+ {
+   CephFuse::Handle *cfuse = fuse_ll_req_prepare(req);
+   cfuse->client->ll_forget(cfuse->iget(ino), nlookup+1);