Commit 81cf17cd authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring/kbuf: rename struct io_uring_buf_reg 'pad' to'flags' 



In preparation for allowing flags to be set for registration, rename
the padding and use it for that.

Acked-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 25a2c188

include/uapi/linux/io_uring.h

+1 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ struct io_uring_buf_reg { 
	__u64	ring_addr;

	__u32	ring_entries;

	__u16	bgid;

	__u16	pad;

	__u16	flags;

	__u64	resv[3];

};

io_uring/kbuf.c

+6 −2
Original line number Diff line number Diff line
@@ -494,7 +494,9 @@ int io_register_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg) 
	if (copy_from_user(&reg, arg, sizeof(reg)))

		return -EFAULT;



	if (reg.pad || reg.resv[0] || reg.resv[1] || reg.resv[2])

	if (reg.resv[0] || reg.resv[1] || reg.resv[2])

		return -EINVAL;

	if (reg.flags)

		return -EINVAL;

	if (!reg.ring_addr)

		return -EFAULT;
@@ -544,7 +546,9 @@ int io_unregister_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg) 


	if (copy_from_user(&reg, arg, sizeof(reg)))

		return -EFAULT;

	if (reg.pad || reg.resv[0] || reg.resv[1] || reg.resv[2])

	if (reg.resv[0] || reg.resv[1] || reg.resv[2])

		return -EINVAL;

	if (reg.flags)

		return -EINVAL;



	bl = io_buffer_get_list(ctx, reg.bgid);