diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2010-10-27 23:44:47 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2010-10-27 23:44:47 -0400 |
| commit | a107e5a3a473a2ea62bd5af24e11b84adf1486ff (patch) | |
| tree | d36c2cb38d8be88d4d75cdebc354aa140aa0e470 /fs/ext4/block_validity.c | |
| parent | e3e1288e86a07cdeb0aee5860a2dff111c6eff79 (diff) | |
| parent | a269029d0e2192046be4c07ed78a45022469ee4c (diff) | |
| download | kernel_samsung_smdk4412-a107e5a3a473a2ea62bd5af24e11b84adf1486ff.zip kernel_samsung_smdk4412-a107e5a3a473a2ea62bd5af24e11b84adf1486ff.tar.gz kernel_samsung_smdk4412-a107e5a3a473a2ea62bd5af24e11b84adf1486ff.tar.bz2 | |
Merge branch 'next' into upstream-merge
Conflicts:
fs/ext4/inode.c
fs/ext4/mballoc.c
include/trace/events/ext4.h
Diffstat (limited to 'fs/ext4/block_validity.c')
| -rw-r--r-- | fs/ext4/block_validity.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c index 3db5084..fac90f3 100644 --- a/fs/ext4/block_validity.c +++ b/fs/ext4/block_validity.c @@ -29,16 +29,15 @@ struct ext4_system_zone { static struct kmem_cache *ext4_system_zone_cachep; -int __init init_ext4_system_zone(void) +int __init ext4_init_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; } -void exit_ext4_system_zone(void) +void ext4_exit_system_zone(void) { kmem_cache_destroy(ext4_system_zone_cachep); } |