Skip to content

Commit 8f73712

Browse files
amir73ilbrauner
authored andcommitted
ovl: use kiocb_{start,end}_write() helpers
Use helpers instead of the open coded dance to silence lockdep warnings. Suggested-by: Jan Kara <[email protected]> Signed-off-by: Amir Goldstein <[email protected]> Reviewed-by: Jan Kara <[email protected]> Reviewed-by: Jens Axboe <[email protected]> Message-Id: <[email protected]> Signed-off-by: Christian Brauner <[email protected]>
1 parent 8c3cfa8 commit 8f73712

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

fs/overlayfs/file.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -290,10 +290,7 @@ static void ovl_aio_cleanup_handler(struct ovl_aio_req *aio_req)
290290
if (iocb->ki_flags & IOCB_WRITE) {
291291
struct inode *inode = file_inode(orig_iocb->ki_filp);
292292

293-
/* Actually acquired in ovl_write_iter() */
294-
__sb_writers_acquired(file_inode(iocb->ki_filp)->i_sb,
295-
SB_FREEZE_WRITE);
296-
file_end_write(iocb->ki_filp);
293+
kiocb_end_write(iocb);
297294
ovl_copyattr(inode);
298295
}
299296

@@ -409,17 +406,14 @@ static ssize_t ovl_write_iter(struct kiocb *iocb, struct iov_iter *iter)
409406
if (!aio_req)
410407
goto out;
411408

412-
file_start_write(real.file);
413-
/* Pacify lockdep, same trick as done in aio_write() */
414-
__sb_writers_release(file_inode(real.file)->i_sb,
415-
SB_FREEZE_WRITE);
416409
aio_req->fd = real;
417410
real.flags = 0;
418411
aio_req->orig_iocb = iocb;
419412
kiocb_clone(&aio_req->iocb, iocb, real.file);
420413
aio_req->iocb.ki_flags = ifl;
421414
aio_req->iocb.ki_complete = ovl_aio_rw_complete;
422415
refcount_set(&aio_req->ref, 2);
416+
kiocb_start_write(&aio_req->iocb);
423417
ret = vfs_iocb_iter_write(real.file, &aio_req->iocb, iter);
424418
ovl_aio_put(aio_req);
425419
if (ret != -EIOCBQUEUED)

0 commit comments

Comments
 (0)