Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 21:23:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xfs: fix per-ag reference counting in inode reclaim tree walking

Browse Source 
The walk fails to decrement the per-ag reference count when the
non-blocking walk fails to obtain the per-ag reclaim lock, leading
to an assert failure on debug kernels when unmounting a filesystem.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alex Elder <aelder@sgi.com>
This commit is contained in:
Dave Chinner 2010-11-08 08:55:04 +00:00 committed by Alex Elder
parent 6762b938ea
commit f83282a8ef
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/xfs/linux-2.6/xfs_sync.c
View File

@ -853,6 +853,7 @@ restart:
if (trylock) { if (trylock) {
if (!mutex_trylock(&pag->pag_ici_reclaim_lock)) { if (!mutex_trylock(&pag->pag_ici_reclaim_lock)) {
skipped++; skipped++;
xfs_perag_put(pag);
continue; continue;
} }
first_index = pag->pag_ici_reclaim_cursor; first_index = pag->pag_ici_reclaim_cursor;

1
fs/xfs/xfs_mount.c
View File

@ -275,6 +275,7 @@ xfs_free_perag(
pag = radix_tree_delete(&mp->m_perag_tree, agno); pag = radix_tree_delete(&mp->m_perag_tree, agno);
spin_unlock(&mp->m_perag_lock); spin_unlock(&mp->m_perag_lock);
ASSERT(pag); ASSERT(pag);
ASSERT(atomic_read(&pag->pag_ref) == 0);
call_rcu(&pag->rcu_head, __xfs_free_perag); call_rcu(&pag->rcu_head, __xfs_free_perag);
} }
} }