diff options
author | Steve French <sfrench@us.ibm.com> | 2006-03-30 22:35:56 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-03-30 22:35:56 -0500 |
commit | d62e54abca1146981fc9f98f85ff398a113a22c2 (patch) | |
tree | 870420dbc4c65e716dcef8a802aafdc0ef97a8b4 /fs/qnx4/inode.c | |
parent | fd4a0b92db6a57cba8d03efbe1cebf91f9124ce0 (diff) | |
parent | ce362c009250340358a7221f3cdb7954cbf19c01 (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/qnx4/inode.c')
-rw-r--r-- | fs/qnx4/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index 80f32911c0cb..2ecd46f85e9f 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c | |||
@@ -546,7 +546,8 @@ static int init_inodecache(void) | |||
546 | { | 546 | { |
547 | qnx4_inode_cachep = kmem_cache_create("qnx4_inode_cache", | 547 | qnx4_inode_cachep = kmem_cache_create("qnx4_inode_cache", |
548 | sizeof(struct qnx4_inode_info), | 548 | sizeof(struct qnx4_inode_info), |
549 | 0, SLAB_RECLAIM_ACCOUNT, | 549 | 0, (SLAB_RECLAIM_ACCOUNT| |
550 | SLAB_MEM_SPREAD), | ||
550 | init_once, NULL); | 551 | init_once, NULL); |
551 | if (qnx4_inode_cachep == NULL) | 552 | if (qnx4_inode_cachep == NULL) |
552 | return -ENOMEM; | 553 | return -ENOMEM; |