Commit 3758dee9 authored by Nathan Scott's avatar Nathan Scott
Browse files

[XFS] Fixup naming inconsistencies found by Pekka Enberg and one from Jan 


Engelhardt.

SGI-PV: 947038
SGI-Modid: xfs-linux-melb:xfs-kern:25529a

Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent 38e2299a

fs/xfs/quota/xfs_qm_bhv.c

+2 −2
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ xfs_qm_exit(void) 
	vfs_bhv_clr_custom(&xfs_qmops);

	xfs_qm_cleanup_procfs();

	if (qm_dqzone)

		kmem_cache_destroy(qm_dqzone);

		kmem_zone_destroy(qm_dqzone);

	if (qm_dqtrxzone)

		kmem_cache_destroy(qm_dqtrxzone);

		kmem_zone_destroy(qm_dqtrxzone);

}

fs/xfs/support/ktrace.c

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ ktrace_init(int zentries) 
void

ktrace_uninit(void)

{

	kmem_cache_destroy(ktrace_hdr_zone);

	kmem_cache_destroy(ktrace_ent_zone);

	kmem_zone_destroy(ktrace_hdr_zone);

	kmem_zone_destroy(ktrace_ent_zone);

}



/*

fs/xfs/xfs_acl.h

+2 −2
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ struct xfs_inode; 


extern struct kmem_zone *xfs_acl_zone;

#define xfs_acl_zone_init(zone, name)	\

		(zone) = kmem_zone_init(sizeof(xfs_acl_t), name)

#define xfs_acl_zone_destroy(zone)	kmem_cache_destroy(zone)

		(zone) = kmem_zone_init(sizeof(xfs_acl_t), (name))

#define xfs_acl_zone_destroy(zone)	kmem_zone_destroy(zone)



extern int xfs_acl_inherit(struct vnode *, struct vattr *, xfs_acl_t *);

extern int xfs_acl_iaccess(struct xfs_inode *, mode_t, cred_t *);

fs/xfs/xfs_vfsops.c

+14 −14
Original line number Diff line number Diff line
@@ -190,18 +190,18 @@ xfs_cleanup(void) 
	ktrace_free(xfs_alloc_trace_buf);

#endif



	kmem_cache_destroy(xfs_bmap_free_item_zone);

	kmem_cache_destroy(xfs_btree_cur_zone);

	kmem_cache_destroy(xfs_inode_zone);

	kmem_cache_destroy(xfs_trans_zone);

	kmem_cache_destroy(xfs_da_state_zone);

	kmem_cache_destroy(xfs_dabuf_zone);

	kmem_cache_destroy(xfs_buf_item_zone);

	kmem_cache_destroy(xfs_efd_zone);

	kmem_cache_destroy(xfs_efi_zone);

	kmem_cache_destroy(xfs_ifork_zone);

	kmem_cache_destroy(xfs_ili_zone);

	kmem_cache_destroy(xfs_chashlist_zone);

	kmem_zone_destroy(xfs_bmap_free_item_zone);

	kmem_zone_destroy(xfs_btree_cur_zone);

	kmem_zone_destroy(xfs_inode_zone);

	kmem_zone_destroy(xfs_trans_zone);

	kmem_zone_destroy(xfs_da_state_zone);

	kmem_zone_destroy(xfs_dabuf_zone);

	kmem_zone_destroy(xfs_buf_item_zone);

	kmem_zone_destroy(xfs_efd_zone);

	kmem_zone_destroy(xfs_efi_zone);

	kmem_zone_destroy(xfs_ifork_zone);

	kmem_zone_destroy(xfs_ili_zone);

	kmem_zone_destroy(xfs_chashlist_zone);

}



/*