shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

io_uring: use kiocb_{start,end}_write() helpers

Browse Source 
[ Upstream commit e484fd73f4 ]

Use helpers instead of the open coded dance to silence lockdep warnings.

Suggested-by: Jan Kara <jack@suse.cz>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Message-Id: <20230817141337.1025891-5-amir73il@gmail.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Stable-dep-of: 1d60d74e8526 ("io_uring/rw: fix missing NOWAIT check for O_DIRECT start write")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Amir Goldstein
2023-08-17 17:13:34 +03:00
committed by Greg Kroah-Hartman
parent 6d42982ad0
commit 0ed78d3a29
1 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
io_uring/rw.c
View File

@@ -222,15 +222,10 @@ static bool io_rw_should_reissue(struct io_kiocb *req)
static void io_req_end_write(struct io_kiocb *req) static void io_req_end_write(struct io_kiocb *req)
{ {
/*
* Tell lockdep we inherited freeze protection from submission
* thread.
*/
if (req->flags & REQ_F_ISREG) { if (req->flags & REQ_F_ISREG) {
struct super_block *sb = file_inode(req->file)->i_sb; struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw);
__sb_writers_acquired(sb, SB_FREEZE_WRITE); kiocb_end_write(&rw->kiocb);
sb_end_write(sb);
} }
} }
@@ -897,18 +892,8 @@ int io_write(struct io_kiocb *req, unsigned int issue_flags)
return ret; return ret;
} }
/* if (req->flags & REQ_F_ISREG)
* Open-code file_start_write here to grab freeze protection, kiocb_start_write(kiocb);
* which will be released by another thread in
* io_complete_rw(). Fool lockdep by telling it the lock got
* released so that it doesn't complain about the held lock when
* we return to userspace.
*/
if (req->flags & REQ_F_ISREG) {
sb_start_write(file_inode(req->file)->i_sb);
__sb_writers_release(file_inode(req->file)->i_sb,
SB_FREEZE_WRITE);
}
kiocb->ki_flags |= IOCB_WRITE; kiocb->ki_flags |= IOCB_WRITE;
if (likely(req->file->f_op->write_iter)) if (likely(req->file->f_op->write_iter))