Commit f7301f85 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-6.16-20250621' of git://git.kernel.dk/linux 

Pull io_uring fix from Jens Axboe:
 "A single fix to hopefully wrap up the saga of receive bundles"

* tag 'io_uring-6.16-20250621' of git://git.kernel.dk/linux:
  io_uring/net: always use current transfer count for buffer put
parents 26fef998 51a4598a

io_uring/net.c

+1 −1
Original line number Diff line number Diff line
@@ -821,7 +821,7 @@ static inline bool io_recv_finish(struct io_kiocb *req, int *ret, 
	if (sr->flags & IORING_RECVSEND_BUNDLE) {

		size_t this_ret = *ret - sr->done_io;



		cflags |= io_put_kbufs(req, *ret, io_bundle_nbufs(kmsg, this_ret),

		cflags |= io_put_kbufs(req, this_ret, io_bundle_nbufs(kmsg, this_ret),

				      issue_flags);

		if (sr->retry)

			cflags = req->cqe.flags | (cflags & CQE_F_MASK);