From 35aed42aa867a052e380e315d23546f47124697a Mon Sep 17 00:00:00 2001
From: "Brian L. Troutwine" <brian.troutwine@datadoghq.com>
Date: Tue, 5 Nov 2024 17:37:59 -0800
Subject: [PATCH] Update to fuser 0.15

This supplants #1081. fuser added a `fh` argument to getattr which
we introduce and subsequently ignore.

Signed-off-by: Brian L. Troutwine <brian.troutwine@datadoghq.com>
---
 Cargo.lock                                    | 33 +++++++++++++++----
 lading/Cargo.toml                             |  2 +-
 lading/src/generator/file_gen/logrotate_fs.rs |  2 +-
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index aab8209fb..d9b3bcfc1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -26,7 +26,7 @@ dependencies = [
  "cfg-if",
  "once_cell",
  "version_check",
- "zerocopy",
+ "zerocopy 0.7.35",
 ]
 
 [[package]]
@@ -821,17 +821,18 @@ dependencies = [
 
 [[package]]
 name = "fuser"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e697f6f62c20b6fad1ba0f84ae909f25971cf16e735273524e3977c94604cf8"
+checksum = "e469ac6d2cdfaeb56c5ede4dc00d8a24a4267d5eab9ab365ee783179087ab2e3"
 dependencies = [
  "libc",
  "log",
  "memchr",
+ "nix 0.29.0",
  "page_size",
  "pkg-config",
  "smallvec",
- "zerocopy",
+ "zerocopy 0.8.9",
 ]
 
 [[package]]
@@ -2049,7 +2050,7 @@ version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
 dependencies = [
- "zerocopy",
+ "zerocopy 0.7.35",
 ]
 
 [[package]]
@@ -3764,7 +3765,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
  "byteorder",
- "zerocopy-derive",
+ "zerocopy-derive 0.7.35",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f49e690f8f352f4a9ee8679a8c5921f42ffd0d6d6413a0a66b8e81cf524e109c"
+dependencies = [
+ "zerocopy-derive 0.8.9",
 ]
 
 [[package]]
@@ -3778,6 +3788,17 @@ dependencies = [
  "syn 2.0.85",
 ]
 
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa732fcc881df7a6fbe8e3ed17baadece53b379ad58fe2633396b1a2b108a7b1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.85",
+]
+
 [[package]]
 name = "zstd"
 version = "0.13.2"
diff --git a/lading/Cargo.toml b/lading/Cargo.toml
index 31b4e67f0..d9a1a36e8 100644
--- a/lading/Cargo.toml
+++ b/lading/Cargo.toml
@@ -34,7 +34,7 @@ flate2 = { version = "1.0.34", default-features = false, features = [
   "rust_backend",
 ] }
 futures = "0.3.31"
-fuser = "0.14"
+fuser = "0.15"
 http = "0.2"
 http-serde = "1.1"
 hyper = { version = "0.14", features = ["client"] }
diff --git a/lading/src/generator/file_gen/logrotate_fs.rs b/lading/src/generator/file_gen/logrotate_fs.rs
index fed876187..3b0368720 100644
--- a/lading/src/generator/file_gen/logrotate_fs.rs
+++ b/lading/src/generator/file_gen/logrotate_fs.rs
@@ -300,7 +300,7 @@ impl Filesystem for LogrotateFS {
     }
 
     #[tracing::instrument(skip(self, reply))]
-    fn getattr(&mut self, _: &Request, ino: u64, reply: ReplyAttr) {
+    fn getattr(&mut self, _: &Request, ino: u64, _: Option<u64>, reply: ReplyAttr) {
         let tick = self.get_current_tick();
         let mut state = self.state.lock().expect("lock poisoned");
         state.advance_time(tick);