Re: [patch 06/10] xfs: inode defragmentation support

2007-05-18 Thread Christoph Lameter
Rats. Missing a piece due to the need to change the parameters of
kmem_zone_init_flags (Isnt it possible to use kmem_cache_create 
directly?).

Signed-off-by: Christoph Lameter <[EMAIL PROTECTED]>

Index: slub/fs/xfs/xfs_vfsops.c
===
--- slub.orig/fs/xfs/xfs_vfsops.c   2007-05-18 11:23:27.0 -0700
+++ slub/fs/xfs/xfs_vfsops.c2007-05-17 22:14:34.0 -0700
@@ -109,13 +109,13 @@ xfs_init(void)
xfs_inode_zone =
kmem_zone_init_flags(sizeof(xfs_inode_t), "xfs_inode",
KM_ZONE_HWALIGN | KM_ZONE_RECLAIM |
-   KM_ZONE_SPREAD, NULL);
+   KM_ZONE_SPREAD, NULL, NULL);
xfs_ili_zone =
kmem_zone_init_flags(sizeof(xfs_inode_log_item_t), "xfs_ili",
-   KM_ZONE_SPREAD, NULL);
+   KM_ZONE_SPREAD, NULL, NULL);
xfs_chashlist_zone =
kmem_zone_init_flags(sizeof(xfs_chashlist_t), "xfs_chashlist",
-   KM_ZONE_SPREAD, NULL);
+   KM_ZONE_SPREAD, NULL, NULL);
 
/*
 * Allocate global trace buffers.

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[patch 06/10] xfs: inode defragmentation support

2007-05-18 Thread clameter
Add slab defrag support.

Signed-off-by: Christoph Lameter <[EMAIL PROTECTED]>

---
 fs/xfs/linux-2.6/kmem.h  |5 +++--
 fs/xfs/linux-2.6/xfs_buf.c   |2 +-
 fs/xfs/linux-2.6/xfs_super.c |   13 -
 3 files changed, 16 insertions(+), 4 deletions(-)

Index: slub/fs/xfs/linux-2.6/kmem.h
===
--- slub.orig/fs/xfs/linux-2.6/kmem.h   2007-05-18 00:54:30.0 -0700
+++ slub/fs/xfs/linux-2.6/kmem.h2007-05-18 00:58:38.0 -0700
@@ -79,9 +79,10 @@ kmem_zone_init(int size, char *zone_name
 
 static inline kmem_zone_t *
 kmem_zone_init_flags(int size, char *zone_name, unsigned long flags,
-void (*construct)(void *, kmem_zone_t *, unsigned long))
+void (*construct)(void *, kmem_zone_t *, unsigned long),
+const struct kmem_cache_ops *ops)
 {
-   return kmem_cache_create(zone_name, size, 0, flags, construct, NULL);
+   return kmem_cache_create(zone_name, size, 0, flags, construct, ops);
 }
 
 static inline void
Index: slub/fs/xfs/linux-2.6/xfs_buf.c
===
--- slub.orig/fs/xfs/linux-2.6/xfs_buf.c2007-05-18 00:54:30.0 
-0700
+++ slub/fs/xfs/linux-2.6/xfs_buf.c 2007-05-18 00:58:38.0 -0700
@@ -1832,7 +1832,7 @@ xfs_buf_init(void)
 #endif
 
xfs_buf_zone = kmem_zone_init_flags(sizeof(xfs_buf_t), "xfs_buf",
-   KM_ZONE_HWALIGN, NULL);
+   KM_ZONE_HWALIGN, NULL, NULL);
if (!xfs_buf_zone)
goto out_free_trace_buf;
 
Index: slub/fs/xfs/linux-2.6/xfs_super.c
===
--- slub.orig/fs/xfs/linux-2.6/xfs_super.c  2007-05-18 00:54:30.0 
-0700
+++ slub/fs/xfs/linux-2.6/xfs_super.c   2007-05-18 00:58:38.0 -0700
@@ -355,13 +355,24 @@ xfs_fs_inode_init_once(
inode_init_once(vn_to_inode((bhv_vnode_t *)vnode));
 }
 
+static void *xfs_get_inodes(struct kmem_cache *s, int nr, void **v)
+{
+   return fs_get_inodes(s, nr, v, offsetof(bhv_vnode_t, v_inode));
+};
+
+static struct kmem_cache_ops xfs_kmem_cache_ops = {
+   .get = xfs_get_inodes,
+   .kick = kick_inodes
+};
+
 STATIC int
 xfs_init_zones(void)
 {
xfs_vnode_zone = kmem_zone_init_flags(sizeof(bhv_vnode_t), "xfs_vnode",
KM_ZONE_HWALIGN | KM_ZONE_RECLAIM |
KM_ZONE_SPREAD,
-   xfs_fs_inode_init_once);
+   xfs_fs_inode_init_once,
+   &xfs_kmem_cache_ops);
if (!xfs_vnode_zone)
goto out;
 

-- 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/