xfs: check free AG space when making per-AG reservations
The new online shrink code exposed a gap in the per-AG reservation code, which is that we only return ENOSPC to callers if the entire fs doesn't have enough free blocks. Except for debugging mode, the reservation init code doesn't ever check that there's enough free space in that AG to cover the reservation. Not having enough space is not considered an immediate fatal error that requires filesystem offlining because (a) it's shouldn't be possible to wind up in that state through normal file operations and (b) even if one did, freeing data blocks would recover the situation. However, online shrink now needs to know if shrinking would not leave enough space so that it can abort the shrink operation. Hence we need to promote this assertion into an actual error return. Observed by running xfs/168 with a 1k block size, though in theory this could happen with any configuration. Signed-off-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com> Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
This commit is contained in:
parent
e3c2b04747
commit
0f9342513c
@ -325,10 +325,22 @@ out:
|
||||
error2 = xfs_alloc_pagf_init(mp, tp, pag->pag_agno, 0);
|
||||
if (error2)
|
||||
return error2;
|
||||
ASSERT(xfs_perag_resv(pag, XFS_AG_RESV_METADATA)->ar_reserved +
|
||||
xfs_perag_resv(pag, XFS_AG_RESV_RMAPBT)->ar_reserved <=
|
||||
pag->pagf_freeblks + pag->pagf_flcount);
|
||||
|
||||
/*
|
||||
* If there isn't enough space in the AG to satisfy the
|
||||
* reservation, let the caller know that there wasn't enough
|
||||
* space. Callers are responsible for deciding what to do
|
||||
* next, since (in theory) we can stumble along with
|
||||
* insufficient reservation if data blocks are being freed to
|
||||
* replenish the AG's free space.
|
||||
*/
|
||||
if (!error &&
|
||||
xfs_perag_resv(pag, XFS_AG_RESV_METADATA)->ar_reserved +
|
||||
xfs_perag_resv(pag, XFS_AG_RESV_RMAPBT)->ar_reserved >
|
||||
pag->pagf_freeblks + pag->pagf_flcount)
|
||||
error = -ENOSPC;
|
||||
}
|
||||
|
||||
return error;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user