diff options
author | Darrick J. Wong <djwong@kernel.org> | 2022-07-14 11:15:24 -0700 |
---|---|---|
committer | Darrick J. Wong <djwong@kernel.org> | 2022-10-14 14:17:08 -0700 |
commit | b1aad4d2c3cddf244ca1a661f2e8ad7a22dd0b69 (patch) | |
tree | aa9c361a5ad9b0b9cf2a54f9a42661c013497fd8 /fs/xfs/xfs_rtalloc.c | |
parent | 7a55e2bc5e003fb707e14e748087a3d8ad6ab28b (diff) |
xfs: remove XFS_ILOCK_RT*refactor-rt-locking_2022-10-14
Now that we've centralized the realtime metadata locking routines, get
rid of the ILOCK subclasses since we now use explicit lockdep classes.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Diffstat (limited to 'fs/xfs/xfs_rtalloc.c')
-rw-r--r-- | fs/xfs/xfs_rtalloc.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index 11bea1c60eda..c131738efd0f 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c @@ -1376,8 +1376,7 @@ __xfs_rt_iget( */ static inline int xfs_rtmount_iread_extents( - struct xfs_inode *ip, - unsigned int lock_class) + struct xfs_inode *ip) { struct xfs_trans *tp; int error; @@ -1386,7 +1385,7 @@ xfs_rtmount_iread_extents( if (error) return error; - xfs_ilock(ip, XFS_ILOCK_EXCL | lock_class); + xfs_ilock(ip, XFS_ILOCK_EXCL); error = xfs_iread_extents(tp, ip, XFS_DATA_FORK); if (error) @@ -1399,7 +1398,7 @@ xfs_rtmount_iread_extents( } out_unlock: - xfs_iunlock(ip, XFS_ILOCK_EXCL | lock_class); + xfs_iunlock(ip, XFS_ILOCK_EXCL); xfs_trans_cancel(tp); return error; } @@ -1424,7 +1423,7 @@ xfs_rtmount_inodes( return error; ASSERT(mp->m_rbmip != NULL); - error = xfs_rtmount_iread_extents(mp->m_rbmip, XFS_ILOCK_RTBITMAP); + error = xfs_rtmount_iread_extents(mp->m_rbmip); if (error) goto out_rele_bitmap; @@ -1436,7 +1435,7 @@ xfs_rtmount_inodes( goto out_rele_bitmap; ASSERT(mp->m_rsumip != NULL); - error = xfs_rtmount_iread_extents(mp->m_rsumip, XFS_ILOCK_RTSUM); + error = xfs_rtmount_iread_extents(mp->m_rsumip); if (error) goto out_rele_summary; |