XFS has an mrlock wrapper around the rwsem which adds only the functionality of knowing whether the rwsem is currently held in read or write mode. Both regular rwsems and rt-rwsems know this, they just don't expose it as an API. By adding that, we can remove the XFS mrlock as well as improving the debug assertions for the mmap_lock when lockdep is disabled. I'd like acks from the locking people, then it probably should go upstream through the XFS tree since that's where the patch series touches the most code. Matthew Wilcox (Oracle) (5): locking: Add rwsem_is_write_locked() mm: Use rwsem_is_write_locked in mmap_assert_write_locked xfs: Use rwsem_is_write_locked() xfs: Remove mrlock wrapper xfs: Stop using lockdep to assert that locks are held fs/xfs/mrlock.h | 78 --------------------------------------- fs/xfs/xfs_inode.c | 61 ++++++++++-------------------- fs/xfs/xfs_inode.h | 2 +- fs/xfs/xfs_iops.c | 4 +- fs/xfs/xfs_linux.h | 2 +- fs/xfs/xfs_super.c | 4 +- include/linux/mmap_lock.h | 2 +- include/linux/rwbase_rt.h | 5 +++ include/linux/rwsem.h | 10 +++++ 9 files changed, 40 insertions(+), 128 deletions(-) delete mode 100644 fs/xfs/mrlock.h -- 2.40.1
