diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-06-21 14:01:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-06-21 14:01:03 -0700 |
| commit | a502e727965dbd735145cff7ec84ad0a6060f9d2 (patch) | |
| tree | 6d30cb3ed16d83bed99740a5d113cfce2a74ac06 | |
| parent | ffdf504cab55743ad55961afae41ad4a079e74bb (diff) | |
| parent | a23800f08a60787dfbf2b87b2e6ed411cb629859 (diff) | |
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
| -rw-r--r-- | io_uring/rsrc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c index edb9c5baf2e2..570bfa6a31aa 100644 --- a/io_uring/rsrc.c +++ b/io_uring/rsrc.c @@ -1068,7 +1068,6 @@ int io_import_fixed(int ddir, struct iov_iter *iter, * branch doesn't expect non PAGE_SIZE'd chunks. */ iter->bvec = bvec; - iter->nr_segs = bvec->bv_len; iter->count -= offset; iter->iov_offset = offset; } else { |