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/qnx4/inode.c | |
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/qnx4/inode.c')
-rw-r--r-- | fs/qnx4/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index 8d256eb11813..1bc8d873a9e1 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c | |||
@@ -545,7 +545,7 @@ static int init_inodecache(void) | |||
545 | sizeof(struct qnx4_inode_info), | 545 | sizeof(struct qnx4_inode_info), |
546 | 0, (SLAB_RECLAIM_ACCOUNT| | 546 | 0, (SLAB_RECLAIM_ACCOUNT| |
547 | SLAB_MEM_SPREAD), | 547 | SLAB_MEM_SPREAD), |
548 | init_once, NULL); | 548 | init_once); |
549 | if (qnx4_inode_cachep == NULL) | 549 | if (qnx4_inode_cachep == NULL) |
550 | return -ENOMEM; | 550 | return -ENOMEM; |
551 | return 0; | 551 | return 0; |