From: Anuj Gupta Give io_import_reg_buf() the import flags argument and drop the __io_import_reg_buf() variant, which only existed to pass them. No functional change. Suggested-by: Christoph Hellwig Signed-off-by: Anuj Gupta --- io_uring/net.c | 6 +++--- io_uring/rsrc.c | 6 +++--- io_uring/rsrc.h | 13 +++---------- io_uring/rw.c | 5 +++-- io_uring/uring_cmd.c | 2 +- 5 files changed, 13 insertions(+), 19 deletions(-) diff --git a/io_uring/net.c b/io_uring/net.c index 050ed274170a..63089744d43e 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -644,7 +644,7 @@ int io_send(struct io_kiocb *req, unsigned int issue_flags) if (req->flags & REQ_F_IMPORT_BUFFER) { ret = io_import_reg_buf(req, &kmsg->msg.msg_iter, (u64)(uintptr_t)sr->buf, sr->len, - ITER_SOURCE, issue_flags); + ITER_SOURCE, issue_flags, 0); if (unlikely(ret)) return ret; req->flags &= ~REQ_F_IMPORT_BUFFER; @@ -1216,7 +1216,7 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags) if (req->flags & REQ_F_IMPORT_BUFFER) { ret = io_import_reg_buf(req, &kmsg->msg.msg_iter, (u64)(uintptr_t)sr->buf, sr->len, - ITER_DEST, issue_flags); + ITER_DEST, issue_flags, 0); if (unlikely(ret)) { kmsg->msg.msg_inq = -1; sel.buf_list = NULL; @@ -1509,7 +1509,7 @@ static int io_send_zc_import(struct io_kiocb *req, if (!(sr->flags & IORING_SEND_VECTORIZED)) { ret = io_import_reg_buf(notif, &kmsg->msg.msg_iter, (u64)(uintptr_t)sr->buf, sr->len, - ITER_SOURCE, issue_flags); + ITER_SOURCE, issue_flags, 0); } else { unsigned uvec_segs = kmsg->msg.msg_iter.nr_segs; diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c index d64228b0e19e..1abfbb86dae8 100644 --- a/io_uring/rsrc.c +++ b/io_uring/rsrc.c @@ -1365,9 +1365,9 @@ inline struct io_rsrc_node *io_find_buf_node(struct io_kiocb *req, return NULL; } -int __io_import_reg_buf(struct io_kiocb *req, struct iov_iter *iter, - u64 buf_addr, size_t len, int ddir, - unsigned issue_flags, unsigned import_flags) +int io_import_reg_buf(struct io_kiocb *req, struct iov_iter *iter, + u64 buf_addr, size_t len, int ddir, + unsigned issue_flags, unsigned import_flags) { struct io_rsrc_node *node; diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h index 418d236152ff..6226c7862d4e 100644 --- a/io_uring/rsrc.h +++ b/io_uring/rsrc.h @@ -66,21 +66,14 @@ int io_rsrc_data_alloc(struct io_rsrc_data *data, unsigned nr); struct io_rsrc_node *io_find_buf_node(struct io_kiocb *req, unsigned issue_flags); -int __io_import_reg_buf(struct io_kiocb *req, struct iov_iter *iter, - u64 buf_addr, size_t len, int ddir, - unsigned issue_flags, unsigned import_flags); +int io_import_reg_buf(struct io_kiocb *req, struct iov_iter *iter, + u64 buf_addr, size_t len, int ddir, + unsigned issue_flags, unsigned import_flags); int __io_import_reg_vec(int ddir, struct iov_iter *iter, struct io_kiocb *req, struct iou_vec *vec, unsigned nr_iovs, unsigned issue_flags, unsigned import_flags); -static inline int io_import_reg_buf(struct io_kiocb *req, struct iov_iter *iter, - u64 buf_addr, size_t len, int ddir, - unsigned issue_flags) -{ - return __io_import_reg_buf(req, iter, buf_addr, len, ddir, issue_flags, 0); -} - static inline int io_import_reg_vec(int ddir, struct iov_iter *iter, struct io_kiocb *req, struct iou_vec *vec, unsigned nr_iovs, unsigned issue_flags) diff --git a/io_uring/rw.c b/io_uring/rw.c index d33b925a848e..71782a23e16b 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -360,8 +360,9 @@ static int io_init_rw_fixed(struct io_kiocb *req, unsigned int issue_flags, int ret; if (!io->bytes_done) { - ret = __io_import_reg_buf(req, &io->iter, rw->addr, rw->len, ddir, - issue_flags, IO_REGBUF_IMPORT_ALLOW_DMABUF); + ret = io_import_reg_buf(req, &io->iter, rw->addr, rw->len, ddir, + issue_flags, + IO_REGBUF_IMPORT_ALLOW_DMABUF); if (ret) return ret; iov_iter_save_state(&io->iter, &io->iter_state); diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c index 73b606899833..45c9c845f5d0 100644 --- a/io_uring/uring_cmd.c +++ b/io_uring/uring_cmd.c @@ -279,7 +279,7 @@ int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw, if (WARN_ON_ONCE(!(ioucmd->flags & IORING_URING_CMD_FIXED))) return -EINVAL; - return io_import_reg_buf(req, iter, ubuf, len, rw, issue_flags); + return io_import_reg_buf(req, iter, ubuf, len, rw, issue_flags, 0); } EXPORT_SYMBOL_GPL(io_uring_cmd_import_fixed); -- 2.43.0