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-17 13:58:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xfs: return the busy generation from xfs_extent_busy_list_empty

Browse Source 
This avoid having to poke into the internals of the busy tracking in
xrep_setup_ag_allocbt.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
Christoph Hellwig 2024-11-03 20:18:42 -08:00 committed by Darrick J. Wong
parent eb4a84a3c2
commit 6af1300d47
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/xfs/scrub/alloc_repair.c
View File

@ -132,16 +132,12 @@ int
xrep_setup_ag_allocbt(
struct xfs_scrub *sc)
{
unsigned int busy_gen;
/*
* Make sure the busy extent list is clear because we can't put extents
* on there twice.
*/
busy_gen = READ_ONCE(sc->sa.pag->pagb_gen);
if (xfs_extent_busy_list_empty(sc->sa.pag))
if (xfs_extent_busy_list_empty(sc->sa.pag, &busy_gen))
return 0;
return xfs_extent_busy_flush(sc->tp, sc->sa.pag, busy_gen, 0);
}
@ -849,6 +845,7 @@ xrep_allocbt(
{
struct xrep_abt *ra;
struct xfs_mount *mp = sc->mp;
unsigned int busy_gen;
char *descr;
int error;
@ -869,7 +866,7 @@ xrep_allocbt(
* on there twice. In theory we cleared this before we started, but
* let's not risk the filesystem.
*/
if (!xfs_extent_busy_list_empty(sc->sa.pag)) {
if (!xfs_extent_busy_list_empty(sc->sa.pag, &busy_gen)) {
error = -EDEADLOCK;
goto out_ra;
}

4
fs/xfs/xfs_extent_busy.c
View File

@ -667,12 +667,14 @@ xfs_extent_busy_ag_cmp(
/* Are there any busy extents in this AG? */
bool
xfs_extent_busy_list_empty(
struct xfs_perag *pag)
struct xfs_perag *pag,
unsigned *busy_gen)
{
bool res;
spin_lock(&pag->pagb_lock);
res = RB_EMPTY_ROOT(&pag->pagb_tree);
*busy_gen = READ_ONCE(pag->pagb_gen);
spin_unlock(&pag->pagb_lock);
return res;
}

2
fs/xfs/xfs_extent_busy.h
View File

@ -83,6 +83,6 @@ static inline void xfs_extent_busy_sort(struct list_head *list)
list_sort(NULL, list, xfs_extent_busy_ag_cmp);
}
bool xfs_extent_busy_list_empty(struct xfs_perag *pag);
bool xfs_extent_busy_list_empty(struct xfs_perag *pag, unsigned int *busy_gen);
#endif /* __XFS_EXTENT_BUSY_H__ */