Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 117638
b: refs/heads/master
c: 5bcd7ff
h: refs/heads/master
v: v3
  • Loading branch information
Alexey Dobriyan committed Oct 23, 2008
1 parent 3c03a39 commit 52a2015
Show file tree
Hide file tree
Showing 4 changed files with 6 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: 7c88db0cb589df980acfb2f73c3595a0653004ec
refs/heads/master: 5bcd7ff9e1690dbdbccb2a1cb3c2ea8b8381c435
3 changes: 1 addition & 2 deletions trunk/fs/proc/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,13 @@ static void init_once(void *foo)
inode_init_once(&ei->vfs_inode);
}

int __init proc_init_inodecache(void)
void __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_PANIC),
init_once);
return 0;
}

static const struct super_operations proc_sops = {
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/proc/internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ extern const struct inode_operations proc_net_inode_operations;

void free_proc_entry(struct proc_dir_entry *de);

int proc_init_inodecache(void);
void proc_init_inodecache(void);

static inline struct pid *proc_pid(struct inode *inode)
{
Expand Down
6 changes: 3 additions & 3 deletions trunk/fs/proc/root.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ static struct file_system_type proc_fs_type = {

void __init proc_root_init(void)
{
int err = proc_init_inodecache();
if (err)
return;
int err;

proc_init_inodecache();
err = register_filesystem(&proc_fs_type);
if (err)
return;
Expand Down

0 comments on commit 52a2015

Please sign in to comment.