Commit a502e727 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'io_uring-6.10-20240621' of git://git.kernel.dk/linux

Pull io_uring fix from Jens Axboe:
 "Just a single cleanup for the fixed buffer iov_iter import.

  More cosmetic than anything else, but let's get it cleaned up as it's
  confusing"

* tag 'io_uring-6.10-20240621' of git://git.kernel.dk/linux:
  io_uring/rsrc: fix incorrect assignment of iter->nr_segs in io_import_fixed
parents ffdf504c a23800f0
...@@ -1068,7 +1068,6 @@ int io_import_fixed(int ddir, struct iov_iter *iter, ...@@ -1068,7 +1068,6 @@ int io_import_fixed(int ddir, struct iov_iter *iter,
* branch doesn't expect non PAGE_SIZE'd chunks. * branch doesn't expect non PAGE_SIZE'd chunks.
*/ */
iter->bvec = bvec; iter->bvec = bvec;
iter->nr_segs = bvec->bv_len;
iter->count -= offset; iter->count -= offset;
iter->iov_offset = offset; iter->iov_offset = offset;
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment