projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oom: move constraints to enum
[powerpc.git]
/
mm
/
shmem.c
diff --git
a/mm/shmem.c
b/mm/shmem.c
index
8a82342
..
2048657
100644
(file)
--- a/
mm/shmem.c
+++ b/
mm/shmem.c
@@
-2328,8
+2328,7
@@
static void shmem_destroy_inode(struct inode *inode)
kmem_cache_free(shmem_inode_cachep, SHMEM_I(inode));
}
kmem_cache_free(shmem_inode_cachep, SHMEM_I(inode));
}
-static void init_once(void *foo, struct kmem_cache *cachep,
- unsigned long flags)
+static void init_once(struct kmem_cache *cachep, void *foo)
{
struct shmem_inode_info *p = (struct shmem_inode_info *) foo;
{
struct shmem_inode_info *p = (struct shmem_inode_info *) foo;
@@
-2464,6
+2463,10
@@
static int __init init_tmpfs(void)
{
int error;
{
int error;
+ error = bdi_init(&shmem_backing_dev_info);
+ if (error)
+ goto out4;
+
error = init_inodecache();
if (error)
goto out3;
error = init_inodecache();
if (error)
goto out3;
@@
-2488,6
+2491,8
@@
out1:
out2:
destroy_inodecache();
out3:
out2:
destroy_inodecache();
out3:
+ bdi_destroy(&shmem_backing_dev_info);
+out4:
shm_mnt = ERR_PTR(error);
return error;
}
shm_mnt = ERR_PTR(error);
return error;
}