diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 21:38:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 21:38:13 -0400 |
| commit | 9a79b2274186fade17134929d4f85b70d59a3840 (patch) | |
| tree | d74e9ecc83ef617166445501b49087726595fb63 /fs/fat | |
| parent | 75473c1d3930896bbabcc99bb58fafd53ef42473 (diff) | |
| parent | 20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (diff) | |
Merge branch 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
mm: Remove slab destructors from kmem_cache_create().
Diffstat (limited to 'fs/fat')
| -rw-r--r-- | fs/fat/cache.c | 2 | ||||
| -rw-r--r-- | fs/fat/inode.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/fat/cache.c b/fs/fat/cache.c index 3c9c8a15ec73..be6f89b152ca 100644 --- a/fs/fat/cache.c +++ b/fs/fat/cache.c | |||
| @@ -48,7 +48,7 @@ int __init fat_cache_init(void) | |||
| 48 | fat_cache_cachep = kmem_cache_create("fat_cache", | 48 | fat_cache_cachep = kmem_cache_create("fat_cache", |
| 49 | sizeof(struct fat_cache), | 49 | sizeof(struct fat_cache), |
| 50 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 50 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, |
| 51 | init_once, NULL); | 51 | init_once); |
| 52 | if (fat_cache_cachep == NULL) | 52 | if (fat_cache_cachep == NULL) |
| 53 | return -ENOMEM; | 53 | return -ENOMEM; |
| 54 | return 0; | 54 | return 0; |
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 0a7ddb39a593..4baa5f205368 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c | |||
| @@ -514,7 +514,7 @@ static int __init fat_init_inodecache(void) | |||
| 514 | sizeof(struct msdos_inode_info), | 514 | sizeof(struct msdos_inode_info), |
| 515 | 0, (SLAB_RECLAIM_ACCOUNT| | 515 | 0, (SLAB_RECLAIM_ACCOUNT| |
| 516 | SLAB_MEM_SPREAD), | 516 | SLAB_MEM_SPREAD), |
| 517 | init_once, NULL); | 517 | init_once); |
| 518 | if (fat_inode_cachep == NULL) | 518 | if (fat_inode_cachep == NULL) |
| 519 | return -ENOMEM; | 519 | return -ENOMEM; |
| 520 | return 0; | 520 | return 0; |