[PATCH v2] xfs: convert dquot iterator map allocation to kmalloc_objs()

From: William Theesfeld

Date: Tue Jun 02 2026 - 07:31:07 EST


v1 converted the open-coded kmalloc(N * sizeof(*p), ...) in
xfs_qm_reset_dqcounts_buf() to kmalloc_array(). Per review feedback
from Carlos Maiolino on the v1 thread, switch instead to the
kmalloc_objs() helper, which is the preferred form for new XFS code
and matches the style of recent conversions elsewhere in fs/xfs/.

While touching this, also drop the __GFP_NOFAIL flag and handle the
allocation failure explicitly by returning -ENOMEM. The function
already has callers that propagate errors out of quotacheck setup,
so an early -ENOMEM is harmless and avoids relying on the allocator
to retry forever on memory pressure.

No functional change for the success path.

Signed-off-by: William Theesfeld <william@xxxxxxxxxxxxx>
---
fs/xfs/xfs_qm.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index 7bd15d9e7..83e8d80bc 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -1170,8 +1170,9 @@ xfs_qm_reset_dqcounts_buf(
if (qip->i_nblocks == 0)
return 0;

- map = kmalloc(XFS_DQITER_MAP_SIZE * sizeof(*map),
- GFP_KERNEL | __GFP_NOFAIL);
+ map = kmalloc_objs(*map, XFS_DQITER_MAP_SIZE, GFP_KERNEL);
+ if (!map)
+ return -ENOMEM;

lblkno = 0;
maxlblkcnt = XFS_B_TO_FSB(mp, mp->m_super->s_maxbytes);
--
2.54.0