tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'io_uring-6.0-2022-09-16' of git://git.kernel.dk/linux-block

Pull io_uring fixes from Jens Axboe:
"Two small patches:

- Fix using an unsigned type for the return value, introduced in this
release (Pavel)

- Stable fix for a missing check for a fixed file on put (me)"

* tag 'io_uring-6.0-2022-09-16' of git://git.kernel.dk/linux-block:
io_uring/msg_ring: check file type before putting
io_uring/rw: fix error'ed retry return values

Linus Torvalds 0158137d 5763d7f2

+3 -2
+2 -1
io_uring/msg_ring.c
··· 165 165 req_set_fail(req); 166 166 io_req_set_res(req, ret, 0); 167 167 /* put file to avoid an attempt to IOPOLL the req */ 168 - io_put_file(req->file); 168 + if (!(req->flags & REQ_F_FIXED_FILE)) 169 + io_put_file(req->file); 169 170 req->file = NULL; 170 171 return IOU_OK; 171 172 }
+1 -1
io_uring/rw.c
··· 206 206 return false; 207 207 } 208 208 209 - static inline unsigned io_fixup_rw_res(struct io_kiocb *req, unsigned res) 209 + static inline int io_fixup_rw_res(struct io_kiocb *req, long res) 210 210 { 211 211 struct io_async_rw *io = req->async_data; 212 212