From: Miklos Szeredi <mszeredi@redhat.com>
Date: Tue, 24 Mar 2026 12:16:34 +0000 (+0100)
Subject: fuse: remove #include "fuse_i.h" from "req_timeout.c"
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3a3e06bfbdd44317bb61993f4d981c1cd2f00c9;p=thirdparty%2Fkernel%2Fstable.git

fuse: remove #include "fuse_i.h" from "req_timeout.c"

Just need to move fuse_abort_conn().

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
---

diff --git a/fs/fuse/dev.h b/fs/fuse/dev.h
index 1d3d2e0c9b91..efdaf0bf6f0f 100644
--- a/fs/fuse/dev.h
+++ b/fs/fuse/dev.h
@@ -41,6 +41,9 @@ struct fuse_dev *fuse_dev_grab(struct file *file);
 
 void fuse_init_server_timeout(struct fuse_chan *fch, unsigned int timeout);
 
+/* Abort all requests */
+void fuse_abort_conn(struct fuse_conn *fc);
+
 #ifdef CONFIG_FUSE_IO_URING
 bool fuse_uring_enabled(void);
 void fuse_uring_destruct(struct fuse_chan *fch);
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index a0d120057ddb..af8e05a403e5 100644
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -996,8 +996,6 @@ static inline ssize_t fuse_simple_idmap_request(struct mnt_idmap *idmap,
 int fuse_simple_background(struct fuse_mount *fm, struct fuse_args *args,
 			   gfp_t gfp_flags);
 
-/* Abort all requests */
-void fuse_abort_conn(struct fuse_conn *fc);
 void fuse_wait_aborted(struct fuse_conn *fc);
 
 void fuse_dentry_tree_init(void);
diff --git a/fs/fuse/req_timeout.c b/fs/fuse/req_timeout.c
index ef464bebc0b6..9c48789b941a 100644
--- a/fs/fuse/req_timeout.c
+++ b/fs/fuse/req_timeout.c
@@ -2,7 +2,6 @@
 
 #include "dev.h"
 #include "sysctl.h"
-#include "fuse_i.h"
 #include "fuse_dev_i.h"
 #include "dev_uring_i.h"