Signed-off-by: Pavel Reichl <preichl@xxxxxxxxxx> Suggested-by: Dave Chinner <dchinner@xxxxxxxxxx> --- fs/xfs/xfs_bmap_util.c | 4 ++-- fs/xfs/xfs_file.c | 2 +- fs/xfs/xfs_iops.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c index ae0bccb2288f..377389fadf5a 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -1066,7 +1066,7 @@ xfs_collapse_file_space( bool done = false; ASSERT(xfs_is_iolocked(ip, XFS_IOLOCK_EXCL)); - ASSERT(xfs_isilocked(ip, XFS_MMAPLOCK_EXCL)); + ASSERT(xfs_is_mmaplocked(ip, XFS_MMAPLOCK_EXCL)); trace_xfs_collapse_file_space(ip); @@ -1134,7 +1134,7 @@ xfs_insert_file_space( bool done = false; ASSERT(xfs_is_iolocked(ip, XFS_IOLOCK_EXCL)); - ASSERT(xfs_isilocked(ip, XFS_MMAPLOCK_EXCL)); + ASSERT(xfs_is_mmaplocked(ip, XFS_MMAPLOCK_EXCL)); trace_xfs_insert_file_space(ip); diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 9b3958ca73d9..a4dbd9a6f45a 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -749,7 +749,7 @@ xfs_break_dax_layouts( { struct page *page; - ASSERT(xfs_isilocked(XFS_I(inode), XFS_MMAPLOCK_EXCL)); + ASSERT(xfs_is_mmaplocked(XFS_I(inode), XFS_MMAPLOCK_EXCL)); page = dax_layout_busy_page(inode->i_mapping); if (!page) diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index aad255521514..67a0f940b30e 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -866,7 +866,7 @@ xfs_setattr_size( bool did_zeroing = false; ASSERT(xfs_is_iolocked(ip, XFS_IOLOCK_EXCL)); - ASSERT(xfs_isilocked(ip, XFS_MMAPLOCK_EXCL)); + ASSERT(xfs_is_mmaplocked(ip, XFS_MMAPLOCK_EXCL)); ASSERT(S_ISREG(inode->i_mode)); ASSERT((iattr->ia_valid & (ATTR_UID|ATTR_GID|ATTR_ATIME|ATTR_ATIME_SET| ATTR_MTIME_SET|ATTR_KILL_PRIV|ATTR_TIMES_SET)) == 0); -- 2.24.1