Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Commit e484fd73f4bdcb00c2188100c2d84e9f3f5c9f7d upstream.

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>
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 Kreciorek
parent cf82fd7a6a
commit da59b97e30
1 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
io_uring/io_uring.c
View file

@ -2688,15 +2688,10 @@ out:
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 = &req->rw;
__sb_writers_acquired(sb, SB_FREEZE_WRITE); kiocb_end_write(&rw->kiocb);
sb_end_write(sb);
} }
} }
@ -3789,18 +3784,8 @@ static int io_write(struct io_kiocb *req, unsigned int issue_flags)
if (unlikely(ret)) if (unlikely(ret))
goto out_free; goto out_free;
/* 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 (req->file->f_op->write_iter) if (req->file->f_op->write_iter)