On Tue, Feb 11, 2020 at 11:10:18PM +0100, Pavel Reichl wrote: > Remove mrlock_t as it does not provide any extra value over rw_semaphores. > Make i_lock and i_mmaplock native rw_semaphores and replace mr*() functions > with native rwsem calls. wrapping at 68-72 columns. > Signed-off-by: Pavel Reichl <preichl@xxxxxxxxxx> Subject "xfs: replace mrlock_t with rw_semaphores" or "xfs: remove mrlock_t wrappers" > diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h > index 3d7ce355407d..8b30f82b9dc0 100644 > --- a/fs/xfs/xfs_inode.h > +++ b/fs/xfs/xfs_inode.h > @@ -9,6 +9,8 @@ > #include "xfs_inode_buf.h" > #include "xfs_inode_fork.h" > > +#include <linux/rwsem.h> > + Linux specific includes belong in fs/xfs/xfs_linux.h, not random XFS header files. Hmmm.... > diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h > index 8738bb03f253..921a3eb093ed 100644 > --- a/fs/xfs/xfs_linux.h > +++ b/fs/xfs/xfs_linux.h > @@ -22,7 +22,6 @@ typedef __u32 xfs_nlink_t; > #include "xfs_types.h" > > #include "kmem.h" > -#include "mrlock.h" .... that's where rwsem.h currently gets included (via mrlock.h) into the XFS codebase. IOWs, the "#include <linux/rwsem.h>" should replace this include, not get moved to xfs_inode.h. Otherwise the patch looks fine. Cheers, Dave. -- Dave Chinner david@xxxxxxxxxxxxx
