FUSE_NODE_SLAB buildfix

When FUSE_NODE_SLAB is not defined, the build fails because of undefined
functions. Attached patch fixes the problem.

diff --git a/ChangeLog b/ChangeLog
index 3f6133d9d450e63e606a6614cd6d6882cf385ac3..ad42adcf9805f47ba68860ee92a6311f76959428 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-08  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Fix build if FUSE_NODE_SLAB is not defined.  Patch by Emmanuel
+       Dreyfus
+
 2011-12-07  Miklos Szeredi <miklos@szeredi.hu>
 
        * Add fuse_lowlevel_notify_delete() which tells the kernel that a

diff --git a/lib/fuse.c b/lib/fuse.c
index db638ecfa0d66dd1ddc6cacc04e15fc768eaf9bb..7f421b41f938fac9b40ba826fbe0f1b86badcccd 100644 (file)
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -343,17 +343,6 @@ static inline void list_del(struct list_head *entry)
        prev->next = next;
 }
 
-#ifdef FUSE_NODE_SLAB
-static struct node_slab *list_to_slab(struct list_head *head)
-{
-       return (struct node_slab *) head;
-}
-
-static struct node_slab *node_to_slab(struct fuse *f, struct node *node)
-{
-       return (struct node_slab *) (((uintptr_t) node) & ~((uintptr_t) f->pagesize - 1));
-}
-
 static inline int lru_enabled(struct fuse *f)
 {
        return f->conf.remember > 0;
@@ -372,6 +361,17 @@ static size_t get_node_size(struct fuse *f)
                return sizeof(struct node);
 }
 
+#ifdef FUSE_NODE_SLAB
+static struct node_slab *list_to_slab(struct list_head *head)
+{
+       return (struct node_slab *) head;
+}
+
+static struct node_slab *node_to_slab(struct fuse *f, struct node *node)
+{
+       return (struct node_slab *) (((uintptr_t) node) & ~((uintptr_t) f->pagesize - 1));
+}
+
 static int alloc_slab(struct fuse *f)
 {
        void *mem;