[PATCH v2 08/14] fuse: move fuse_uring_abort() from header to dev_uring.c

[Joanne Koong <joannelkoong@gmail.com>]

Move fuse_uring_abort() out of the inline header definition and into
dev_uring.c. This function calls several internal helpers (abort
requests, stop queues) that are all defined in dev_uring.c so inlining
it in the header unnecessarily exposes implementation details.

This will make the subsequent commit that adds pinning capabilties for
fuse buffers cleaner.

Signed-off-by: Joanne Koong <joannelkoong@gmail.com>
---
 fs/fuse/dev_uring.c   | 17 +++++++++++++++--
 fs/fuse/dev_uring_i.h | 16 +---------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/fs/fuse/dev_uring.c b/fs/fuse/dev_uring.c
index a85acd9c2b71..cce8994241b7 100644
--- a/fs/fuse/dev_uring.c
+++ b/fs/fuse/dev_uring.c
@@ -129,7 +129,7 @@ static void fuse_uring_abort_end_queue_requests(struct fuse_ring_queue *queue)
 	fuse_dev_end_requests(&req_list);
 }
 
-void fuse_uring_abort_end_requests(struct fuse_ring *ring)
+static void fuse_uring_abort_end_requests(struct fuse_ring *ring)
 {
 	int qid;
 	struct fuse_ring_queue *queue;
@@ -477,7 +477,7 @@ static void fuse_uring_async_stop_queues(struct work_struct *work)
 /*
  * Stop the ring queues
  */
-void fuse_uring_stop_queues(struct fuse_ring *ring)
+static void fuse_uring_stop_queues(struct fuse_ring *ring)
 {
 	int qid;
 
@@ -501,6 +501,19 @@ void fuse_uring_stop_queues(struct fuse_ring *ring)
 	}
 }
 
+void fuse_uring_abort(struct fuse_conn *fc)
+{
+	struct fuse_ring *ring = fc->ring;
+
+	if (ring == NULL)
+		return;
+
+	if (atomic_read(&ring->queue_refs) > 0) {
+		fuse_uring_abort_end_requests(ring);
+		fuse_uring_stop_queues(ring);
+	}
+}
+
 /*
  * Handle IO_URING_F_CANCEL, typically should come on daemon termination.
  *
diff --git a/fs/fuse/dev_uring_i.h b/fs/fuse/dev_uring_i.h
index 51a563922ce1..349418db3374 100644
--- a/fs/fuse/dev_uring_i.h
+++ b/fs/fuse/dev_uring_i.h
@@ -137,27 +137,13 @@ struct fuse_ring {
 
 bool fuse_uring_enabled(void);
 void fuse_uring_destruct(struct fuse_conn *fc);
-void fuse_uring_stop_queues(struct fuse_ring *ring);
-void fuse_uring_abort_end_requests(struct fuse_ring *ring);
+void fuse_uring_abort(struct fuse_conn *fc);
 int fuse_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags);
 void fuse_uring_queue_fuse_req(struct fuse_iqueue *fiq, struct fuse_req *req);
 bool fuse_uring_queue_bq_req(struct fuse_req *req);
 bool fuse_uring_remove_pending_req(struct fuse_req *req);
 bool fuse_uring_request_expired(struct fuse_conn *fc);
 
-static inline void fuse_uring_abort(struct fuse_conn *fc)
-{
-	struct fuse_ring *ring = fc->ring;
-
-	if (ring == NULL)
-		return;
-
-	if (atomic_read(&ring->queue_refs) > 0) {
-		fuse_uring_abort_end_requests(ring);
-		fuse_uring_stop_queues(ring);
-	}
-}
-
 static inline void fuse_uring_wait_stopped_queues(struct fuse_conn *fc)
 {
 	struct fuse_ring *ring = fc->ring;
-- 
2.52.0