public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

xfs: free the item in xfs_mru_cache_insert on failure

Browse source 
Call the provided free_func when xfs_mru_cache_insert as that's what
the callers need to do anyway.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Hans Holmberg <hans.holmberg@wdc.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
This commit is contained in:
Christoph Hellwig 2025-05-14 10:50:37 +00:00 • committed by Carlos Maiolino
parent 1c7161ef01
commit 70b95cb865
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fs/xfs/xfs_filestream.c
View file

@ -304,11 +304,9 @@ xfs_filestream_create_association(
* for us, so all we need to do here is take another active reference to * for us, so all we need to do here is take another active reference to
* the perag for the cached association. * the perag for the cached association.
* *
* If we fail to store the association, we need to drop the fstrms * If we fail to store the association, we do not need to return an
* counter as well as drop the perag reference we take here for the * error for this failure - as long as we return a referenced AG, the
* item. We do not need to return an error for this failure - as long as * allocation can still go ahead just fine.
* we return a referenced AG, the allocation can still go ahead just
* fine.
*/ */
item = kmalloc(sizeof(*item), GFP_KERNEL | __GFP_RETRY_MAYFAIL); item = kmalloc(sizeof(*item), GFP_KERNEL | __GFP_RETRY_MAYFAIL);
if (!item) if (!item)
@ -316,14 +314,9 @@ xfs_filestream_create_association(
atomic_inc(&pag_group(args->pag)->xg_active_ref); atomic_inc(&pag_group(args->pag)->xg_active_ref);
item->pag = args->pag; item->pag = args->pag;
error = xfs_mru_cache_insert(mp->m_filestream, pino, &item->mru); xfs_mru_cache_insert(mp->m_filestream, pino, &item->mru);
if (error)
goto out_free_item;
return 0; return 0;
out_free_item:
xfs_perag_rele(item->pag);
kfree(item);
out_put_fstrms: out_put_fstrms:
atomic_dec(&args->pag->pagf_fstrms); atomic_dec(&args->pag->pagf_fstrms);
return 0; return 0;

15
fs/xfs/xfs_mru_cache.c
View file

@ -414,6 +414,8 @@ xfs_mru_cache_destroy(
* To insert an element, call xfs_mru_cache_insert() with the data store, the * To insert an element, call xfs_mru_cache_insert() with the data store, the
* element's key and the client data pointer. This function returns 0 on * element's key and the client data pointer. This function returns 0 on
* success or ENOMEM if memory for the data element couldn't be allocated. * success or ENOMEM if memory for the data element couldn't be allocated.
*
* The passed in elem is freed through the per-cache free_func on failure.
*/ */
int int
xfs_mru_cache_insert( xfs_mru_cache_insert(
@ -421,14 +423,15 @@ xfs_mru_cache_insert(
unsigned long key, unsigned long key,
struct xfs_mru_cache_elem *elem) struct xfs_mru_cache_elem *elem)
{ {
int error; int error = -EINVAL;
ASSERT(mru && mru->lists); ASSERT(mru && mru->lists);
if (!mru || !mru->lists) if (!mru || !mru->lists)
return -EINVAL; goto out_free;
error = -ENOMEM;
if (radix_tree_preload(GFP_KERNEL)) if (radix_tree_preload(GFP_KERNEL))
return -ENOMEM; goto out_free;
INIT_LIST_HEAD(&elem->list_node); INIT_LIST_HEAD(&elem->list_node);
elem->key = key; elem->key = key;
@ -440,6 +443,12 @@ xfs_mru_cache_insert(
_xfs_mru_cache_list_insert(mru, elem); _xfs_mru_cache_list_insert(mru, elem);
spin_unlock(&mru->lock); spin_unlock(&mru->lock);
if (error)
goto out_free;
return 0;
out_free:
mru->free_func(mru->data, elem);
return error; return error;
} }