Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-07 13:53:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xfs: remove kmem_zone typedef

Browse Source 
Remove these typedefs by referencing kmem_cache directly.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Chandan Babu R <chandan.babu@oracle.com>
This commit is contained in:
Darrick J. Wong 2021-09-27 14:26:19 -07:00
parent 9fa47bdcd3
commit e7720afad0
37 changed files with 50 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/xfs/kmem.h
View File

@ -72,10 +72,6 @@ kmem_zalloc(size_t size, xfs_km_flags_t flags)
/* /*
* Zone interfaces * Zone interfaces
*/ */
#define kmem_zone kmem_cache
#define kmem_zone_t struct kmem_cache
static inline struct page * static inline struct page *
kmem_to_page(void *addr) kmem_to_page(void *addr)
{ {

2
fs/xfs/libxfs/xfs_alloc.c
View File

@ -27,7 +27,7 @@
#include "xfs_ag_resv.h" #include "xfs_ag_resv.h"
#include "xfs_bmap.h" #include "xfs_bmap.h"
extern kmem_zone_t *xfs_bmap_free_item_zone; extern struct kmem_cache *xfs_bmap_free_item_zone;
struct workqueue_struct *xfs_alloc_wq; struct workqueue_struct *xfs_alloc_wq;

2
fs/xfs/libxfs/xfs_alloc_btree.c
View File

@ -20,7 +20,7 @@
#include "xfs_trans.h" #include "xfs_trans.h"
#include "xfs_ag.h" #include "xfs_ag.h"
static kmem_zone_t *xfs_allocbt_cur_cache; static struct kmem_cache *xfs_allocbt_cur_cache;
STATIC struct xfs_btree_cur * STATIC struct xfs_btree_cur *
xfs_allocbt_dup_cursor( xfs_allocbt_dup_cursor(

2
fs/xfs/libxfs/xfs_bmap.c
View File

@ -38,7 +38,7 @@
#include "xfs_iomap.h" #include "xfs_iomap.h"
kmem_zone_t *xfs_bmap_free_item_zone; struct kmem_cache *xfs_bmap_free_item_zone;
/* /*
* Miscellaneous helper functions * Miscellaneous helper functions

2
fs/xfs/libxfs/xfs_bmap.h
View File

@ -13,7 +13,7 @@ struct xfs_inode;
struct xfs_mount; struct xfs_mount;
struct xfs_trans; struct xfs_trans;
extern kmem_zone_t *xfs_bmap_free_item_zone; extern struct kmem_cache *xfs_bmap_free_item_zone;
/* /*
* Argument structure for xfs_bmap_alloc. * Argument structure for xfs_bmap_alloc.

2
fs/xfs/libxfs/xfs_bmap_btree.c
View File

@ -22,7 +22,7 @@
#include "xfs_trace.h" #include "xfs_trace.h"
#include "xfs_rmap.h" #include "xfs_rmap.h"
static kmem_zone_t *xfs_bmbt_cur_cache; static struct kmem_cache *xfs_bmbt_cur_cache;
/* /*
* Convert on-disk form of btree root to in-memory form. * Convert on-disk form of btree root to in-memory form.

4
fs/xfs/libxfs/xfs_btree.h
View File

@ -230,7 +230,7 @@ struct xfs_btree_cur
struct xfs_trans *bc_tp; /* transaction we're in, if any */ struct xfs_trans *bc_tp; /* transaction we're in, if any */
struct xfs_mount *bc_mp; /* file system mount struct */ struct xfs_mount *bc_mp; /* file system mount struct */
const struct xfs_btree_ops *bc_ops; const struct xfs_btree_ops *bc_ops;
kmem_zone_t *bc_cache; /* cursor cache */ struct kmem_cache *bc_cache; /* cursor cache */
unsigned int bc_flags; /* btree features - below */ unsigned int bc_flags; /* btree features - below */
xfs_btnum_t bc_btnum; /* identifies which btree type */ xfs_btnum_t bc_btnum; /* identifies which btree type */
union xfs_btree_irec bc_rec; /* current insert/search record value */ union xfs_btree_irec bc_rec; /* current insert/search record value */
@ -586,7 +586,7 @@ xfs_btree_alloc_cursor(
struct xfs_trans *tp, struct xfs_trans *tp,
xfs_btnum_t btnum, xfs_btnum_t btnum,
uint8_t maxlevels, uint8_t maxlevels,
kmem_zone_t *cache) struct kmem_cache *cache)
{ {
struct xfs_btree_cur *cur; struct xfs_btree_cur *cur;

2
fs/xfs/libxfs/xfs_da_btree.c
View File

@ -72,7 +72,7 @@ STATIC int xfs_da3_blk_unlink(xfs_da_state_t *state,
xfs_da_state_blk_t *save_blk); xfs_da_state_blk_t *save_blk);
kmem_zone_t *xfs_da_state_zone; /* anchor for state struct zone */ struct kmem_cache *xfs_da_state_zone; /* anchor for state struct zone */
/* /*
* Allocate a dir-state structure. * Allocate a dir-state structure.

2
fs/xfs/libxfs/xfs_da_btree.h
View File

@ -227,6 +227,6 @@ void xfs_da3_node_hdr_from_disk(struct xfs_mount *mp,
void xfs_da3_node_hdr_to_disk(struct xfs_mount *mp, void xfs_da3_node_hdr_to_disk(struct xfs_mount *mp,
struct xfs_da_intnode *to, struct xfs_da3_icnode_hdr *from); struct xfs_da_intnode *to, struct xfs_da3_icnode_hdr *from);
extern struct kmem_zone *xfs_da_state_zone; extern struct kmem_cache *xfs_da_state_zone;
#endif /* __XFS_DA_BTREE_H__ */ #endif /* __XFS_DA_BTREE_H__ */

2
fs/xfs/libxfs/xfs_ialloc_btree.c
View File

@ -22,7 +22,7 @@
#include "xfs_rmap.h" #include "xfs_rmap.h"
#include "xfs_ag.h" #include "xfs_ag.h"
static kmem_zone_t *xfs_inobt_cur_cache; static struct kmem_cache *xfs_inobt_cur_cache;
STATIC int STATIC int
xfs_inobt_get_minrecs( xfs_inobt_get_minrecs(

2
fs/xfs/libxfs/xfs_inode_fork.c
View File

@ -26,7 +26,7 @@
#include "xfs_types.h" #include "xfs_types.h"
#include "xfs_errortag.h" #include "xfs_errortag.h"
kmem_zone_t *xfs_ifork_zone; struct kmem_cache *xfs_ifork_zone;
void void
xfs_init_local_fork( xfs_init_local_fork(

2
fs/xfs/libxfs/xfs_inode_fork.h
View File

@ -221,7 +221,7 @@ static inline bool xfs_iext_peek_prev_extent(struct xfs_ifork *ifp,
xfs_iext_get_extent((ifp), (ext), (got)); \ xfs_iext_get_extent((ifp), (ext), (got)); \
xfs_iext_next((ifp), (ext))) xfs_iext_next((ifp), (ext)))
extern struct kmem_zone *xfs_ifork_zone; extern struct kmem_cache *xfs_ifork_zone;
extern void xfs_ifork_init_cow(struct xfs_inode *ip); extern void xfs_ifork_init_cow(struct xfs_inode *ip);

2
fs/xfs/libxfs/xfs_refcount_btree.c
View File

@ -21,7 +21,7 @@
#include "xfs_rmap.h" #include "xfs_rmap.h"
#include "xfs_ag.h" #include "xfs_ag.h"
static kmem_zone_t *xfs_refcountbt_cur_cache; static struct kmem_cache *xfs_refcountbt_cur_cache;
static struct xfs_btree_cur * static struct xfs_btree_cur *
xfs_refcountbt_dup_cursor( xfs_refcountbt_dup_cursor(

2
fs/xfs/libxfs/xfs_rmap_btree.c
View File

@ -22,7 +22,7 @@
#include "xfs_ag.h" #include "xfs_ag.h"
#include "xfs_ag_resv.h" #include "xfs_ag_resv.h"
static kmem_zone_t *xfs_rmapbt_cur_cache; static struct kmem_cache *xfs_rmapbt_cur_cache;
/* /*
* Reverse map btree. * Reverse map btree.

4
fs/xfs/xfs_bmap_item.c
View File

@ -25,8 +25,8 @@
#include "xfs_log_priv.h" #include "xfs_log_priv.h"
#include "xfs_log_recover.h" #include "xfs_log_recover.h"
kmem_zone_t *xfs_bui_zone; struct kmem_cache *xfs_bui_zone;
kmem_zone_t *xfs_bud_zone; struct kmem_cache *xfs_bud_zone;
static const struct xfs_item_ops xfs_bui_item_ops; static const struct xfs_item_ops xfs_bui_item_ops;

6
fs/xfs/xfs_bmap_item.h
View File

@ -25,7 +25,7 @@
/* kernel only BUI/BUD definitions */ /* kernel only BUI/BUD definitions */
struct xfs_mount; struct xfs_mount;
struct kmem_zone; struct kmem_cache;
/* /*
* Max number of extents in fast allocation path. * Max number of extents in fast allocation path.
@ -65,7 +65,7 @@ struct xfs_bud_log_item {
struct xfs_bud_log_format bud_format; struct xfs_bud_log_format bud_format;
}; };
extern struct kmem_zone *xfs_bui_zone; extern struct kmem_cache *xfs_bui_zone;
extern struct kmem_zone *xfs_bud_zone; extern struct kmem_cache *xfs_bud_zone;
#endif /* __XFS_BMAP_ITEM_H__ */ #endif /* __XFS_BMAP_ITEM_H__ */

2
fs/xfs/xfs_buf.c
View File

@ -20,7 +20,7 @@
#include "xfs_error.h" #include "xfs_error.h"
#include "xfs_ag.h" #include "xfs_ag.h"
static kmem_zone_t *xfs_buf_zone; static struct kmem_cache *xfs_buf_zone;
/* /*
* Locking orders * Locking orders

2
fs/xfs/xfs_buf_item.c
View File

@ -23,7 +23,7 @@
#include "xfs_log.h" #include "xfs_log.h"
kmem_zone_t *xfs_buf_item_zone; struct kmem_cache *xfs_buf_item_zone;
static inline struct xfs_buf_log_item *BUF_ITEM(struct xfs_log_item *lip) static inline struct xfs_buf_log_item *BUF_ITEM(struct xfs_log_item *lip)
{ {

2
fs/xfs/xfs_buf_item.h
View File

@ -71,6 +71,6 @@ static inline void xfs_buf_dquot_io_fail(struct xfs_buf *bp)
void xfs_buf_iodone(struct xfs_buf *); void xfs_buf_iodone(struct xfs_buf *);
bool xfs_buf_log_check_iovec(struct xfs_log_iovec *iovec); bool xfs_buf_log_check_iovec(struct xfs_log_iovec *iovec);
extern kmem_zone_t *xfs_buf_item_zone; extern struct kmem_cache *xfs_buf_item_zone;
#endif /* __XFS_BUF_ITEM_H__ */ #endif /* __XFS_BUF_ITEM_H__ */

4
fs/xfs/xfs_dquot.c
View File

@ -38,8 +38,8 @@
* otherwise by the lowest id first, see xfs_dqlock2. * otherwise by the lowest id first, see xfs_dqlock2.
*/ */
struct kmem_zone *xfs_qm_dqtrxzone; struct kmem_cache *xfs_qm_dqtrxzone;
static struct kmem_zone *xfs_qm_dqzone; static struct kmem_cache *xfs_qm_dqzone;
static struct lock_class_key xfs_dquot_group_class; static struct lock_class_key xfs_dquot_group_class;
static struct lock_class_key xfs_dquot_project_class; static struct lock_class_key xfs_dquot_project_class;

4
fs/xfs/xfs_extfree_item.c
View File

@ -25,8 +25,8 @@
#include "xfs_log_priv.h" #include "xfs_log_priv.h"
#include "xfs_log_recover.h" #include "xfs_log_recover.h"
kmem_zone_t *xfs_efi_zone; struct kmem_cache *xfs_efi_zone;
kmem_zone_t *xfs_efd_zone; struct kmem_cache *xfs_efd_zone;
static const struct xfs_item_ops xfs_efi_item_ops; static const struct xfs_item_ops xfs_efi_item_ops;

6
fs/xfs/xfs_extfree_item.h
View File

@ -9,7 +9,7 @@
/* kernel only EFI/EFD definitions */ /* kernel only EFI/EFD definitions */
struct xfs_mount; struct xfs_mount;
struct kmem_zone; struct kmem_cache;
/* /*
* Max number of extents in fast allocation path. * Max number of extents in fast allocation path.
@ -69,7 +69,7 @@ struct xfs_efd_log_item {
*/ */
#define XFS_EFD_MAX_FAST_EXTENTS 16 #define XFS_EFD_MAX_FAST_EXTENTS 16
extern struct kmem_zone *xfs_efi_zone; extern struct kmem_cache *xfs_efi_zone;
extern struct kmem_zone *xfs_efd_zone; extern struct kmem_cache *xfs_efd_zone;
#endif /* __XFS_EXTFREE_ITEM_H__ */ #endif /* __XFS_EXTFREE_ITEM_H__ */

2
fs/xfs/xfs_icreate_item.c
View File

@ -20,7 +20,7 @@
#include "xfs_ialloc.h" #include "xfs_ialloc.h"
#include "xfs_trace.h" #include "xfs_trace.h"
kmem_zone_t *xfs_icreate_zone; /* inode create item zone */ struct kmem_cache *xfs_icreate_zone; /* inode create item zone */
static inline struct xfs_icreate_item *ICR_ITEM(struct xfs_log_item *lip) static inline struct xfs_icreate_item *ICR_ITEM(struct xfs_log_item *lip)
{ {

2
fs/xfs/xfs_icreate_item.h
View File

@ -12,7 +12,7 @@ struct xfs_icreate_item {
struct xfs_icreate_log ic_format; struct xfs_icreate_log ic_format;
}; };
extern kmem_zone_t *xfs_icreate_zone; /* inode create item zone */ extern struct kmem_cache *xfs_icreate_zone; /* inode create item zone */
void xfs_icreate_log(struct xfs_trans *tp, xfs_agnumber_t agno, void xfs_icreate_log(struct xfs_trans *tp, xfs_agnumber_t agno,
xfs_agblock_t agbno, unsigned int count, xfs_agblock_t agbno, unsigned int count,

2
fs/xfs/xfs_inode.c
View File

@ -36,7 +36,7 @@
#include "xfs_reflink.h" #include "xfs_reflink.h"
#include "xfs_ag.h" #include "xfs_ag.h"
kmem_zone_t *xfs_inode_zone; struct kmem_cache *xfs_inode_zone;
/* /*
* Used in xfs_itruncate_extents(). This is the maximum number of extents * Used in xfs_itruncate_extents(). This is the maximum number of extents

2
fs/xfs/xfs_inode.h
View File

@ -504,7 +504,7 @@ static inline void xfs_setup_existing_inode(struct xfs_inode *ip)
void xfs_irele(struct xfs_inode *ip); void xfs_irele(struct xfs_inode *ip);
extern struct kmem_zone *xfs_inode_zone; extern struct kmem_cache *xfs_inode_zone;
/* The default CoW extent size hint. */ /* The default CoW extent size hint. */
#define XFS_DEFAULT_COWEXTSZ_HINT 32 #define XFS_DEFAULT_COWEXTSZ_HINT 32

2
fs/xfs/xfs_inode_item.c
View File

@ -21,7 +21,7 @@
#include <linux/iversion.h> #include <linux/iversion.h>
kmem_zone_t *xfs_ili_zone; /* inode log item zone */ struct kmem_cache *xfs_ili_zone; /* inode log item zone */
static inline struct xfs_inode_log_item *INODE_ITEM(struct xfs_log_item *lip) static inline struct xfs_inode_log_item *INODE_ITEM(struct xfs_log_item *lip)
{ {

2
fs/xfs/xfs_inode_item.h
View File

@ -47,6 +47,6 @@ extern void xfs_iflush_abort(struct xfs_inode *);
extern int xfs_inode_item_format_convert(xfs_log_iovec_t *, extern int xfs_inode_item_format_convert(xfs_log_iovec_t *,
struct xfs_inode_log_format *); struct xfs_inode_log_format *);
extern struct kmem_zone *xfs_ili_zone; extern struct kmem_cache *xfs_ili_zone;
#endif /* __XFS_INODE_ITEM_H__ */ #endif /* __XFS_INODE_ITEM_H__ */

2
fs/xfs/xfs_log.c
View File

@ -21,7 +21,7 @@
#include "xfs_sb.h" #include "xfs_sb.h"
#include "xfs_health.h" #include "xfs_health.h"
kmem_zone_t *xfs_log_ticket_zone; struct kmem_cache *xfs_log_ticket_zone;
/* Local miscellaneous function prototypes */ /* Local miscellaneous function prototypes */
STATIC struct xlog * STATIC struct xlog *

2
fs/xfs/xfs_log_priv.h
View File

@ -497,7 +497,7 @@ xlog_recover_cancel(struct xlog *);
extern __le32 xlog_cksum(struct xlog *log, struct xlog_rec_header *rhead, extern __le32 xlog_cksum(struct xlog *log, struct xlog_rec_header *rhead,
char *dp, int size); char *dp, int size);
extern kmem_zone_t *xfs_log_ticket_zone; extern struct kmem_cache *xfs_log_ticket_zone;
struct xlog_ticket * struct xlog_ticket *
xlog_ticket_alloc( xlog_ticket_alloc(
struct xlog *log, struct xlog *log,

2
fs/xfs/xfs_qm.h
View File

@ -11,7 +11,7 @@
struct xfs_inode; struct xfs_inode;
extern struct kmem_zone *xfs_qm_dqtrxzone; extern struct kmem_cache *xfs_qm_dqtrxzone;
/* /*
* Number of bmaps that we ask from bmapi when doing a quotacheck. * Number of bmaps that we ask from bmapi when doing a quotacheck.

4
fs/xfs/xfs_refcount_item.c
View File

@ -21,8 +21,8 @@
#include "xfs_log_priv.h" #include "xfs_log_priv.h"
#include "xfs_log_recover.h" #include "xfs_log_recover.h"
kmem_zone_t *xfs_cui_zone; struct kmem_cache *xfs_cui_zone;
kmem_zone_t *xfs_cud_zone; struct kmem_cache *xfs_cud_zone;
static const struct xfs_item_ops xfs_cui_item_ops; static const struct xfs_item_ops xfs_cui_item_ops;

6
fs/xfs/xfs_refcount_item.h
View File

@ -25,7 +25,7 @@
/* kernel only CUI/CUD definitions */ /* kernel only CUI/CUD definitions */
struct xfs_mount; struct xfs_mount;
struct kmem_zone; struct kmem_cache;
/* /*
* Max number of extents in fast allocation path. * Max number of extents in fast allocation path.
@ -68,7 +68,7 @@ struct xfs_cud_log_item {
struct xfs_cud_log_format cud_format; struct xfs_cud_log_format cud_format;
}; };
extern struct kmem_zone *xfs_cui_zone; extern struct kmem_cache *xfs_cui_zone;
extern struct kmem_zone *xfs_cud_zone; extern struct kmem_cache *xfs_cud_zone;
#endif /* __XFS_REFCOUNT_ITEM_H__ */ #endif /* __XFS_REFCOUNT_ITEM_H__ */

4
fs/xfs/xfs_rmap_item.c
View File

@ -21,8 +21,8 @@
#include "xfs_log_priv.h" #include "xfs_log_priv.h"
#include "xfs_log_recover.h" #include "xfs_log_recover.h"
kmem_zone_t *xfs_rui_zone; struct kmem_cache *xfs_rui_zone;
kmem_zone_t *xfs_rud_zone; struct kmem_cache *xfs_rud_zone;
static const struct xfs_item_ops xfs_rui_item_ops; static const struct xfs_item_ops xfs_rui_item_ops;

6
fs/xfs/xfs_rmap_item.h
View File

@ -28,7 +28,7 @@
/* kernel only RUI/RUD definitions */ /* kernel only RUI/RUD definitions */
struct xfs_mount; struct xfs_mount;
struct kmem_zone; struct kmem_cache;
/* /*
* Max number of extents in fast allocation path. * Max number of extents in fast allocation path.
@ -68,7 +68,7 @@ struct xfs_rud_log_item {
struct xfs_rud_log_format rud_format; struct xfs_rud_log_format rud_format;
}; };
extern struct kmem_zone *xfs_rui_zone; extern struct kmem_cache *xfs_rui_zone;
extern struct kmem_zone *xfs_rud_zone; extern struct kmem_cache *xfs_rud_zone;
#endif /* __XFS_RMAP_ITEM_H__ */ #endif /* __XFS_RMAP_ITEM_H__ */

2
fs/xfs/xfs_trans.c
View File

@ -25,7 +25,7 @@
#include "xfs_dquot.h" #include "xfs_dquot.h"
#include "xfs_icache.h" #include "xfs_icache.h"
kmem_zone_t *xfs_trans_zone; struct kmem_cache *xfs_trans_zone;
#if defined(CONFIG_TRACEPOINTS) #if defined(CONFIG_TRACEPOINTS)
static void static void

2
fs/xfs/xfs_trans.h
View File

@ -237,7 +237,7 @@ void xfs_trans_buf_set_type(struct xfs_trans *, struct xfs_buf *,
void xfs_trans_buf_copy_type(struct xfs_buf *dst_bp, void xfs_trans_buf_copy_type(struct xfs_buf *dst_bp,
struct xfs_buf *src_bp); struct xfs_buf *src_bp);
extern kmem_zone_t *xfs_trans_zone; extern struct kmem_cache *xfs_trans_zone;
static inline struct xfs_log_item * static inline struct xfs_log_item *
xfs_trans_item_relog( xfs_trans_item_relog(