projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[platform/kernel/linux-rpi.git]
/
fs
/
gfs2
/
main.c
diff --git
a/fs/gfs2/main.c
b/fs/gfs2/main.c
index
79c91fd
..
053e2eb
100644
(file)
--- a/
fs/gfs2/main.c
+++ b/
fs/gfs2/main.c
@@
-24,17
+24,16
@@
#include "util.h"
#include "glock.h"
#include "util.h"
#include "glock.h"
-static void gfs2_init_inode_once(
void *foo, struct kmem_cache *cachep, unsigned long flags
)
+static void gfs2_init_inode_once(
struct kmem_cache *cachep, void *foo
)
{
struct gfs2_inode *ip = foo;
inode_init_once(&ip->i_inode);
{
struct gfs2_inode *ip = foo;
inode_init_once(&ip->i_inode);
- spin_lock_init(&ip->i_spin);
init_rwsem(&ip->i_rw_mutex);
init_rwsem(&ip->i_rw_mutex);
-
memset(ip->i_cache, 0, sizeof(ip->i_cache))
;
+
ip->i_alloc = NULL
;
}
}
-static void gfs2_init_glock_once(
void *foo, struct kmem_cache *cachep, unsigned long flags
)
+static void gfs2_init_glock_once(
struct kmem_cache *cachep, void *foo
)
{
struct gfs2_glock *gl = foo;
{
struct gfs2_glock *gl = foo;
@@
-90,6
+89,12
@@
static int __init init_gfs2_fs(void)
if (!gfs2_bufdata_cachep)
goto fail;
if (!gfs2_bufdata_cachep)
goto fail;
+ gfs2_rgrpd_cachep = kmem_cache_create("gfs2_rgrpd",
+ sizeof(struct gfs2_rgrpd),
+ 0, 0, NULL);
+ if (!gfs2_rgrpd_cachep)
+ goto fail;
+
error = register_filesystem(&gfs2_fs_type);
if (error)
goto fail;
error = register_filesystem(&gfs2_fs_type);
if (error)
goto fail;
@@
-109,6
+114,9
@@
fail_unregister:
fail:
gfs2_glock_exit();
fail:
gfs2_glock_exit();
+ if (gfs2_rgrpd_cachep)
+ kmem_cache_destroy(gfs2_rgrpd_cachep);
+
if (gfs2_bufdata_cachep)
kmem_cache_destroy(gfs2_bufdata_cachep);
if (gfs2_bufdata_cachep)
kmem_cache_destroy(gfs2_bufdata_cachep);
@@
-134,6
+142,7
@@
static void __exit exit_gfs2_fs(void)
unregister_filesystem(&gfs2_fs_type);
unregister_filesystem(&gfs2meta_fs_type);
unregister_filesystem(&gfs2_fs_type);
unregister_filesystem(&gfs2meta_fs_type);
+ kmem_cache_destroy(gfs2_rgrpd_cachep);
kmem_cache_destroy(gfs2_bufdata_cachep);
kmem_cache_destroy(gfs2_inode_cachep);
kmem_cache_destroy(gfs2_glock_cachep);
kmem_cache_destroy(gfs2_bufdata_cachep);
kmem_cache_destroy(gfs2_inode_cachep);
kmem_cache_destroy(gfs2_glock_cachep);