Proxmox-Port/linux-loongson
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson synced 2025-08-27 15:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xfs: decouple xfs_trans_alloc_empty from xfs_trans_alloc

Browse Source 
xfs_trans_alloc_empty only shares the very basic transaction structure
allocation and initialization with xfs_trans_alloc.

Split out a new __xfs_trans_alloc helper for that and otherwise decouple
xfs_trans_alloc_empty from xfs_trans_alloc.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
This commit is contained in:
Christoph Hellwig 2025-07-16 14:43:13 +02:00 committed by Carlos Maiolino
parent f1cc16e154
commit 83a80e95e7
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
fs/xfs/xfs_trans.c
View File

@ -241,6 +241,28 @@ xfs_trans_reserve(
return error; return error;
} }
static struct xfs_trans *
__xfs_trans_alloc(
struct xfs_mount *mp,
uint flags)
{
struct xfs_trans *tp;
ASSERT(!(flags & XFS_TRANS_RES_FDBLKS) || xfs_has_lazysbcount(mp));
tp = kmem_cache_zalloc(xfs_trans_cache, GFP_KERNEL | __GFP_NOFAIL);
if (!(flags & XFS_TRANS_NO_WRITECOUNT))
sb_start_intwrite(mp->m_super);
xfs_trans_set_context(tp);
tp->t_flags = flags;
tp->t_mountp = mp;
INIT_LIST_HEAD(&tp->t_items);
INIT_LIST_HEAD(&tp->t_busy);
INIT_LIST_HEAD(&tp->t_dfops);
tp->t_highest_agno = NULLAGNUMBER;
return tp;
}
int int
xfs_trans_alloc( xfs_trans_alloc(
struct xfs_mount *mp, struct xfs_mount *mp,
@ -254,33 +276,16 @@ xfs_trans_alloc(
bool want_retry = true; bool want_retry = true;
int error; int error;
ASSERT(resp->tr_logres > 0);
/* /*
* Allocate the handle before we do our freeze accounting and setting up * Allocate the handle before we do our freeze accounting and setting up
* GFP_NOFS allocation context so that we avoid lockdep false positives * GFP_NOFS allocation context so that we avoid lockdep false positives
* by doing GFP_KERNEL allocations inside sb_start_intwrite(). * by doing GFP_KERNEL allocations inside sb_start_intwrite().
*/ */
retry: retry:
tp = kmem_cache_zalloc(xfs_trans_cache, GFP_KERNEL | __GFP_NOFAIL); WARN_ON(mp->m_super->s_writers.frozen == SB_FREEZE_COMPLETE);
if (!(flags & XFS_TRANS_NO_WRITECOUNT)) tp = __xfs_trans_alloc(mp, flags);
sb_start_intwrite(mp->m_super);
xfs_trans_set_context(tp);
/*
* Zero-reservation ("empty") transactions can't modify anything, so
* they're allowed to run while we're frozen.
*/
WARN_ON(resp->tr_logres > 0 &&
mp->m_super->s_writers.frozen == SB_FREEZE_COMPLETE);
ASSERT(!(flags & XFS_TRANS_RES_FDBLKS) ||
xfs_has_lazysbcount(mp));
tp->t_flags = flags;
tp->t_mountp = mp;
INIT_LIST_HEAD(&tp->t_items);
INIT_LIST_HEAD(&tp->t_busy);
INIT_LIST_HEAD(&tp->t_dfops);
tp->t_highest_agno = NULLAGNUMBER;
error = xfs_trans_reserve(tp, resp, blocks, rtextents); error = xfs_trans_reserve(tp, resp, blocks, rtextents);
if (error == -ENOSPC && want_retry) { if (error == -ENOSPC && want_retry) {
xfs_trans_cancel(tp); xfs_trans_cancel(tp);
@ -329,9 +334,8 @@ xfs_trans_alloc_empty(
struct xfs_mount *mp, struct xfs_mount *mp,
struct xfs_trans **tpp) struct xfs_trans **tpp)
{ {
struct xfs_trans_res resv = {0}; *tpp = __xfs_trans_alloc(mp, XFS_TRANS_NO_WRITECOUNT);
return 0;
return xfs_trans_alloc(mp, &resv, 0, 0, XFS_TRANS_NO_WRITECOUNT, tpp);
} }
/* /*