Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 23421
b: refs/heads/master
c: b019600
h: refs/heads/master
i:
  23419: 63341eb
v: v3
  • Loading branch information
Paul Jackson authored and Linus Torvalds committed Mar 24, 2006
1 parent 6dc90b0 commit e430b7c
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c61afb181c649754ea221f104e268cbacfc993e3
refs/heads/master: b0196009d8c3ecf6ea6ec080c63d2ccc146e7ad9
7 changes: 5 additions & 2 deletions trunk/fs/buffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -3143,8 +3143,11 @@ void __init buffer_init(void)
int nrpages;

bh_cachep = kmem_cache_create("buffer_head",
sizeof(struct buffer_head), 0,
SLAB_RECLAIM_ACCOUNT|SLAB_PANIC, init_buffer_head, NULL);
sizeof(struct buffer_head), 0,
(SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
SLAB_MEM_SPREAD),
init_buffer_head,
NULL);

/*
* Limit the bh occupancy to 10% of ZONE_NORMAL
Expand Down
3 changes: 2 additions & 1 deletion trunk/fs/dcache.c
Original file line number Diff line number Diff line change
Expand Up @@ -1682,7 +1682,8 @@ static void __init dcache_init(unsigned long mempages)
dentry_cache = kmem_cache_create("dentry_cache",
sizeof(struct dentry),
0,
SLAB_RECLAIM_ACCOUNT|SLAB_PANIC,
(SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
SLAB_MEM_SPREAD),
NULL, NULL);

set_shrinker(DEFAULT_SEEKS, shrink_dcache_memory);
Expand Down
9 changes: 7 additions & 2 deletions trunk/fs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -1375,8 +1375,13 @@ void __init inode_init(unsigned long mempages)
int loop;

/* inode slab cache */
inode_cachep = kmem_cache_create("inode_cache", sizeof(struct inode),
0, SLAB_RECLAIM_ACCOUNT|SLAB_PANIC, init_once, NULL);
inode_cachep = kmem_cache_create("inode_cache",
sizeof(struct inode),
0,
(SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
SLAB_MEM_SPREAD),
init_once,
NULL);
set_shrinker(DEFAULT_SEEKS, shrink_icache_memory);

/* Hash may have been set up in inode_init_early */
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/xfs/linux-2.6/kmem.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ extern void kmem_free(void *, size_t);

#define KM_ZONE_HWALIGN SLAB_HWCACHE_ALIGN
#define KM_ZONE_RECLAIM SLAB_RECLAIM_ACCOUNT
#define KM_ZONE_SPREAD 0
#define KM_ZONE_SPREAD SLAB_MEM_SPREAD

#define kmem_zone kmem_cache
#define kmem_zone_t struct kmem_cache
Expand Down

0 comments on commit e430b7c

Please sign in to comment.