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/befs | |
| 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/befs')
| -rw-r--r-- | fs/befs/linuxvfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index a5c5171c28..a451418276 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c | |||
| @@ -414,7 +414,7 @@ befs_read_inode(struct inode *inode) | |||
| 414 | } | 414 | } |
| 415 | 415 | ||
| 416 | /* Initialize the inode cache. Called at fs setup. | 416 | /* Initialize the inode cache. Called at fs setup. |
| 417 | * | 417 | * |
| 418 | * Taken from NFS implementation by Al Viro. | 418 | * Taken from NFS implementation by Al Viro. |
| 419 | */ | 419 | */ |
| 420 | static int | 420 | static int |
| @@ -424,7 +424,7 @@ befs_init_inodecache(void) | |||
| 424 | sizeof (struct befs_inode_info), | 424 | sizeof (struct befs_inode_info), |
| 425 | 0, (SLAB_RECLAIM_ACCOUNT| | 425 | 0, (SLAB_RECLAIM_ACCOUNT| |
| 426 | SLAB_MEM_SPREAD), | 426 | SLAB_MEM_SPREAD), |
| 427 | init_once, NULL); | 427 | init_once); |
| 428 | if (befs_inode_cachep == NULL) { | 428 | if (befs_inode_cachep == NULL) { |
| 429 | printk(KERN_ERR "befs_init_inodecache: " | 429 | printk(KERN_ERR "befs_init_inodecache: " |
| 430 | "Couldn't initalize inode slabcache\n"); | 430 | "Couldn't initalize inode slabcache\n"); |