Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+3
-4
+1
-1
fs/xfs/xfs_buf.c
+1
-1
fs/xfs/xfs_buf.c
+2
-3
fs/xfs/xfs_icache.c
+2
-3
fs/xfs/xfs_icache.c
···
66
66
67
67
XFS_STATS_INC(mp, vn_active);
68
68
ASSERT(atomic_read(&ip->i_pincount) == 0);
69
-
ASSERT(!spin_is_locked(&ip->i_flags_lock));
70
69
ASSERT(!xfs_isiflocked(ip));
71
70
ASSERT(ip->i_ino == 0);
72
71
···
189
190
{
190
191
struct xfs_mount *mp = pag->pag_mount;
191
192
192
-
ASSERT(spin_is_locked(&pag->pag_ici_lock));
193
+
lockdep_assert_held(&pag->pag_ici_lock);
193
194
if (pag->pag_ici_reclaimable++)
194
195
return;
195
196
···
211
212
{
212
213
struct xfs_mount *mp = pag->pag_mount;
213
214
214
-
ASSERT(spin_is_locked(&pag->pag_ici_lock));
215
+
lockdep_assert_held(&pag->pag_ici_lock);
215
216
if (--pag->pag_ici_reclaimable)
216
217
return;
217
218