The patch titled Subject: XFS: fix lock ASSERT on UP has been added to the -mm tree. Its filename is xfs-fix-lock-assert-on-up.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andi Kleen <ak@xxxxxxxxxxxxxxx> Subject: XFS: fix lock ASSERT on UP ASSERT(!spin_is_locked()) doesn't work on UP builds. Replace with a standard lockdep_assert_held() Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx> Cc: Ben Myers <bpm@xxxxxxx> Cc: Alex Elder <elder@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/xfs/xfs_iget.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN fs/xfs/xfs_iget.c~xfs-fix-lock-assert-on-up fs/xfs/xfs_iget.c --- a/fs/xfs/xfs_iget.c~xfs-fix-lock-assert-on-up +++ a/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); @@ -146,7 +146,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)); /* _ Subject: Subject: XFS: fix lock ASSERT on UP Patches currently in -mm which might be from ak@xxxxxxxxxxxxxxx are origin.patch brlocks-lglocks-cleanups.patch block-use-lockdep_assert_held-for-queue-locking.patch sgi-xp-use-lockdep_assert_held.patch drivers-scsi-aha152xc-remove-broken-usage-of-spin_is_locked.patch xfs-fix-lock-assert-on-up.patch mm-huge_memoryc-use-lockdep_assert_held.patch futex-use-lockdep_assert_held-for-lock-checking.patch drivers-net-irda-sir_devc-remove-spin_is_locked.patch drivers-net-ethernet-smsc-smsc911xh-use-lockdep_assert_held-instead-of-home-grown-buggy-construct.patch spinlockstxt-add-a-discussion-on-why-spin_is_locked-is-bad.patch include-linux-spinlockh-add-a-kerneldoc-comment-to-spin_is_locked-that-discourages-its-use.patch checkpatch-check-for-spin_is_locked.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html