Skip to content

Commit

Permalink
SLAB_PANIC more (proc, posix-timers, shmem)
Browse files Browse the repository at this point in the history
These aren't modular, so SLAB_PANIC is OK.

Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Alexey Dobriyan authored and Linus Torvalds committed Oct 17, 2007
1 parent c4f3b63 commit 040b5c6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
4 changes: 1 addition & 3 deletions fs/proc/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,8 @@ int __init proc_init_inodecache(void)
proc_inode_cachep = kmem_cache_create("proc_inode_cache",
sizeof(struct proc_inode),
0, (SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD),
SLAB_MEM_SPREAD|SLAB_PANIC),
init_once);
if (proc_inode_cachep == NULL)
return -ENOMEM;
return 0;
}

Expand Down
3 changes: 2 additions & 1 deletion kernel/posix-timers.c
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,8 @@ static __init int init_posix_timers(void)
register_posix_clock(CLOCK_MONOTONIC, &clock_monotonic);

posix_timers_cache = kmem_cache_create("posix_timers_cache",
sizeof (struct k_itimer), 0, 0, NULL);
sizeof (struct k_itimer), 0, SLAB_PANIC,
NULL);
idr_init(&posix_timers_id);
return 0;
}
Expand Down
4 changes: 1 addition & 3 deletions mm/shmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -2343,9 +2343,7 @@ static int init_inodecache(void)
{
shmem_inode_cachep = kmem_cache_create("shmem_inode_cache",
sizeof(struct shmem_inode_info),
0, 0, init_once);
if (shmem_inode_cachep == NULL)
return -ENOMEM;
0, SLAB_PANIC, init_once);
return 0;
}

Expand Down

0 comments on commit 040b5c6

Please sign in to comment.