xfs: Refactor xfs_isilocked()
PATCH v4 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.
---
Changelog from V3:
Added ASSERTS() to isilocked() to make sure that only flags for a single type of lock are passed
fs/xfs/xfs_inode.c | 51 ++++++++++++++++++++++++++++++++++------------ fs/xfs/xfs_inode.h | 2 +- 2 files changed, 39 insertions(+), 14 deletions(-)
fs/xfs/xfs_inode.c +38 -13
@@ -345,32 +345,57 @@ 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); +ASSERT (!(lock_flags & ~(XFS_ILOCK_EXCL |XFS_ILOCK_SHARED ))); +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); +ASSERT (!(lock_flags & ~(XFS_MMAPLOCK_EXCL |XFS_MMAPLOCK_SHARED ))); +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); +ASSERT (!(lock_flags & ~(XFS_IOLOCK_EXCL |XFS_IOLOCK_SHARED ))); +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 v4 2/4 xfs: Fix WS in xfs_isilocked() calls
--- 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
@@ -2831,7 +2831,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_);
@@ -3695,7 +3695,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 ));
@@ -3827,7 +3827,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
Re: [PATCH v4 2/4] xfs: Fix WS in xfs_isilocked() calls
Quoted 7 lines · Pavel Reichl
Signed-off-by Pavel Reichl <[email protected]>--- 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(-)
Hi Pavel,
I don't know what this patch does from reading the subject line, and the commit message doesn't tell me, either. :)
IOWs, please don't use abbreviations in the subject line because not everyone understands what the abbreviation you used means. This makes it hard to read the git history once the patch is committed. Similarly, subjects that say "Fix the frobnozzle" can be better written as something like:
xfs: clean up whitespace in xfs_isilocked() calls
So that the output of 'git log --oneline fs/xfs' it's totally obvious what the commit is doing from the summary. "Fix the frobnozzle" is ambiguous because "fix" can mean many things, hence to find out you need to look at the specific commit in more detail and that slows down code and history searches....
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
PATCH v4 3/4 xfs: Fix bug when checking diff. locks
In reply to Pavel ReichlIn its current form, xfs_isilocked() is only able to test one lock type at a time - ilock, iolock, or mmap lock, but combinations are not properly handled. The intent here is to check that both XFS_IOLOCK_EXCL and XFS_ILOCK_EXCL are held, so test them each separately.
The commit ecfea3f0c8c6 ("xfs: split xfs_bmap_shift_extents") ORed the flags together which was an error, so this patch reverts that part of the change and check the locks independently.
---
Changelog from V3:
Commit message extened.
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 v4 3/4] xfs: Fix bug when checking diff. locks
Quoted 8 lines · Pavel Reichl
In its current form,
xfs_isilocked()is only able to test one lock type at a time - ilock, iolock, or mmap lock, but combinations are not properly handled. The intent here is to check that bothXFS_IOLOCK_EXCLandXFS_ILOCK_EXCLare held, so test them each separately.The commit
ecfea3f0c8c6("xfs: splitxfs_bmap_shift_extents") ORed the flags together which was an error, so this patch reverts that part of the change and check the locks independently.
Commit message should wrap at 68-72 columns.
Quoted 8 lines
Fixes ecfea3f0c8c6 ("xfs: split xfs_bmap_shift_extents")Reviewed-by Eric Sandeen <[email protected]>Suggested-by Dave Chinner <[email protected]>Signed-off-by Pavel Reichl <[email protected]>---
Changelog from V3:
Commit message extened.
Same comment as the previous patch about the subject - "fix" and abbreviations.
xfs: xfs_isilocked() can only check a single lock type
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
PATCH v4 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);
@@ -375,14 +376,14 @@ xfs_isilocked( {if (lock_flags & (XFS_ILOCK_EXCL |XFS_ILOCK_SHARED )) {ASSERT (!(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 )) {ASSERT (!(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
Re: [PATCH v4 4/4] xfs: Replace mrlock_t by rw_semaphore
Quoted 3 lines · Pavel Reichl
Remove
mrlock_tas it does not provide any extra value overrw_semaphores. Makei_lockandi_mmaplocknativerw_semaphoresand replace mr*() functions with native rwsem calls.
wrapping at 68-72 columns.
Quoted 1 line
Signed-off-by Pavel Reichl <[email protected]>
Subject "xfs: replace mrlock_t with rw_semaphores" or "xfs: remove mrlock_t wrappers"
fs/xfs/xfs_inode.h line 13
Quoted 10 lines
fs/xfs/xfs_inode.h +2
-0@@ -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....
fs/xfs/xfs_linux.h typedef __u32 xfs_nlink_t; · line 25
Quoted 9 lines
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"
.... 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.
Signature · 2 lines
Dave Chinner [email protected]
Quoted 11 lines · Pavel Reichl
Refactor
xfs_isilocked()to use newly introduced__xfs_rwsem_islocked().__xfs_rwsem_islocked()is a helper function which encapsulates checking state ofrw_semaphoreshold by inode.Signed-off-by Pavel Reichl <[email protected]>Suggested-by Dave Chinner <[email protected]>Suggested-by Eric Sandeen <[email protected]>---
Changelog from V3:
AddedASSERTS()toisilocked()to make sure that only flags for a single type of lock are passed
So while I like the ASSERTs going forward, the problem here is that a bisect will now be broken between this and patch three. Sorry to do this to you, but I think you should probably add the asserts in patch 3 so that you fix the wrong calls and add the protective asserts at the same time.
Also, since your next patch fixes whitespace, I guess this:
+ ASSERT(!(lock_flags & ~(XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)));
should observe the same rules around " | "
-Eric
Quoted 94 lines
fs/xfs/xfs_inode.c | 51 ++++++++++++++++++++++++++++++++++------------ fs/xfs/xfs_inode.h | 2 +- 2 files changed, 39 insertions(+), 14 deletions(-)fs/xfs/xfs_inode.c +38
-13@@ -345,32 +345,57 @@ 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); +ASSERT (!(lock_flags & ~(XFS_ILOCK_EXCL |XFS_ILOCK_SHARED ))); +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); +ASSERT (!(lock_flags & ~(XFS_MMAPLOCK_EXCL |XFS_MMAPLOCK_SHARED ))); +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); +ASSERT (!(lock_flags & ~(XFS_IOLOCK_EXCL |XFS_IOLOCK_SHARED ))); +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 *);