diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-06 09:10:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-06 09:10:25 -0800 |
| commit | 64651309a1f0de3da131c8dc1d279c932fa979c7 (patch) | |
| tree | ee90f6a40fc8c731963eb459124fb32753f20113 /fs/gfs2/main.c | |
| parent | b7651030a56b9aa80e9cb43b4c8bb28b89c42359 (diff) | |
| parent | e2de7f565521a76fbbb927f701c5a1d381c71a93 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
[DLM] fix oops in kref_put when removing a lockspace
[DLM] Fix kref_put oops
[GFS2] Fix OOM error handling
[GFS2] Fix incorrect fs sync behaviour.
[GFS2] don't panic needlessly
Diffstat (limited to 'fs/gfs2/main.c')
| -rw-r--r-- | fs/gfs2/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c index 21508a13bb7..9889c1eacec 100644 --- a/fs/gfs2/main.c +++ b/fs/gfs2/main.c @@ -84,8 +84,8 @@ static int __init init_gfs2_fs(void) gfs2_inode_cachep = kmem_cache_create("gfs2_inode", sizeof(struct gfs2_inode), - 0, (SLAB_RECLAIM_ACCOUNT| - SLAB_PANIC|SLAB_MEM_SPREAD), + 0, SLAB_RECLAIM_ACCOUNT| + SLAB_MEM_SPREAD, gfs2_init_inode_once, NULL); if (!gfs2_inode_cachep) goto fail; |