lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 0291/1095] io_uring: move to separate directory
    Date
    From: Jens Axboe <axboe@kernel.dk>

    [ Upstream commit ed29b0b4fd835b058ddd151c49d021e28d631ee6 ]

    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: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    MAINTAINERS | 7 +------
    Makefile | 1 +
    fs/Makefile | 2 --
    io_uring/Makefile | 6 ++++++
    {fs => io_uring}/io-wq.c | 0
    {fs => io_uring}/io-wq.h | 0
    {fs => io_uring}/io_uring.c | 2 +-
    kernel/sched/core.c | 2 +-
    8 files changed, 10 insertions(+), 10 deletions(-)
    create mode 100644 io_uring/Makefile
    rename {fs => io_uring}/io-wq.c (100%)
    rename {fs => io_uring}/io-wq.h (100%)
    rename {fs => io_uring}/io_uring.c (99%)

    diff --git a/MAINTAINERS b/MAINTAINERS
    index 2b70e2d21405..c7c7a96b62a8 100644
    --- a/MAINTAINERS
    +++ b/MAINTAINERS
    @@ -7599,9 +7599,6 @@ F: include/linux/fs.h
    F: include/linux/fs_types.h
    F: include/uapi/linux/fs.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
    M: Riku Voipio <riku.voipio@iki.fi>
    @@ -10277,9 +10274,7 @@ L: io-uring@vger.kernel.org
    S: Maintained
    T: git git://git.kernel.dk/linux-block
    T: git git://git.kernel.dk/liburing
    -F: fs/io-wq.c
    -F: fs/io-wq.h
    -F: fs/io_uring.c
    +F: io_uring/
    F: include/linux/io_uring.h
    F: include/uapi/linux/io_uring.h
    F: tools/io_uring/
    diff --git a/Makefile b/Makefile
    index 13dd4bd226cb..90e2129a3b80 100644
    --- a/Makefile
    +++ b/Makefile
    @@ -1100,6 +1100,7 @@ export MODULES_NSDEPS := $(extmod_prefix)modules.nsdeps
    ifeq ($(KBUILD_EXTMOD),)
    core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/
    core-$(CONFIG_BLOCK) += block/
    +core-$(CONFIG_IO_URING) += io_uring/

    vmlinux-dirs := $(patsubst %/,%,$(filter %/, \
    $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
    diff --git a/fs/Makefile b/fs/Makefile
    index 208a74e0b00e..93b80529f8e8 100644
    --- a/fs/Makefile
    +++ b/fs/Makefile
    @@ -34,8 +34,6 @@ obj-$(CONFIG_TIMERFD) += timerfd.o
    obj-$(CONFIG_EVENTFD) += eventfd.o
    obj-$(CONFIG_USERFAULTFD) += userfaultfd.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_ENCRYPTION) += crypto/
    obj-$(CONFIG_FS_VERITY) += verity/
    diff --git a/io_uring/Makefile b/io_uring/Makefile
    new file mode 100644
    index 000000000000..3680425df947
    --- /dev/null
    +++ b/io_uring/Makefile
    @@ -0,0 +1,6 @@
    +# SPDX-License-Identifier: GPL-2.0
    +#
    +# Makefile for io_uring
    +
    +obj-$(CONFIG_IO_URING) += io_uring.o
    +obj-$(CONFIG_IO_WQ) += io-wq.o
    diff --git a/fs/io-wq.c b/io_uring/io-wq.c
    similarity index 100%
    rename from fs/io-wq.c
    rename to io_uring/io-wq.c
    diff --git a/fs/io-wq.h b/io_uring/io-wq.h
    similarity index 100%
    rename from fs/io-wq.h
    rename to io_uring/io-wq.h
    diff --git a/fs/io_uring.c b/io_uring/io_uring.c
    similarity index 99%
    rename from fs/io_uring.c
    rename to io_uring/io_uring.c
    index 3d97372e811e..b25e59da129f 100644
    --- a/fs/io_uring.c
    +++ b/io_uring/io_uring.c
    @@ -86,7 +86,7 @@

    #include <uapi/linux/io_uring.h>

    -#include "internal.h"
    +#include "../fs/internal.h"
    #include "io-wq.h"

    #define IORING_MAX_ENTRIES 32768
    diff --git a/kernel/sched/core.c b/kernel/sched/core.c
    index 6baf96d2fa39..72b2f277b0dd 100644
    --- a/kernel/sched/core.c
    +++ b/kernel/sched/core.c
    @@ -88,7 +88,7 @@
    #include "stats.h"

    #include "../workqueue_internal.h"
    -#include "../../fs/io-wq.h"
    +#include "../../io_uring/io-wq.h"
    #include "../smpboot.h"

    /*
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-15 22:52    [W:4.140 / U:0.688 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site