From 3884b83dff245e41def99ceacca8ed2056baf0a8 Mon Sep 17 00:00:00 2001

From: Jens Axboe <axboe@kernel.dk>

Date: Mon, 25 Oct 2021 13:45:12 -0600

Subject: [PATCH] io_uring: don't assign write hint in the read path

Git-commit: 3884b83dff245e41def99ceacca8ed2056baf0a8

Patch-mainline: v5.16-rc1

References: bsc#1205205

Move this out of the generic read/write prep path, and place it in the

write specific kiocb setup instead.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Signed-off-by: Gabriel Krisman Bertazi <krisman@suse.de>

---

 fs/io_uring.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c

index bba2f77ae7e7..d001cd7a6c51 100644

--- a/fs/io_uring.c

+++ b/fs/io_uring.c

@@ -2825,7 +2825,6 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe)

 		req->flags |= REQ_F_CUR_POS;

 		kiocb->ki_pos = file->f_pos;

 	}

-	kiocb->ki_hint = ki_hint_validate(file_write_hint(file));

 	kiocb->ki_flags = iocb_flags(file);

 	ret = kiocb_set_rw_flags(kiocb, READ_ONCE(sqe->rw_flags));

 	if (unlikely(ret))

@@ -3568,6 +3567,7 @@ static int io_write_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

 {

 	if (unlikely(!(req->file->f_mode & FMODE_WRITE)))

 		return -EBADF;

+	req->rw.kiocb.ki_hint = ki_hint_validate(file_write_hint(req->file));

 	return io_prep_rw(req, sqe);

 }

-- 

2.35.3