leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfs: put attr[id] log item cache init with the others

Browse Source 
Initialize and destroy the xattr log item caches in the same places that
we do all the other log item caches.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Darrick J. Wong 2022-05-22 15:59:48 +10:00 committed by Dave Chinner
parent 500a512c60
commit 4136e38af7
6 changed files with 25 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fs/xfs/libxfs/xfs_attr.c
View File

@ -27,8 +27,6 @@
#include "xfs_attr_item.h" #include "xfs_attr_item.h"
#include "xfs_log.h" #include "xfs_log.h"
struct kmem_cache *xfs_attri_cache;
struct kmem_cache *xfs_attrd_cache;
struct kmem_cache *xfs_attr_intent_cache; struct kmem_cache *xfs_attr_intent_cache;
/* /*
@ -1113,40 +1111,6 @@ out_trans_cancel:
goto out_unlock; goto out_unlock;
} }
int __init
xfs_attri_init_cache(void)
{
xfs_attri_cache = kmem_cache_create("xfs_attri",
sizeof(struct xfs_attri_log_item),
0, 0, NULL);
return xfs_attri_cache != NULL ? 0 : -ENOMEM;
}
void
xfs_attri_destroy_cache(void)
{
kmem_cache_destroy(xfs_attri_cache);
xfs_attri_cache = NULL;
}
int __init
xfs_attrd_init_cache(void)
{
xfs_attrd_cache = kmem_cache_create("xfs_attrd",
sizeof(struct xfs_attrd_log_item),
0, 0, NULL);
return xfs_attrd_cache != NULL ? 0 : -ENOMEM;
}
void
xfs_attrd_destroy_cache(void)
{
kmem_cache_destroy(xfs_attrd_cache);
xfs_attrd_cache = NULL;
}
/*======================================================================== /*========================================================================
* External routines when attribute list is inside the inode * External routines when attribute list is inside the inode
*========================================================================*/ *========================================================================*/

8
fs/xfs/libxfs/xfs_attr.h
View File

@ -558,14 +558,6 @@ int xfs_attr_calc_size(struct xfs_da_args *args, int *local);
void xfs_init_attr_trans(struct xfs_da_args *args, struct xfs_trans_res *tres, void xfs_init_attr_trans(struct xfs_da_args *args, struct xfs_trans_res *tres,
unsigned int *total); unsigned int *total);
extern struct kmem_cache *xfs_attri_cache;
extern struct kmem_cache *xfs_attrd_cache;
int __init xfs_attri_init_cache(void);
void xfs_attri_destroy_cache(void);
int __init xfs_attrd_init_cache(void);
void xfs_attrd_destroy_cache(void);
/* /*
* Check to see if the attr should be upgraded from non-existent or shortform to * Check to see if the attr should be upgraded from non-existent or shortform to
* single-leaf-block attribute list. * single-leaf-block attribute list.

8
fs/xfs/libxfs/xfs_defer.c
View File

@ -871,12 +871,6 @@ xfs_defer_init_item_caches(void)
if (error) if (error)
goto err; goto err;
error = xfs_extfree_intent_init_cache(); error = xfs_extfree_intent_init_cache();
if (error)
goto err;
error = xfs_attri_init_cache();
if (error)
goto err;
error = xfs_attrd_init_cache();
if (error) if (error)
goto err; goto err;
error = xfs_attr_intent_init_cache(); error = xfs_attr_intent_init_cache();
@ -893,8 +887,6 @@ void
xfs_defer_destroy_item_caches(void) xfs_defer_destroy_item_caches(void)
{ {
xfs_attr_intent_destroy_cache(); xfs_attr_intent_destroy_cache();
xfs_attri_destroy_cache();
xfs_attrd_destroy_cache();
xfs_extfree_intent_destroy_cache(); xfs_extfree_intent_destroy_cache();
xfs_bmap_intent_destroy_cache(); xfs_bmap_intent_destroy_cache();
xfs_refcount_intent_destroy_cache(); xfs_refcount_intent_destroy_cache();

3
fs/xfs/xfs_attr_item.c
View File

@ -29,6 +29,9 @@
#include "xfs_log_priv.h" #include "xfs_log_priv.h"
#include "xfs_log_recover.h" #include "xfs_log_recover.h"
struct kmem_cache *xfs_attri_cache;
struct kmem_cache *xfs_attrd_cache;
static const struct xfs_item_ops xfs_attri_item_ops; static const struct xfs_item_ops xfs_attri_item_ops;
static const struct xfs_item_ops xfs_attrd_item_ops; static const struct xfs_item_ops xfs_attrd_item_ops;
static struct xfs_attrd_log_item *xfs_trans_get_attrd(struct xfs_trans *tp, static struct xfs_attrd_log_item *xfs_trans_get_attrd(struct xfs_trans *tp,

3
fs/xfs/xfs_attr_item.h
View File

@ -43,4 +43,7 @@ struct xfs_attrd_log_item {
struct xfs_attrd_log_format attrd_format; struct xfs_attrd_log_format attrd_format;
}; };
extern struct kmem_cache *xfs_attri_cache;
extern struct kmem_cache *xfs_attrd_cache;
#endif /* __XFS_ATTR_ITEM_H__ */ #endif /* __XFS_ATTR_ITEM_H__ */

19
fs/xfs/xfs_super.c
View File

@ -38,6 +38,7 @@
#include "xfs_pwork.h" #include "xfs_pwork.h"
#include "xfs_ag.h" #include "xfs_ag.h"
#include "xfs_defer.h" #include "xfs_defer.h"
#include "xfs_attr_item.h"
#include <linux/magic.h> #include <linux/magic.h>
#include <linux/fs_context.h> #include <linux/fs_context.h>
@ -2083,8 +2084,24 @@ xfs_init_caches(void)
if (!xfs_bui_cache) if (!xfs_bui_cache)
goto out_destroy_bud_cache; goto out_destroy_bud_cache;
xfs_attrd_cache = kmem_cache_create("xfs_attrd_item",
sizeof(struct xfs_attrd_log_item),
0, 0, NULL);
if (!xfs_attrd_cache)
goto out_destroy_bui_cache;
xfs_attri_cache = kmem_cache_create("xfs_attri_item",
sizeof(struct xfs_attri_log_item),
0, 0, NULL);
if (!xfs_attri_cache)
goto out_destroy_attrd_cache;
return 0; return 0;
out_destroy_attrd_cache:
kmem_cache_destroy(xfs_attrd_cache);
out_destroy_bui_cache:
kmem_cache_destroy(xfs_bui_cache);
out_destroy_bud_cache: out_destroy_bud_cache:
kmem_cache_destroy(xfs_bud_cache); kmem_cache_destroy(xfs_bud_cache);
out_destroy_cui_cache: out_destroy_cui_cache:
@ -2131,6 +2148,8 @@ xfs_destroy_caches(void)
* destroy caches. * destroy caches.
*/ */
rcu_barrier(); rcu_barrier();
kmem_cache_destroy(xfs_attri_cache);
kmem_cache_destroy(xfs_attrd_cache);
kmem_cache_destroy(xfs_bui_cache); kmem_cache_destroy(xfs_bui_cache);
kmem_cache_destroy(xfs_bud_cache); kmem_cache_destroy(xfs_bud_cache);
kmem_cache_destroy(xfs_cui_cache); kmem_cache_destroy(xfs_cui_cache);