diff options
| -rw-r--r-- | fs/ext4/block_validity.c | 3 | ||||
| -rw-r--r-- | fs/ext4/mballoc.c | 18 | 
2 files changed, 7 insertions, 14 deletions
diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c index 3db5084db9b..68bab70dd13 100644 --- a/fs/ext4/block_validity.c +++ b/fs/ext4/block_validity.c @@ -31,8 +31,7 @@ static struct kmem_cache *ext4_system_zone_cachep;  int __init init_ext4_system_zone(void)  { -	ext4_system_zone_cachep = KMEM_CACHE(ext4_system_zone, -					     SLAB_RECLAIM_ACCOUNT); +	ext4_system_zone_cachep = KMEM_CACHE(ext4_system_zone, 0);  	if (ext4_system_zone_cachep == NULL)  		return -ENOMEM;  	return 0; diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 3f62df50f48..d732ef5a835 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2706,26 +2706,20 @@ static void ext4_remove_debugfs_entry(void)  int __init init_ext4_mballoc(void)  { -	ext4_pspace_cachep = -		kmem_cache_create("ext4_prealloc_space", -				     sizeof(struct ext4_prealloc_space), -				     0, SLAB_RECLAIM_ACCOUNT, NULL); +	ext4_pspace_cachep = KMEM_CACHE(ext4_prealloc_space, +					SLAB_RECLAIM_ACCOUNT);  	if (ext4_pspace_cachep == NULL)  		return -ENOMEM; -	ext4_ac_cachep = -		kmem_cache_create("ext4_alloc_context", -				     sizeof(struct ext4_allocation_context), -				     0, SLAB_RECLAIM_ACCOUNT, NULL); +	ext4_ac_cachep = KMEM_CACHE(ext4_allocation_context, +				    SLAB_RECLAIM_ACCOUNT);  	if (ext4_ac_cachep == NULL) {  		kmem_cache_destroy(ext4_pspace_cachep);  		return -ENOMEM;  	} -	ext4_free_ext_cachep = -		kmem_cache_create("ext4_free_block_extents", -				     sizeof(struct ext4_free_data), -				     0, SLAB_RECLAIM_ACCOUNT, NULL); +	ext4_free_ext_cachep = KMEM_CACHE(ext4_free_data, +					  SLAB_RECLAIM_ACCOUNT);  	if (ext4_free_ext_cachep == NULL) {  		kmem_cache_destroy(ext4_pspace_cachep);  		kmem_cache_destroy(ext4_ac_cachep);  |