From 596253fb3acb5d4043cc20a0500314adb9bb6ff9 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Sun, 20 Oct 2024 17:10:45 -0700 Subject: [PATCH] xfs: use kfree_rcu_mightsleep to free the perag structures Source kernel commit: 4ef7c6d39dc72dae983b836c8b2b5de7128c0da3 Using the kfree_rcu_mightsleep is simpler and removes the need for a rcu_head in the perag structure. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Signed-off-by: Chandan Babu R --- include/kmem.h | 5 +++++ libxfs/xfs_ag.c | 12 +----------- libxfs/xfs_ag.h | 3 --- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/include/kmem.h b/include/kmem.h index 8739d8240..16a7957f1 100644 --- a/include/kmem.h +++ b/include/kmem.h @@ -71,6 +71,11 @@ static inline void kvfree(const void *ptr) kfree(ptr); } +static inline void kfree_rcu_mightsleep(const void *ptr) +{ + kfree(ptr); +} + __attribute__((format(printf,2,3))) char *kasprintf(gfp_t gfp, const char *fmt, ...); diff --git a/libxfs/xfs_ag.c b/libxfs/xfs_ag.c index ed9ac7f58..1b65ba983 100644 --- a/libxfs/xfs_ag.c +++ b/libxfs/xfs_ag.c @@ -233,16 +233,6 @@ out: return error; } -STATIC void -__xfs_free_perag( - struct rcu_head *head) -{ - struct xfs_perag *pag = container_of(head, struct xfs_perag, rcu_head); - - ASSERT(!delayed_work_pending(&pag->pag_blockgc_work)); - kfree(pag); -} - /* * Free up the per-ag resources associated with the mount structure. */ @@ -268,7 +258,7 @@ xfs_free_perag( xfs_perag_rele(pag); XFS_IS_CORRUPT(pag->pag_mount, atomic_read(&pag->pag_active_ref) != 0); - call_rcu(&pag->rcu_head, __xfs_free_perag); + kfree_rcu_mightsleep(pag); } } diff --git a/libxfs/xfs_ag.h b/libxfs/xfs_ag.h index 35de09a25..d62c266c0 100644 --- a/libxfs/xfs_ag.h +++ b/libxfs/xfs_ag.h @@ -63,9 +63,6 @@ struct xfs_perag { /* Blocks reserved for the reverse mapping btree. */ struct xfs_ag_resv pag_rmapbt_resv; - /* for rcu-safe freeing */ - struct rcu_head rcu_head; - /* Precalculated geometry info */ xfs_agblock_t block_count; xfs_agblock_t min_block; -- 2.39.5