->addr of `io_mapped_buf` stores the start address of userspace fixed
buffer. `io_mapped_buf` will be extended for covering kernel buffer,
so rename ->ubuf as ->addr.
Signed-off-by: Ming Lei <ming.lei@xxxxxxxxxx>
---
io_uring/fdinfo.c | 2 +-
io_uring/rsrc.c | 6 +++---
io_uring/rsrc.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/io_uring/fdinfo.c b/io_uring/fdinfo.c
index 9ca95f877312..1fd05e78ce15 100644
--- a/io_uring/fdinfo.c
+++ b/io_uring/fdinfo.c
@@ -223,7 +223,7 @@ __cold void io_uring_show_fdinfo(struct seq_file *m, struct file *file)
if (ctx->buf_table.nodes[i])
buf = ctx->buf_table.nodes[i]->buf;
if (buf)
- seq_printf(m, "%5u: 0x%llx/%u\n", i, buf->ubuf, buf->len);
+ seq_printf(m, "%5u: 0x%llx/%u\n", i, buf->addr, buf->len);
else
seq_printf(m, "%5u: <none>\n", i);
}
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
index a4a553bbbbfa..f57c4d295f09 100644
--- a/io_uring/rsrc.c
+++ b/io_uring/rsrc.c
@@ -765,7 +765,7 @@ static struct io_rsrc_node *io_sqe_buffer_register(struct io_ring_ctx *ctx,
size = iov->iov_len;
/* store original address for later verification */
- imu->ubuf = (unsigned long) iov->iov_base;
+ imu->addr = (unsigned long) iov->iov_base;
imu->len = iov->iov_len;
imu->nr_bvecs = nr_pages;
imu->folio_shift = PAGE_SHIFT;
@@ -877,14 +877,14 @@ int io_import_fixed(int ddir, struct iov_iter *iter,
if (unlikely(check_add_overflow(buf_addr, (u64)len, &buf_end)))
return -EFAULT;
/* not inside the mapped region */
- if (unlikely(buf_addr < imu->ubuf || buf_end > (imu->ubuf + imu->len)))
+ if (unlikely(buf_addr < imu->addr || buf_end > (imu->addr + imu->len)))
return -EFAULT;
/*
* Might not be a start of buffer, set size appropriately
* and advance us to the beginning.
*/
- offset = buf_addr - imu->ubuf;
+ offset = buf_addr - imu->addr;
iov_iter_bvec(iter, ddir, imu->bvec, imu->nr_bvecs, offset + len);
if (offset) {
diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h
index 0867dc304f4f..c8a4db4721ca 100644
--- a/io_uring/rsrc.h
+++ b/io_uring/rsrc.h
@@ -29,7 +29,7 @@ struct io_rsrc_node {
};
struct io_mapped_buf {
- u64 ubuf;
+ u64 addr;
unsigned int len;
unsigned int nr_bvecs;
unsigned int folio_shift;
--
2.47.0
