Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adc31103 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-4.12-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull xfs fix from Darrick Wong:
 "One more bugfix for you for 4.12-rc6 to fix something that came up in
  an earlier rc:

   - Fix some bogus ASSERT failures on CONFIG_SMP=n and CONFIG_XFS_DEBUG=y"

* tag 'xfs-4.12-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: fix spurious spin_is_locked() assert failures on non-smp kernels
parents c8636b90 95989c46

fs/xfs/xfs_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/xfs/xfs_icache.c

+2 −3
Original line number Diff line number Diff line
@@ -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;