[PATCH v1] io_uring: Don't include af_unix.h.

[PATCH v1] io_uring: Don't include af_unix.h.

[Kuniyuki Iwashima]

Changes to AF_UNIX trigger rebuild of io_uring, but io_uring does
not use AF_UNIX anymore.

Let's not include af_unix.h and instead include necessary headers.

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
---
 io_uring/io_uring.c  | 1 -
 io_uring/rsrc.h      | 2 --
 io_uring/rw.c        | 1 +
 io_uring/uring_cmd.c | 1 +
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index cd9a137ad6ce..c5bfc6d42fe2 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -59,7 +59,6 @@
 #include <linux/bvec.h>
 #include <linux/net.h>
 #include <net/sock.h>
-#include <net/af_unix.h>
 #include <linux/anon_inodes.h>
 #include <linux/sched/mm.h>
 #include <linux/uaccess.h>
diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h
index c6f199bbee28..e21000238954 100644
--- a/io_uring/rsrc.h
+++ b/io_uring/rsrc.h
@@ -2,8 +2,6 @@
 #ifndef IOU_RSRC_H
 #define IOU_RSRC_H
 
-#include <net/af_unix.h>
-
 #include "alloc_cache.h"
 
 #define IO_NODE_ALLOC_CACHE_MAX 32
diff --git a/io_uring/rw.c b/io_uring/rw.c
index d5e79d9bdc71..332bd59f19b1 100644
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@ -11,6 +11,7 @@
 #include <linux/nospec.h>
 #include <linux/compat.h>
 #include <linux/io_uring/cmd.h>
+#include <linux/indirect_call_wrapper.h>
 
 #include <uapi/linux/io_uring.h>
 
diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c
index c33fca585dde..42f63adfa54a 100644
--- a/io_uring/uring_cmd.c
+++ b/io_uring/uring_cmd.c
@@ -5,6 +5,7 @@
 #include <linux/io_uring/cmd.h>
 #include <linux/security.h>
 #include <linux/nospec.h>
+#include <net/sock.h>
 
 #include <uapi/linux/io_uring.h>
 #include <asm/ioctls.h>
-- 
2.30.2

Re: [PATCH v1] io_uring: Don't include af_unix.h.

[Jens Axboe]

On Mon, 12 Feb 2024 15:42:36 -0800, Kuniyuki Iwashima wrote:
> Changes to AF_UNIX trigger rebuild of io_uring, but io_uring does
> not use AF_UNIX anymore.
> 
> Let's not include af_unix.h and instead include necessary headers.
> 
> 

Applied, thanks!

[1/1] io_uring: Don't include af_unix.h.
      commit: 3fb1764c6b57808ddab7fe7c242fa04c2479ef0a

Best regards,
-- 
Jens Axboe