projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/edid/firmware: Add built-in edid/1280x720.bin firmware
[platform/kernel/linux-starfive.git]
/
io_uring
/
rw.c
diff --git
a/io_uring/rw.c
b/io_uring/rw.c
index
bb47cc4
..
0218fae
100644
(file)
--- a/
io_uring/rw.c
+++ b/
io_uring/rw.c
@@
-548,12
+548,12
@@
static inline int io_rw_prep_async(struct io_kiocb *req, int rw)
int io_readv_prep_async(struct io_kiocb *req)
{
int io_readv_prep_async(struct io_kiocb *req)
{
- return io_rw_prep_async(req,
READ
);
+ return io_rw_prep_async(req,
ITER_DEST
);
}
int io_writev_prep_async(struct io_kiocb *req)
{
}
int io_writev_prep_async(struct io_kiocb *req)
{
- return io_rw_prep_async(req,
WRIT
E);
+ return io_rw_prep_async(req,
ITER_SOURC
E);
}
/*
}
/*
@@
-704,7
+704,7
@@
int io_read(struct io_kiocb *req, unsigned int issue_flags)
loff_t *ppos;
if (!req_has_async_data(req)) {
loff_t *ppos;
if (!req_has_async_data(req)) {
- ret = io_import_iovec(
READ
, req, &iovec, s, issue_flags);
+ ret = io_import_iovec(
ITER_DEST
, req, &iovec, s, issue_flags);
if (unlikely(ret < 0))
return ret;
} else {
if (unlikely(ret < 0))
return ret;
} else {
@@
-716,7
+716,7
@@
int io_read(struct io_kiocb *req, unsigned int issue_flags)
* buffers, as we dropped the selected one before retry.
*/
if (io_do_buffer_select(req)) {
* buffers, as we dropped the selected one before retry.
*/
if (io_do_buffer_select(req)) {
- ret = io_import_iovec(
READ
, req, &iovec, s, issue_flags);
+ ret = io_import_iovec(
ITER_DEST
, req, &iovec, s, issue_flags);
if (unlikely(ret < 0))
return ret;
}
if (unlikely(ret < 0))
return ret;
}
@@
-851,7
+851,7
@@
int io_write(struct io_kiocb *req, unsigned int issue_flags)
loff_t *ppos;
if (!req_has_async_data(req)) {
loff_t *ppos;
if (!req_has_async_data(req)) {
- ret = io_import_iovec(
WRIT
E, req, &iovec, s, issue_flags);
+ ret = io_import_iovec(
ITER_SOURC
E, req, &iovec, s, issue_flags);
if (unlikely(ret < 0))
return ret;
} else {
if (unlikely(ret < 0))
return ret;
} else {
@@
-1055,7
+1055,11
@@
int io_do_iopoll(struct io_ring_ctx *ctx, bool force_nonspin)
continue;
req->cqe.flags = io_put_kbuf(req, 0);
continue;
req->cqe.flags = io_put_kbuf(req, 0);
- __io_fill_cqe_req(req->ctx, req);
+ if (unlikely(!__io_fill_cqe_req(ctx, req))) {
+ spin_lock(&ctx->completion_lock);
+ io_req_cqe_overflow(req);
+ spin_unlock(&ctx->completion_lock);
+ }
}
if (unlikely(!nr_events))
}
if (unlikely(!nr_events))