diff options
| author | Amir Goldstein <amir73il@gmail.com> | 2023-08-17 17:13:34 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-11-17 14:59:37 +0100 |
| commit | f336622838e595868da703c4de4f892a3320de57 (patch) | |
| tree | 146a416af9c7e536badc8d21752e7dc758a5adf3 /io_uring | |
| parent | f83a32351efd6c6676fdabd5ab0e680500bc48e0 (diff) | |
| download | linux-f336622838e595868da703c4de4f892a3320de57.tar.gz linux-f336622838e595868da703c4de4f892a3320de57.tar.bz2 linux-f336622838e595868da703c4de4f892a3320de57.zip | |
io_uring: use kiocb_{start,end}_write() helpers
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>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/io_uring.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index ec55f2788ac6..a6afdea5cfd8 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -2669,15 +2669,10 @@ out: 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) { - struct super_block *sb = file_inode(req->file)->i_sb; + struct io_rw *rw = &req->rw; - __sb_writers_acquired(sb, SB_FREEZE_WRITE); - sb_end_write(sb); + kiocb_end_write(&rw->kiocb); } } @@ -3770,18 +3765,8 @@ static int io_write(struct io_kiocb *req, unsigned int issue_flags) if (unlikely(ret)) goto out_free; - /* - * Open-code file_start_write here to grab freeze protection, - * 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); - } + if (req->flags & REQ_F_ISREG) + kiocb_start_write(kiocb); kiocb->ki_flags |= IOCB_WRITE; if (req->file->f_op->write_iter) |