On Thu 17-08-23 17:13:35, Amir Goldstein wrote:
> Use helpers instead of the open coded dance to silence lockdep warnings.
>
> Suggested-by: Jan Kara <jack@xxxxxxx>
> Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx>
Looks good. Feel free to add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> fs/aio.c | 20 +++-----------------
> 1 file changed, 3 insertions(+), 17 deletions(-)
>
> diff --git a/fs/aio.c b/fs/aio.c
> index 77e33619de40..b3174da80ff6 100644
> --- a/fs/aio.c
> +++ b/fs/aio.c
> @@ -1447,13 +1447,8 @@ static void aio_complete_rw(struct kiocb *kiocb, long res)
> if (kiocb->ki_flags & IOCB_WRITE) {
> struct inode *inode = file_inode(kiocb->ki_filp);
>
> - /*
> - * Tell lockdep we inherited freeze protection from submission
> - * thread.
> - */
> if (S_ISREG(inode->i_mode))
> - __sb_writers_acquired(inode->i_sb, SB_FREEZE_WRITE);
> - file_end_write(kiocb->ki_filp);
> + kiocb_end_write(kiocb);
> }
>
> iocb->ki_res.res = res;
> @@ -1581,17 +1576,8 @@ static int aio_write(struct kiocb *req, const struct iocb *iocb,
> return ret;
> ret = rw_verify_area(WRITE, file, &req->ki_pos, iov_iter_count(&iter));
> if (!ret) {
> - /*
> - * Open-code file_start_write here to grab freeze protection,
> - * which will be released by another thread in
> - * aio_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 (S_ISREG(file_inode(file)->i_mode)) {
> - sb_start_write(file_inode(file)->i_sb);
> - __sb_writers_release(file_inode(file)->i_sb, SB_FREEZE_WRITE);
> - }
> + if (S_ISREG(file_inode(file)->i_mode))
> + kiocb_start_write(req);
> req->ki_flags |= IOCB_WRITE;
> aio_rw_done(req, call_write_iter(file, req, &iter));
> }
> --
> 2.34.1
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
