diff options
| author | Amir Goldstein <amir73il@gmail.com> | 2023-08-17 17:13:34 +0300 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2023-08-21 17:27:26 +0200 |
| commit | e484fd73f4bdcb00c2188100c2d84e9f3f5c9f7d (patch) | |
| tree | 4f1eb07ff3e6df03637ca2f17ed62e0eecb27569 /io_uring | |
| parent | ed0360bbab72b829437b67ebb2f9cfac19f59dfe (diff) | |
| download | lwn-e484fd73f4bdcb00c2188100c2d84e9f3f5c9f7d.tar.gz lwn-e484fd73f4bdcb00c2188100c2d84e9f3f5c9f7d.zip | |
io_uring: use kiocb_{start,end}_write() helpers
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>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/rw.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/io_uring/rw.c b/io_uring/rw.c index 749ebd565839..9581b90cb459 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -222,15 +222,10 @@ static bool io_rw_should_reissue(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) { - 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); - sb_end_write(sb); + kiocb_end_write(&rw->kiocb); } } @@ -902,18 +897,8 @@ int io_write(struct io_kiocb *req, unsigned int issue_flags) return ret; } - /* - * 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 (likely(req->file->f_op->write_iter)) |