]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
io_uring/rw: rename io_import_iovec()
authorPavel Begunkov <asml.silence@gmail.com>
Mon, 24 Feb 2025 19:45:04 +0000 (19:45 +0000)
committerJens Axboe <axboe@kernel.dk>
Tue, 25 Feb 2025 14:43:05 +0000 (07:43 -0700)
io_import_iovec() is not limited to iovecs but also imports buffers for
normal reads and selected buffers, rename it for clarity.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/91cea59340b61a8f52dc7b8e720274577a25188c.1740425922.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
io_uring/rw.c

index 7efc2337c5a0cb512e2e36696a78b718e398102d..e636be4850a7a914ba3a29ae2e8645b02bd09d3a 100644 (file)
@@ -76,7 +76,7 @@ static int io_iov_buffer_select_prep(struct io_kiocb *req)
        return 0;
 }
 
-static int __io_import_iovec(int ddir, struct io_kiocb *req,
+static int __io_import_rw_buffer(int ddir, struct io_kiocb *req,
                             struct io_async_rw *io,
                             unsigned int issue_flags)
 {
@@ -122,13 +122,13 @@ static int __io_import_iovec(int ddir, struct io_kiocb *req,
        return 0;
 }
 
-static inline int io_import_iovec(int rw, struct io_kiocb *req,
-                                 struct io_async_rw *io,
-                                 unsigned int issue_flags)
+static inline int io_import_rw_buffer(int rw, struct io_kiocb *req,
+                                     struct io_async_rw *io,
+                                     unsigned int issue_flags)
 {
        int ret;
 
-       ret = __io_import_iovec(rw, req, io, issue_flags);
+       ret = __io_import_rw_buffer(rw, req, io, issue_flags);
        if (unlikely(ret < 0))
                return ret;
 
@@ -207,7 +207,7 @@ static int io_prep_rw_setup(struct io_kiocb *req, int ddir, bool do_import)
                return 0;
 
        rw = req->async_data;
-       return io_import_iovec(ddir, req, rw, 0);
+       return io_import_rw_buffer(ddir, req, rw, 0);
 }
 
 static inline void io_meta_save_state(struct io_async_rw *io)
@@ -845,7 +845,7 @@ static int __io_read(struct io_kiocb *req, unsigned int issue_flags)
        loff_t *ppos;
 
        if (io_do_buffer_select(req)) {
-               ret = io_import_iovec(ITER_DEST, req, io, issue_flags);
+               ret = io_import_rw_buffer(ITER_DEST, req, io, issue_flags);
                if (unlikely(ret < 0))
                        return ret;
        }