io_uring: move statx handling to its own file

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/Makefile b/io_uring/Makefile
index 59e70f2..de953c0 100644 (file)
--- a/io_uring/Makefile
+++ b/io_uring/Makefile
@@ -4,5 +4,6 @@
 
 obj-$(CONFIG_IO_URING)         += io_uring.o xattr.o nop.o fs.o splice.o \
                                        sync.o advise.o filetable.o \
-                                       openclose.o uring_cmd.o epoll.o
+                                       openclose.o uring_cmd.o epoll.o \
+                                       statx.o
 obj-$(CONFIG_IO_WQ)            += io-wq.o

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 78828e2..eb01d1a 100644 (file)
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -101,6 +101,7 @@
 #include "openclose.h"
 #include "uring_cmd.h"
 #include "epoll.h"
+#include "statx.h"
 
 #define IORING_MAX_ENTRIES     32768
 #define IORING_MAX_CQ_ENTRIES  (2 * IORING_MAX_ENTRIES)
@@ -384,15 +385,6 @@ struct io_provide_buf {
        __u16                           bid;
 };
 
-struct io_statx {
-       struct file                     *file;
-       int                             dfd;
-       unsigned int                    mask;
-       unsigned int                    flags;
-       struct filename                 *filename;
-       struct statx __user             *buffer;
-};
-
 struct io_shutdown {
        struct file                     *file;
        int                             how;
@@ -4033,58 +4025,6 @@ static __maybe_unused int io_eopnotsupp_prep(struct io_kiocb *kiocb,
        return -EOPNOTSUPP;
 }
 
-static int io_statx_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
-{
-       struct io_statx *sx = io_kiocb_to_cmd(req);
-       const char __user *path;
-
-       if (sqe->buf_index || sqe->splice_fd_in)
-               return -EINVAL;
-       if (req->flags & REQ_F_FIXED_FILE)
-               return -EBADF;
-
-       sx->dfd = READ_ONCE(sqe->fd);
-       sx->mask = READ_ONCE(sqe->len);
-       path = u64_to_user_ptr(READ_ONCE(sqe->addr));
-       sx->buffer = u64_to_user_ptr(READ_ONCE(sqe->addr2));
-       sx->flags = READ_ONCE(sqe->statx_flags);
-
-       sx->filename = getname_flags(path,
-                                    getname_statx_lookup_flags(sx->flags),
-                                    NULL);
-
-       if (IS_ERR(sx->filename)) {
-               int ret = PTR_ERR(sx->filename);
-
-               sx->filename = NULL;
-               return ret;
-       }
-
-       req->flags |= REQ_F_NEED_CLEANUP;
-       return 0;
-}
-
-static int io_statx(struct io_kiocb *req, unsigned int issue_flags)
-{
-       struct io_statx *sx = io_kiocb_to_cmd(req);
-       int ret;
-
-       if (issue_flags & IO_URING_F_NONBLOCK)
-               return -EAGAIN;
-
-       ret = do_statx(sx->dfd, sx->filename, sx->flags, sx->mask, sx->buffer);
-       io_req_set_res(req, ret, 0);
-       return IOU_OK;
-}
-
-static void io_statx_cleanup(struct io_kiocb *req)
-{
-       struct io_statx *sx = io_kiocb_to_cmd(req);
-
-       if (sx->filename)
-               putname(sx->filename);
-}
-
 #if defined(CONFIG_NET)
 static int io_shutdown_prep(struct io_kiocb *req,
                            const struct io_uring_sqe *sqe)

diff --git a/io_uring/statx.c b/io_uring/statx.c
new file mode 100644 (file)
index 0000000..83b1568
--- /dev/null
+++ b/io_uring/statx.c
@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/file.h>
+#include <linux/io_uring.h>
+
+#include <uapi/linux/io_uring.h>
+
+#include "../fs/internal.h"
+
+#include "io_uring_types.h"
+#include "io_uring.h"
+#include "statx.h"
+
+struct io_statx {
+       struct file                     *file;
+       int                             dfd;
+       unsigned int                    mask;
+       unsigned int                    flags;
+       struct filename                 *filename;
+       struct statx __user             *buffer;
+};
+
+int io_statx_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
+{
+       struct io_statx *sx = io_kiocb_to_cmd(req);
+       const char __user *path;
+
+       if (sqe->buf_index || sqe->splice_fd_in)
+               return -EINVAL;
+       if (req->flags & REQ_F_FIXED_FILE)
+               return -EBADF;
+
+       sx->dfd = READ_ONCE(sqe->fd);
+       sx->mask = READ_ONCE(sqe->len);
+       path = u64_to_user_ptr(READ_ONCE(sqe->addr));
+       sx->buffer = u64_to_user_ptr(READ_ONCE(sqe->addr2));
+       sx->flags = READ_ONCE(sqe->statx_flags);
+
+       sx->filename = getname_flags(path,
+                                    getname_statx_lookup_flags(sx->flags),
+                                    NULL);
+
+       if (IS_ERR(sx->filename)) {
+               int ret = PTR_ERR(sx->filename);
+
+               sx->filename = NULL;
+               return ret;
+       }
+
+       req->flags |= REQ_F_NEED_CLEANUP;
+       return 0;
+}
+
+int io_statx(struct io_kiocb *req, unsigned int issue_flags)
+{
+       struct io_statx *sx = io_kiocb_to_cmd(req);
+       int ret;
+
+       if (issue_flags & IO_URING_F_NONBLOCK)
+               return -EAGAIN;
+
+       ret = do_statx(sx->dfd, sx->filename, sx->flags, sx->mask, sx->buffer);
+       io_req_set_res(req, ret, 0);
+       return IOU_OK;
+}
+
+void io_statx_cleanup(struct io_kiocb *req)
+{
+       struct io_statx *sx = io_kiocb_to_cmd(req);
+
+       if (sx->filename)
+               putname(sx->filename);
+}

diff --git a/io_uring/statx.h b/io_uring/statx.h
new file mode 100644 (file)
index 0000000..9a17f4d
--- /dev/null
+++ b/io_uring/statx.h
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+
+int io_statx_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
+int io_statx(struct io_kiocb *req, unsigned int issue_flags);
+void io_statx_cleanup(struct io_kiocb *req);