2007-05-18 18:14:21

by Christoph Lameter

Subject: [patch 10/10] ext2 ext3 ext4: support inode slab defragmentation

Signed-off-by: Christoph Lameter <[email protected]>

---
fs/ext2/super.c | 16 ++++++++++++++--
fs/ext3/super.c | 14 +++++++++++++-
fs/ext4/super.c | 15 ++++++++++++++-
3 files changed, 41 insertions(+), 4 deletions(-)

Index: slub/fs/ext2/super.c
===================================================================
--- slub.orig/fs/ext2/super.c 2007-05-18 10:19:12.000000000 -0700
+++ slub/fs/ext2/super.c 2007-05-18 10:24:03.000000000 -0700
@@ -168,14 +168,26 @@ static void init_once(void * foo, struct
mutex_init(&ei->truncate_mutex);
inode_init_once(&ei->vfs_inode);
}
-
+
+static void *ext2_get_inodes(struct kmem_cache *s, int nr, void **v)
+{
+ return fs_get_inodes(s, nr, v,
+ offsetof(struct ext2_inode_info, vfs_inode));
+}
+
+static struct kmem_cache_ops ext2_kmem_cache_ops = {
+ ext2_get_inodes,
+ kick_inodes
+};
+
static int init_inodecache(void)
{
ext2_inode_cachep = kmem_cache_create("ext2_inode_cache",
sizeof(struct ext2_inode_info),
0, (SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD),
- init_once, NULL);
+ init_once,
+ &ext2_kmem_cache_ops);
if (ext2_inode_cachep == NULL)
return -ENOMEM;
return 0;
Index: slub/fs/ext3/super.c
===================================================================
--- slub.orig/fs/ext3/super.c 2007-05-18 10:22:01.000000000 -0700
+++ slub/fs/ext3/super.c 2007-05-18 10:23:04.000000000 -0700
@@ -475,13 +475,25 @@ static void init_once(void * foo, struct
inode_init_once(&ei->vfs_inode);
}

+static void *ext3_get_inodes(struct kmem_cache *s, int nr, void **v)
+{
+ return fs_get_inodes(s, nr, v,
+ offsetof(struct ext3_inode_info, vfs_inode));
+}
+
+static struct kmem_cache_ops ext3_kmem_cache_ops = {
+ ext3_get_inodes,
+ kick_inodes
+};
+
static int init_inodecache(void)
{
ext3_inode_cachep = kmem_cache_create("ext3_inode_cache",
sizeof(struct ext3_inode_info),
0, (SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD),
- init_once, NULL);
+ init_once,
+ &ext3_kmem_cache_ops);
if (ext3_inode_cachep == NULL)
return -ENOMEM;
return 0;
Index: slub/fs/ext4/super.c
===================================================================
--- slub.orig/fs/ext4/super.c 2007-05-18 10:23:15.000000000 -0700
+++ slub/fs/ext4/super.c 2007-05-18 10:23:48.000000000 -0700
@@ -535,13 +535,26 @@ static void init_once(void * foo, struct
inode_init_once(&ei->vfs_inode);
}

+static void *ext4_get_inodes(struct kmem_cache *s, int nr, void **v)
+{
+ return fs_get_inodes(s, nr, v,
+ offsetof(struct ext4_inode_info, vfs_inode));
+}
+
+static struct kmem_cache_ops ext4_kmem_cache_ops = {
+ ext4_get_inodes,
+ kick_inodes
+};
+
+
static int init_inodecache(void)
{
ext4_inode_cachep = kmem_cache_create("ext4_inode_cache",
sizeof(struct ext4_inode_info),
0, (SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD),
- init_once, NULL);
+ init_once,
+ &ext4_kmem_cache_ops);
if (ext4_inode_cachep == NULL)
return -ENOMEM;
return 0;

--

2007-05-18 20:36:47

by Jan Engelhardt

Subject: Re: [patch 10/10] ext2 ext3 ext4: support inode slab defragmentation

On May 18 2007 11:10, [email protected] wrote:
>+
>+static struct kmem_cache_ops ext2_kmem_cache_ops = {
>+ ext2_get_inodes,
>+ kick_inodes
>+};
>+

We love C99 names:

static struct kmem_cache_ops ext2_kmem_cache_ops = {
.get = ext2_get_inodes,
.kick = kick_inodes,
};


Jan
--

2007-05-18 21:03:23

by Christoph Lameter

Subject: Re: [patch 10/10] ext2 ext3 ext4: support inode slab defragmentation

On Fri, 18 May 2007, Jan Engelhardt wrote:

>
> On May 18 2007 11:10, [email protected] wrote:
> >+
> >+static struct kmem_cache_ops ext2_kmem_cache_ops = {
> >+ ext2_get_inodes,
> >+ kick_inodes
> >+};
> >+
>
> We love C99 names:
>
> static struct kmem_cache_ops ext2_kmem_cache_ops = {
> .get = ext2_get_inodes,
> .kick = kick_inodes,
> };
>

Right. The other patches all have C99 names in kmem_cache_ops. The mass
handling of extxx filesystems must have made me loose sight of that. Next
rev will have it.