From ca92f361a63a629810d99a57a24584d470090c4c Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Mon, 29 Oct 2007 10:55:05 -0400
Subject: [PATCH] --- yaml --- r: 128515 b: refs/heads/master c:
 44ec0b7179b9bce7df1080370f51314a24a00216 h: refs/heads/master i:   128513:
 a1e635eee2721c8f06b3c4296c1bd910a23bb641   128511:
 6650f35ceef35f32d9d9adead2d60123fc14fcd2 v: v3

---
 [refs]                 |  2 +-
 trunk/fs/btrfs/inode.c | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 77ded6999f60..dd7214273a6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 134d45120164141c0847daf5222aaec77e04724a
+refs/heads/master: 44ec0b7179b9bce7df1080370f51314a24a00216
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 7e4b2c1b4a56..c88f13a88555 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -2176,8 +2176,12 @@ void btrfs_destroy_inode(struct inode *inode)
 	kmem_cache_free(btrfs_inode_cachep, BTRFS_I(inode));
 }
 
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,23)
+static void init_once(struct kmem_cache * cachep, void *foo)
+#else
 static void init_once(void * foo, struct kmem_cache * cachep,
 		      unsigned long flags)
+#endif
 {
 	struct btrfs_inode *ei = (struct btrfs_inode *) foo;
 
@@ -2200,8 +2204,13 @@ void btrfs_destroy_cachep(void)
 
 struct kmem_cache *btrfs_cache_create(const char *name, size_t size,
 				       unsigned long extra_flags,
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,23)
+				       void (*ctor)(struct kmem_cache *, void *)
+#else
 				       void (*ctor)(void *, struct kmem_cache *,
-						    unsigned long))
+						    unsigned long)
+#endif
+				     )
 {
 	return kmem_cache_create(name, size, 0, (SLAB_RECLAIM_ACCOUNT |
 				 SLAB_MEM_SPREAD | extra_flags), ctor