Commit ed29b0b4 authored by Jens Axboe's avatar Jens Axboe

io_uring: move to separate directory

In preparation for splitting io_uring up a bit, move it into its own
top level directory. It didn't really belong in fs/ anyway, as it's
not a file system only API.

This adds io_uring/ and moves the core files in there, and updates the
MAINTAINERS file for the new location.
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0702e536
...@@ -7773,9 +7773,6 @@ F: include/linux/fs.h ...@@ -7773,9 +7773,6 @@ F: include/linux/fs.h
F: include/linux/fs_types.h F: include/linux/fs_types.h
F: include/uapi/linux/fs.h F: include/uapi/linux/fs.h
F: include/uapi/linux/openat2.h F: include/uapi/linux/openat2.h
X: fs/io-wq.c
X: fs/io-wq.h
X: fs/io_uring.c
FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
M: Riku Voipio <riku.voipio@iki.fi> M: Riku Voipio <riku.voipio@iki.fi>
...@@ -10476,9 +10473,7 @@ L: io-uring@vger.kernel.org ...@@ -10476,9 +10473,7 @@ L: io-uring@vger.kernel.org
S: Maintained S: Maintained
T: git git://git.kernel.dk/linux-block T: git git://git.kernel.dk/linux-block
T: git git://git.kernel.dk/liburing T: git git://git.kernel.dk/liburing
F: fs/io-wq.c F: io_uring/
F: fs/io-wq.h
F: fs/io_uring.c
F: include/linux/io_uring.h F: include/linux/io_uring.h
F: include/uapi/linux/io_uring.h F: include/uapi/linux/io_uring.h
F: tools/io_uring/ F: tools/io_uring/
......
...@@ -1097,6 +1097,7 @@ export MODULES_NSDEPS := $(extmod_prefix)modules.nsdeps ...@@ -1097,6 +1097,7 @@ export MODULES_NSDEPS := $(extmod_prefix)modules.nsdeps
ifeq ($(KBUILD_EXTMOD),) ifeq ($(KBUILD_EXTMOD),)
core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/
core-$(CONFIG_BLOCK) += block/ core-$(CONFIG_BLOCK) += block/
core-$(CONFIG_IO_URING) += io_uring/
vmlinux-dirs := $(patsubst %/,%,$(filter %/, \ vmlinux-dirs := $(patsubst %/,%,$(filter %/, \
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
......
...@@ -34,8 +34,6 @@ obj-$(CONFIG_TIMERFD) += timerfd.o ...@@ -34,8 +34,6 @@ obj-$(CONFIG_TIMERFD) += timerfd.o
obj-$(CONFIG_EVENTFD) += eventfd.o obj-$(CONFIG_EVENTFD) += eventfd.o
obj-$(CONFIG_USERFAULTFD) += userfaultfd.o obj-$(CONFIG_USERFAULTFD) += userfaultfd.o
obj-$(CONFIG_AIO) += aio.o obj-$(CONFIG_AIO) += aio.o
obj-$(CONFIG_IO_URING) += io_uring.o
obj-$(CONFIG_IO_WQ) += io-wq.o
obj-$(CONFIG_FS_DAX) += dax.o obj-$(CONFIG_FS_DAX) += dax.o
obj-$(CONFIG_FS_ENCRYPTION) += crypto/ obj-$(CONFIG_FS_ENCRYPTION) += crypto/
obj-$(CONFIG_FS_VERITY) += verity/ obj-$(CONFIG_FS_VERITY) += verity/
......
# SPDX-License-Identifier: GPL-2.0
#
# Makefile for io_uring
obj-$(CONFIG_IO_URING) += io_uring.o
obj-$(CONFIG_IO_WQ) += io-wq.o
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
#include <uapi/linux/io_uring.h> #include <uapi/linux/io_uring.h>
#include "internal.h" #include "../fs/internal.h"
#include "io-wq.h" #include "io-wq.h"
#define IORING_MAX_ENTRIES 32768 #define IORING_MAX_ENTRIES 32768
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
#include "stats.h" #include "stats.h"
#include "../workqueue_internal.h" #include "../workqueue_internal.h"
#include "../../fs/io-wq.h" #include "../../io_uring/io-wq.h"
#include "../smpboot.h" #include "../smpboot.h"
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment