| To: | akpm@xxxxxxxxxxxxxxxxxxxx |
|---|---|
| Subject: | [PATCH 05/13] XFS: Fix lock ASSERT on UP |
| From: | Andi Kleen <andi@xxxxxxxxxxxxxx> |
| Date: | Tue, 27 Mar 2012 17:47:09 -0700 |
| Cc: | linux-kernel@xxxxxxxxxxxxxxx, Andi Kleen <ak@xxxxxxxxxxxxxxx>, xfs-masters@xxxxxxxxxxx |
| In-reply-to: | <1332895637-32572-1-git-send-email-andi@xxxxxxxxxxxxxx> |
| References: | <1332895637-32572-1-git-send-email-andi@xxxxxxxxxxxxxx> |
From: Andi Kleen <ak@xxxxxxxxxxxxxxx>
ASSERT(!spin_is_locked()) doesn't work on UP builds. Replace with a standard
lockdep_assert_held()
Cc: xfs-masters@xxxxxxxxxxx
Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
---
fs/xfs/xfs_iget.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/xfs/xfs_iget.c b/fs/xfs/xfs_iget.c
index 8c3e463..8654d78 100644
--- a/fs/xfs/xfs_iget.c
+++ b/fs/xfs/xfs_iget.c
@@ -76,7 +76,7 @@ xfs_inode_alloc(
}
ASSERT(atomic_read(&ip->i_pincount) == 0);
- ASSERT(!spin_is_locked(&ip->i_flags_lock));
+ lockdep_assert_held(&ip->i_flags_lock);
ASSERT(!xfs_isiflocked(ip));
ASSERT(ip->i_ino == 0);
@@ -147,7 +147,7 @@ xfs_inode_free(
/* asserts to verify all state is correct here */
ASSERT(atomic_read(&ip->i_pincount) == 0);
- ASSERT(!spin_is_locked(&ip->i_flags_lock));
+ lockdep_assert_held(&ip->i_flags_lock);
ASSERT(!xfs_isiflocked(ip));
/*
--
1.7.7.6
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | Re: [PATCH] Fix xfs build error on ia64 (mismatch section for xfs_qm_exit()), Ben Myers |
|---|---|
| Next by Date: | Hi, Shanghai Toys Imp.,Exp.,Co.,Ltd,China |
| Previous by Thread: | [PATCH] Fix xfs build error on ia64 (mismatch section for xfs_qm_exit()), Luck, Tony |
| Next by Thread: | Re: [PATCH 05/13] XFS: Fix lock ASSERT on UP, Christoph Hellwig |
| Indexes: | [Date] [Thread] [Top] [All Lists] |