Skip to content

Commit f7301f8

Browse files
committed
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
2 parents 26fef99 + 51a4598 commit f7301f8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

io_uring/net.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ static inline bool io_recv_finish(struct io_kiocb *req, int *ret,
821821
if (sr->flags & IORING_RECVSEND_BUNDLE) {
822822
size_t this_ret = *ret - sr->done_io;
823823

824-
cflags |= io_put_kbufs(req, *ret, io_bundle_nbufs(kmsg, this_ret),
824+
cflags |= io_put_kbufs(req, this_ret, io_bundle_nbufs(kmsg, this_ret),
825825
issue_flags);
826826
if (sr->retry)
827827
cflags = req->cqe.flags | (cflags & CQE_F_MASK);

0 commit comments

Comments
 (0)