xfs: Remove wrappers for some semaphores
v3 cover xfs: Remove wrappers for some semaphores
Remove some wrappers that we have in XFS around the read-write semaphore locks.
The goal of this cleanup is to remove mrlock_t structure and its mr*() wrapper functions and replace it with native rw_semaphore type and its native calls.
Pavel Reichl (4):
xfs: Refactor xfs_isilocked()
xfs: Fix WS in xfs_isilocked() calls
xfs: Fix bug when checking diff. locks
xfs: Replace mrlock_t by rw_semaphore
fs/xfs/libxfs/xfs_bmap.c | 8 ++-- fs/xfs/mrlock.h | 78 ----------------------------------- fs/xfs/xfs_file.c | 3 +- fs/xfs/xfs_inode.c | 87 +++++++++++++++++++++++++--------------- fs/xfs/xfs_inode.h | 8 ++-- fs/xfs/xfs_iops.c | 4 +- fs/xfs/xfs_linux.h | 1 - fs/xfs/xfs_qm.c | 2 +- fs/xfs/xfs_super.c | 6 +-- 9 files changed, 72 insertions(+), 125 deletions(-) delete mode 100644 fs/xfs/mrlock.h
Signature · 1 line
2.24.1
PATCH v3 1/4 xfs: Refactor xfs_isilocked()
Refactor xfs_isilocked() to use newly introduced __xfs_rwsem_islocked(). __xfs_rwsem_islocked() is a helper function which encapsulates checking state of rw_semaphores hold by inode.
--- fs/xfs/xfs_inode.c | 48 +++++++++++++++++++++++++++++++++------------- fs/xfs/xfs_inode.h | 2 +- 2 files changed, 36 insertions(+), 14 deletions(-)
fs/xfs/xfs_inode.c +35 -13
@@ -345,32 +345,54 @@ xfs_ilock_demote( }#if defined(DEBUG ) || defined(XFS_WARN ) -int +static inline bool +__xfs_rwsem_islocked ( +struct rw_semaphore *rwsem, +bool shared, +bool excl) +{ +bool locked = false; + +if (!rwsem_is_locked (rwsem)) +return false; + +if (!debug_locks) +return true; + +if (shared) + locked =lockdep_is_held_type (rwsem,0 ); + +if (excl) + locked |=lockdep_is_held_type (rwsem,1 ); + +return locked; +} + +bool xfs_isilocked ( -xfs_inode_t *ip, +struct xfs_inode *ip,uint lock_flags) {if (lock_flags & (XFS_ILOCK_EXCL |XFS_ILOCK_SHARED )) { -if (!(lock_flags &XFS_ILOCK_SHARED )) -return !!ip->i_lock.mr_writer; -return rwsem_is_locked (&ip->i_lock.mr_lock); +return __xfs_rwsem_islocked (&ip->i_lock.mr_lock, + (lock_flags &XFS_ILOCK_SHARED ), + (lock_flags &XFS_ILOCK_EXCL )); }if (lock_flags & (XFS_MMAPLOCK_EXCL |XFS_MMAPLOCK_SHARED )) { -if (!(lock_flags &XFS_MMAPLOCK_SHARED )) -return !!ip->i_mmaplock.mr_writer; -return rwsem_is_locked (&ip->i_mmaplock.mr_lock); +return __xfs_rwsem_islocked (&ip->i_mmaplock.mr_lock, + (lock_flags &XFS_MMAPLOCK_SHARED ), + (lock_flags &XFS_MMAPLOCK_EXCL )); }if (lock_flags & (XFS_IOLOCK_EXCL |XFS_IOLOCK_SHARED )) { -if (!(lock_flags &XFS_IOLOCK_SHARED )) -return !debug_locks || -lockdep_is_held_type (&VFS_I (ip)->i_rwsem,0 ); -return rwsem_is_locked (&VFS_I (ip)->i_rwsem); +return __xfs_rwsem_islocked (&VFS_I (ip)->i_rwsem, + (lock_flags &XFS_IOLOCK_SHARED ), + (lock_flags &XFS_IOLOCK_EXCL )); }ASSERT (0 ); -return 0 ; +return false; }#endif
fs/xfs/xfs_inode.h +1 -1
@@ -416,7 +416,7 @@ void xfs_ilock(xfs_inode_t *, uint);int xfs_ilock_nowait (xfs_inode_t *,uint );void xfs_iunlock (xfs_inode_t *,uint );void xfs_ilock_demote (xfs_inode_t *,uint ); -int xfs_isilocked (xfs_inode_t *,uint ); +bool xfs_isilocked (xfs_inode_t *,uint );uint xfs_ilock_data_map_shared (struct xfs_inode *);uint xfs_ilock_attr_map_shared (struct xfs_inode *);
Signature · 1 line
2.24.1
PATCH v3 2/4 xfs: Fix WS in xfs_isilocked() calls
In reply to Pavel Reichl--- fs/xfs/libxfs/xfs_bmap.c | 2 +- fs/xfs/xfs_file.c | 3 ++- fs/xfs/xfs_inode.c | 6 +++--- fs/xfs/xfs_qm.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-)
fs/xfs/libxfs/xfs_bmap.c +1 -1
@@ -3906,7 +3906,7 @@ xfs_bmapi_read(ASSERT (*nmap >=1 );ASSERT (!(flags & ~(XFS_BMAPI_ATTRFORK |XFS_BMAPI_ENTIRE |XFS_BMAPI_COWFORK ))); -ASSERT (xfs_isilocked (ip,XFS_ILOCK_SHARED |XFS_ILOCK_EXCL )); +ASSERT (xfs_isilocked (ip,XFS_ILOCK_SHARED |XFS_ILOCK_EXCL ));if (XFS_IS_CORRUPT (mp, !xfs_ifork_has_extents (ip, whichfork)) ||XFS_TEST_ERROR (false, mp,XFS_ERRTAG_BMAPIFORMAT )) {
fs/xfs/xfs_file.c +2 -1
@@ -770,7 +770,8 @@ xfs_break_layouts(bool retry;int error; -ASSERT (xfs_isilocked (XFS_I (inode),XFS_IOLOCK_SHARED |XFS_IOLOCK_EXCL )); +ASSERT (xfs_isilocked (XFS_I (inode), +XFS_IOLOCK_SHARED |XFS_IOLOCK_EXCL )); do { retry = false;
fs/xfs/xfs_inode.c +3 -3
@@ -2828,7 +2828,7 @@ static voidxfs_iunpin ( struct xfs_inode *ip) { -ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL |XFS_ILOCK_SHARED )); +ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL |XFS_ILOCK_SHARED ));trace_xfs_inode_unpin_nowait (ip, _RET_IP_);
@@ -3692,7 +3692,7 @@ xfs_iflush(XFS_STATS_INC (mp, xs_iflush_count); -ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL |XFS_ILOCK_SHARED )); +ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL |XFS_ILOCK_SHARED ));ASSERT (xfs_isiflocked (ip));ASSERT (ip->i_d.di_format !=XFS_DINODE_FMT_BTREE || ip->i_d.di_nextents >XFS_IFORK_MAXEXT (ip,XFS_DATA_FORK ));
@@ -3824,7 +3824,7 @@ xfs_iflush_int(struct xfs_dinode *dip;struct xfs_mount *mp = ip->i_mount; -ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL |XFS_ILOCK_SHARED )); +ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL |XFS_ILOCK_SHARED ));ASSERT (xfs_isiflocked (ip));ASSERT (ip->i_d.di_format !=XFS_DINODE_FMT_BTREE || ip->i_d.di_nextents >XFS_IFORK_MAXEXT (ip,XFS_DATA_FORK ));
fs/xfs/xfs_qm.c +1 -1
@@ -1802,7 +1802,7 @@ xfs_qm_vop_chown_reserve(int error; -ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL |XFS_ILOCK_SHARED )); +ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL |XFS_ILOCK_SHARED ));ASSERT (XFS_IS_QUOTA_RUNNING (mp)); delblks = ip->i_delayed_blks;
Signature · 1 line
2.24.1
PATCH v3 3/4 xfs: Fix bug when checking diff. locks
In reply to Pavel Reichlxfs_isilocked() will only check one lock type so it's needed to split the check into 2 calls.
--- fs/xfs/libxfs/xfs_bmap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/xfs/libxfs/xfs_bmap.c +4 -2
@@ -5829,7 +5829,8 @@ xfs_bmap_collapse_extents(if (XFS_FORCED_SHUTDOWN (mp))return -EIO ; -ASSERT (xfs_isilocked (ip,XFS_IOLOCK_EXCL |XFS_ILOCK_EXCL )); +ASSERT (xfs_isilocked (ip,XFS_IOLOCK_EXCL )); +ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL ));if (!(ifp->if_flags &XFS_IFEXTENTS )) { error =xfs_iread_extents (tp, ip, whichfork);
@@ -5946,7 +5947,8 @@ xfs_bmap_insert_extents(if (XFS_FORCED_SHUTDOWN (mp))return -EIO ; -ASSERT (xfs_isilocked (ip,XFS_IOLOCK_EXCL |XFS_ILOCK_EXCL )); +ASSERT (xfs_isilocked (ip,XFS_IOLOCK_EXCL )); +ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL ));if (!(ifp->if_flags &XFS_IFEXTENTS )) { error =xfs_iread_extents (tp, ip, whichfork);
Signature · 1 line
2.24.1
Re: [PATCH v3 3/4] xfs: Fix bug when checking diff. locks
Quoted 2 lines · Pavel Reichl
xfs_isilocked()will only check one lock type so it's needed to split the check into 2 calls.
I think it's worth documenting the apparent intent of these calls; did the old call mean one or the other is locked? (given the '|') or does it mean to test both?
Testing both individually does seem legit. The single caller of each of these functions has already asserted:
ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL));
and then each also does:
xfs_ilock(ip, XFS_ILOCK_EXCL);
before calling these functions, so it is safe and reasonable to assume that both locks are held, and the intent is to test each one.
Oh, and if we look at when the old form got introduced, git blame says ecfea3f0c8c64ce7375f4be4506996968958bd01, and it did:
- ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL)); - ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); - ASSERT(direction == SHIFT_LEFT || direction == SHIFT_RIGHT); + ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL));
so really, this is just reverting that invalid change back to valid individual ASSERTs.
I'll leave it up to Darrick whether he wants to massage the commit log I guess, but please at least add a :
Quoted 31 lines
Suggested-by Dave Chinner <[email protected]>Signed-off-by Pavel Reichl <[email protected]>--- fs/xfs/libxfs/xfs_bmap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)fs/xfs/libxfs/xfs_bmap.c +4
-2@@ -5829,7 +5829,8 @@ xfs_bmap_collapse_extents(if (XFS_FORCED_SHUTDOWN (mp))return -EIO ; -ASSERT (xfs_isilocked (ip,XFS_IOLOCK_EXCL |XFS_ILOCK_EXCL )); +ASSERT (xfs_isilocked (ip,XFS_IOLOCK_EXCL )); +ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL ));if (!(ifp->if_flags &XFS_IFEXTENTS )) { error =xfs_iread_extents (tp, ip, whichfork);@@ -5946,7 +5947,8 @@ xfs_bmap_insert_extents(if (XFS_FORCED_SHUTDOWN (mp))return -EIO ; -ASSERT (xfs_isilocked (ip,XFS_IOLOCK_EXCL |XFS_ILOCK_EXCL )); +ASSERT (xfs_isilocked (ip,XFS_IOLOCK_EXCL )); +ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL ));if (!(ifp->if_flags &XFS_IFEXTENTS )) { error =xfs_iread_extents (tp, ip, whichfork);
Re: [PATCH v3 3/4] xfs: Fix bug when checking diff. locks
Quoted 28 lines · Eric Sandeen
Quoted 2 lines · Pavel Reichl
xfs_isilocked()will only check one lock type so it's needed to split the check into 2 calls.I think it's worth documenting the apparent intent of these calls; did the old call mean one or the other is locked? (given the '|') or does it mean to test both?
Testing both individually does seem legit. The single caller of each of these functions has already asserted:
ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL));and then each also does:
xfs_ilock(ip, XFS_ILOCK_EXCL);before calling these functions, so it is safe and reasonable to assume that both locks are held, and the intent is to test each one.
Oh, and if we look at when the old form got introduced, git blame says
ecfea3f0c8c64ce7375f4be4506996968958bd01, and it did:(quoted diff) +1
-3- ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL)); - ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); - ASSERT(direction == SHIFT_LEFT || direction == SHIFT_RIGHT); + ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL));
Quoted 8 lines
so really, this is just reverting that invalid change back to valid individual ASSERTs.
I'll leave it up to Darrick whether he wants to massage the commit log I guess, but please at least add a :
Fixes ecfea3f0c8c6 ("xfs: split xfs_bmap_shift_extents")Reviewed-by Eric Sandeen <[email protected]>
Yeah, we should've done "one test per assert" back then... :/
And please do massage the commit log.
--D
Quoted 31 lines
Quoted 31 lines
Suggested-by Dave Chinner <[email protected]>Signed-off-by Pavel Reichl <[email protected]>--- fs/xfs/libxfs/xfs_bmap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)fs/xfs/libxfs/xfs_bmap.c +4
-2@@ -5829,7 +5829,8 @@ xfs_bmap_collapse_extents(if (XFS_FORCED_SHUTDOWN (mp))return -EIO ; -ASSERT (xfs_isilocked (ip,XFS_IOLOCK_EXCL |XFS_ILOCK_EXCL )); +ASSERT (xfs_isilocked (ip,XFS_IOLOCK_EXCL )); +ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL ));if (!(ifp->if_flags &XFS_IFEXTENTS )) { error =xfs_iread_extents (tp, ip, whichfork);@@ -5946,7 +5947,8 @@ xfs_bmap_insert_extents(if (XFS_FORCED_SHUTDOWN (mp))return -EIO ; -ASSERT (xfs_isilocked (ip,XFS_IOLOCK_EXCL |XFS_ILOCK_EXCL )); +ASSERT (xfs_isilocked (ip,XFS_IOLOCK_EXCL )); +ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL ));if (!(ifp->if_flags &XFS_IFEXTENTS )) { error =xfs_iread_extents (tp, ip, whichfork);
PATCH v3 4/4 xfs: Replace mrlock_t by rw_semaphore
In reply to Pavel ReichlRemove 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.
--- fs/xfs/mrlock.h | 78 ---------------------------------------------- fs/xfs/xfs_inode.c | 37 +++++++++++----------- fs/xfs/xfs_inode.h | 6 ++-- fs/xfs/xfs_iops.c | 4 +-- fs/xfs/xfs_linux.h | 1 - fs/xfs/xfs_super.c | 6 ++-- 6 files changed, 27 insertions(+), 105 deletions(-) delete mode 100644 fs/xfs/mrlock.h
fs/xfs/mrlock.h deleted +0 -78
@@ -1,78 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* -* Copyright (c) 2000-2006 Silicon Graphics, Inc. -* All Rights Reserved. -*/ -#ifndef __XFS_SUPPORT_MRLOCK_H__ -#define __XFS_SUPPORT_MRLOCK_H__ - -#include <linux/rwsem.h> - -typedef struct { -struct rw_semaphore mr_lock; -#if defined(DEBUG ) || defined(XFS_WARN ) -int mr_writer; -#endif -}mrlock_t ; - -#if defined(DEBUG ) || defined(XFS_WARN ) -#define mrinit (mrp, name) \ - do { (mrp)->mr_writer = 0; init_rwsem(&(mrp)->mr_lock); } while (0) -#else -#define mrinit (mrp, name) \ - do { init_rwsem(&(mrp)->mr_lock); } while (0) -#endif - -#define mrlock_init (mrp, t,n,s) mrinit(mrp, n) -#define mrfree (mrp) do { } while (0) - -static inline void mraccess_nested (mrlock_t *mrp,int subclass) -{ -down_read_nested (&mrp->mr_lock, subclass); -} - -static inline void mrupdate_nested (mrlock_t *mrp,int subclass) -{ -down_write_nested (&mrp->mr_lock, subclass); -#if defined(DEBUG ) || defined(XFS_WARN ) - mrp->mr_writer =1 ; -#endif -} - -static inline int mrtryaccess (mrlock_t *mrp) -{ -return down_read_trylock (&mrp->mr_lock); -} - -static inline int mrtryupdate (mrlock_t *mrp) -{ -if (!down_write_trylock (&mrp->mr_lock)) -return 0 ; -#if defined(DEBUG ) || defined(XFS_WARN ) - mrp->mr_writer =1 ; -#endif -return 1 ; -} - -static inline void mrunlock_excl (mrlock_t *mrp) -{ -#if defined(DEBUG ) || defined(XFS_WARN ) - mrp->mr_writer =0 ; -#endif -up_write (&mrp->mr_lock); -} - -static inline void mrunlock_shared (mrlock_t *mrp) -{ -up_read (&mrp->mr_lock); -} - -static inline void mrdemote (mrlock_t *mrp) -{ -#if defined(DEBUG ) || defined(XFS_WARN ) - mrp->mr_writer =0 ; -#endif -downgrade_write (&mrp->mr_lock); -} - -#endif /* __XFS_SUPPORT_MRLOCK_H__ */
fs/xfs/xfs_inode.c +19 -18
@@ -191,14 +191,15 @@ xfs_ilock( }if (lock_flags &XFS_MMAPLOCK_EXCL ) -mrupdate_nested (&ip->i_mmaplock,XFS_MMAPLOCK_DEP (lock_flags)); +down_write_nested (&ip->i_mmaplock, +XFS_MMAPLOCK_DEP (lock_flags));else if (lock_flags &XFS_MMAPLOCK_SHARED ) -mraccess_nested (&ip->i_mmaplock,XFS_MMAPLOCK_DEP (lock_flags)); +down_read_nested (&ip->i_mmaplock,XFS_MMAPLOCK_DEP (lock_flags));if (lock_flags &XFS_ILOCK_EXCL ) -mrupdate_nested (&ip->i_lock,XFS_ILOCK_DEP (lock_flags)); +down_write_nested (&ip->i_lock,XFS_ILOCK_DEP (lock_flags));else if (lock_flags &XFS_ILOCK_SHARED ) -mraccess_nested (&ip->i_lock,XFS_ILOCK_DEP (lock_flags)); +down_read_nested (&ip->i_lock,XFS_ILOCK_DEP (lock_flags)); }/*
@@ -242,27 +243,27 @@ xfs_ilock_nowait( }if (lock_flags &XFS_MMAPLOCK_EXCL ) { -if (!mrtryupdate (&ip->i_mmaplock)) +if (!down_write_trylock (&ip->i_mmaplock)) goto out_undo_iolock; }else if (lock_flags &XFS_MMAPLOCK_SHARED ) { -if (!mrtryaccess (&ip->i_mmaplock)) +if (!down_read_trylock (&ip->i_mmaplock)) goto out_undo_iolock; }if (lock_flags &XFS_ILOCK_EXCL ) { -if (!mrtryupdate (&ip->i_lock)) +if (!down_write_trylock (&ip->i_lock)) goto out_undo_mmaplock; }else if (lock_flags &XFS_ILOCK_SHARED ) { -if (!mrtryaccess (&ip->i_lock)) +if (!down_read_trylock (&ip->i_lock)) goto out_undo_mmaplock; }return 1 ; out_undo_mmaplock:if (lock_flags &XFS_MMAPLOCK_EXCL ) -mrunlock_excl (&ip->i_mmaplock); +up_write (&ip->i_mmaplock);else if (lock_flags &XFS_MMAPLOCK_SHARED ) -mrunlock_shared (&ip->i_mmaplock); +up_read (&ip->i_mmaplock); out_undo_iolock:if (lock_flags &XFS_IOLOCK_EXCL )up_write (&VFS_I (ip)->i_rwsem);
@@ -309,14 +310,14 @@ xfs_iunlock(up_read (&VFS_I (ip)->i_rwsem);if (lock_flags &XFS_MMAPLOCK_EXCL ) -mrunlock_excl (&ip->i_mmaplock); +up_write (&ip->i_mmaplock);else if (lock_flags &XFS_MMAPLOCK_SHARED ) -mrunlock_shared (&ip->i_mmaplock); +up_read (&ip->i_mmaplock);if (lock_flags &XFS_ILOCK_EXCL ) -mrunlock_excl (&ip->i_lock); +up_write (&ip->i_lock);else if (lock_flags &XFS_ILOCK_SHARED ) -mrunlock_shared (&ip->i_lock); +up_read (&ip->i_lock);trace_xfs_iunlock (ip, lock_flags, _RET_IP_); }
@@ -335,9 +336,9 @@ xfs_ilock_demote( ~(XFS_IOLOCK_EXCL|XFS_MMAPLOCK_EXCL|XFS_ILOCK_EXCL)) == 0);if (lock_flags &XFS_ILOCK_EXCL ) -mrdemote (&ip->i_lock); +downgrade_write (&ip->i_lock);if (lock_flags &XFS_MMAPLOCK_EXCL ) -mrdemote (&ip->i_mmaplock); +downgrade_write (&ip->i_mmaplock);if (lock_flags &XFS_IOLOCK_EXCL )downgrade_write (&VFS_I (ip)->i_rwsem);
@@ -374,13 +375,13 @@ xfs_isilocked( uint lock_flags) {if (lock_flags & (XFS_ILOCK_EXCL |XFS_ILOCK_SHARED )) { -return __xfs_rwsem_islocked (&ip->i_lock.mr_lock, +return __xfs_rwsem_islocked (&ip->i_lock, (lock_flags &XFS_ILOCK_SHARED ), (lock_flags &XFS_ILOCK_EXCL )); }if (lock_flags & (XFS_MMAPLOCK_EXCL |XFS_MMAPLOCK_SHARED )) { -return __xfs_rwsem_islocked (&ip->i_mmaplock.mr_lock, +return __xfs_rwsem_islocked (&ip->i_mmaplock, (lock_flags &XFS_MMAPLOCK_SHARED ), (lock_flags &XFS_MMAPLOCK_EXCL )); }
fs/xfs/xfs_inode.h +4 -2
@@ -9,6 +9,8 @@#include "xfs_inode_buf.h" #include "xfs_inode_fork.h" +#include <linux/rwsem.h> +/* * Kernel only inode definitions */
@@ -39,8 +41,8 @@ typedef struct xfs_inode {/* Transaction and locking information. */ struct xfs_inode_log_item *i_itemp;/* logging information */ -mrlock_t i_lock;/* inode lock */ -mrlock_t i_mmaplock;/* inode mmap IO lock */ +struct rw_semaphore i_lock;/* inode lock */ +struct rw_semaphore i_mmaplock;/* inode mmap IO lock */ atomic_t i_pincount;/* inode pin count */ /*
fs/xfs/xfs_iops.c +2 -2
@@ -1319,9 +1319,9 @@ xfs_setup_inode(*/ lockdep_set_class (&inode->i_rwsem, &inode->i_sb->s_type->i_mutex_dir_key); -lockdep_set_class (&ip->i_lock.mr_lock, &xfs_dir_ilock_class); +lockdep_set_class (&ip->i_lock, &xfs_dir_ilock_class); }else { -lockdep_set_class (&ip->i_lock.mr_lock, &xfs_nondir_ilock_class); +lockdep_set_class (&ip->i_lock, &xfs_nondir_ilock_class); }/*
fs/xfs/xfs_linux.h +0 -1
@@ -22,7 +22,6 @@ typedef __u32 xfs_nlink_t;#include "xfs_types.h" #include "kmem.h" -#include "mrlock.h" #include <linux/semaphore.h> #include <linux/mm.h>
fs/xfs/xfs_super.c +2 -4
@@ -661,10 +661,8 @@ xfs_fs_inode_init_once(atomic_set (&ip->i_pincount,0 );spin_lock_init (&ip->i_flags_lock); -mrlock_init (&ip->i_mmaplock,MRLOCK_ALLOW_EQUAL_PRI |MRLOCK_BARRIER , -"xfsino" , ip->i_ino); -mrlock_init (&ip->i_lock,MRLOCK_ALLOW_EQUAL_PRI |MRLOCK_BARRIER , -"xfsino" , ip->i_ino); +init_rwsem (&ip->i_mmaplock); +init_rwsem (&ip->i_lock); }/*
Signature · 1 line
2.24.1