2 files changed, 3 insertions, 4 deletions

diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 07b77b73b024..16d6a578fc16 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -117,7 +117,7 @@ static inline void
 __xfs_buf_ioacct_dec(
         struct xfs_buf  *bp)
 {
-        ASSERT(spin_is_locked(&bp->b_lock));
+        lockdep_assert_held(&bp->b_lock);
 
         if (bp->b_state & XFS_BSTATE_IN_FLIGHT) {
                 bp->b_state &= ~XFS_BSTATE_IN_FLIGHT;
diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index f61c84f8e31a..990210fcb9c3 100644
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -66,7 +66,6 @@ xfs_inode_alloc(
 
         XFS_STATS_INC(mp, vn_active);
         ASSERT(atomic_read(&ip->i_pincount) == 0);
-        ASSERT(!spin_is_locked(&ip->i_flags_lock));
         ASSERT(!xfs_isiflocked(ip));
         ASSERT(ip->i_ino == 0);
 
@@ -190,7 +189,7 @@ xfs_perag_set_reclaim_tag(
 {
         struct xfs_mount        *mp = pag->pag_mount;
 
-        ASSERT(spin_is_locked(&pag->pag_ici_lock));
+        lockdep_assert_held(&pag->pag_ici_lock);
         if (pag->pag_ici_reclaimable++)
                 return;
 
@@ -212,7 +211,7 @@ xfs_perag_clear_reclaim_tag(
 {
         struct xfs_mount        *mp = pag->pag_mount;
 
-        ASSERT(spin_is_locked(&pag->pag_ici_lock));
+        lockdep_assert_held(&pag->pag_ici_lock);
         if (--pag->pag_ici_reclaimable)
                 return;