mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
Changes since last update:
- Fix some bogus ASSERT failures on CONFIG_SMP=n and CONFIG_XFS_DEBUG=y. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCgAGBQJZQhB9AAoJEPh/dxk0SrTrMWsP/A1gSHmaS2UI3WvXdqwAxldy GiDZ3oSAhn4SF7BY+AhIu+Ot9kwCyOVzd/RZ9zVYmRjTTFxYX7P099uua2e/mf70 Z1o9oSk9H76srqo7L76h7lI2ONsgd28aqh082hmDrRUhhwy7LZThVV15ZPZFfgU4 8Q17h0uRUVgSn8M8INsuiMpw1sCLJsXw/9Rb9iFMgi3tSJaGZ1Mm//nA1aeS8HFH xCKHYw7YUtVKtIVyVV1NGdtXhXZbNznJXelkUZLMnMgOOmAqWiUa8FOGPNbQEezX 1VidjzGhxRF7uoUJNnnX5mM+26c8/Ip4cLtqvnFQo30bx+HXO3OR8jywQO+6DD9Q NxFHY5D/Peud96xsnq5mRzNMN5fqumyVAyUCXSebT3Oa42HMdva+66s9JoFfDehi Z7VmRdoryxexDRbhiQVev4xe20beLtOHAP2I5JrnJddrXb0aFWowLk776wa0uxD8 7cbKgovikqSHk4/mqpyZ5iQeaufg/kOi2cNaTcAFeCbvbXYieeRXVlisMBh1DKec lSX5e4kNNS20VVbCYakAttK69lpZzuraYPDDsnb4HRlmt0VX12lYyqQwklY/YZ9S jDagtKWKDm/L/jq2j5Nd3uSycM+lMaq97mIMjzPRrnPjOriME1ZGLwEQbKfBLXnW 3Flzt5C2Hk1Fb/VlNx4S =U99d -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
adc311034c
2 changed files with 3 additions and 4 deletions
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue