o dm-table compiles

diff --git a/driver/device-mapper/dm-table.c b/driver/device-mapper/dm-table.c
index e1686d37e4a40a9831677f95104d53d1ae044bcc..9dab20b4ec7c8d825c43ab8e5db3e496e99d0504 100644 (file)
--- a/driver/device-mapper/dm-table.c
+++ b/driver/device-mapper/dm-table.c
@@ -25,6 +25,10 @@
  *     16/08/2001 - First version [Joe Thornber]
  */
 
+#include "dm.h"
+
+static int _alloc_targets(struct mapped_device *md, int num);
+
 static inline ulong _round_up(ulong n, ulong size)
 {
        ulong r = n % size;
@@ -65,72 +69,50 @@ static int _setup_btree_index(int l, struct mapped_device *md)
        return 1;
 }
 
-void dm_free_btree(struct mapped_device *md)
+void dm_free_table(struct mapped_device *md)
 {
        int i;
        for (i = 0; i < md->depth; i++)
-               __free_aligned(md->index[i]);
+               vfree(md->index[i]);
 
-       __free_aligned(md->targets);
-       __free_aligned(md->contexts);
+       vfree(md->targets);
+       vfree(md->contexts);
 
        md->num_targets = 0;
        md->num_allocated = 0;
 }
 
-static int _setup_targets(struct mapped_device *md, struct device_table *t)
-{
-       int i;
-       offset_t low = 0;
-
-       md->num_targets = t->count;
-       md->targets = vmalloc(sizeof(*md->targets) * md->num_targets,
-                             NODE_SIZE);
-
-       for (i = 0; i < md->num_targets; i++) {
-               struct mapper *m = _find_mapper(t->map[i].type);
-               if (!m)
-                       return 0;
-
-               if (!m->ctr(low, t->map[i].high + 1,
-                           t->map[i].context, md->contexts + i)) {
-                       WARN("contructor for '%s' failed", m->name);
-                       return 0;
-               }
-
-               md->targets[i] = m->map;
-       }
-
-       return 1;
-}
-
 int dm_start_table(struct mapped_device *md)
 {
-       bit_set(md->state, DM_LOADING);
+       set_bit(DM_LOADING, &md->state);
 
-       dm_free_btree(md);
-       if (!_alloc_targets(2)) /* FIXME: increase once debugged 256 ? */
-               return 0;
+       dm_free_table(md);
+       if (!_alloc_targets(md, 2))     /* FIXME: increase once debugged 256 ? */
+               return -ENOMEM;
+
+       return 0;
 }
 
 int dm_add_entry(struct mapped_device *md, offset_t high,
                 dm_map_fn target, void *context)
 {
-       if (md->num_targets >= md->num_entries &&
-           !_alloc_targets(md->num_allocated * 2))
-               retun -ENOMEM;
+       if (md->num_targets >= md->num_targets &&
+           !_alloc_targets(md, md->num_allocated * 2))
+               return -ENOMEM;
 
        md->highs[md->num_targets] = high;
        md->targets[md->num_targets] = target;
        md->contexts[md->num_targets] = context;
 
        md->num_targets++;
+       return 0;
 }
 
 int dm_complete_table(struct mapped_device *md)
 {
        int n, i;
-       offset_t *k;
+
+       clear_bit(DM_LOADING, &md->state);
 
        /* how many indexes will the btree have ? */
        for (n = _div_up(md->num_targets, KEYS_PER_NODE), i = 1; n != 1; i++)
@@ -155,10 +137,11 @@ int dm_complete_table(struct mapped_device *md)
        for (i = md->depth - 1; i; i--)
                _setup_btree_index(i - 1, md);
 
+       set_bit(DM_LOADED, &md->state);
        return 1;
 }
 
-static int _alloc_targets(int num)
+static int _alloc_targets(struct mapped_device *md, int num)
 {
        offset_t *n_highs;
        dm_map_fn *n_targets;

diff --git a/driver/device-mapper/dm.c b/driver/device-mapper/dm.c
index 437b8d1751b14623d6adba08c88340ece5602e77..4d14c7ef288b2f73431fa9f35762ede4bf67123f 100644 (file)
--- a/driver/device-mapper/dm.c
+++ b/driver/device-mapper/dm.c
@@ -32,16 +32,7 @@
  * to the smallest of these.
  */
 
-#include <linux/version.h>
-#include <linux/major.h>
-#include <linux/iobuf.h>
-#include <linux/module.h>
-#include <linux/fs.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-#include <linux/compatmac.h>
-#include <linux/cache.h>
-#include <linux/device-mapper.h>
+#include "dm.h"
 
 /* defines for blk.h */
 #define MAJOR_NR DM_BLK_MAJOR
@@ -122,8 +113,6 @@
  * for the LV. Could also use poll() for this kind of thing.
  */
 
-#include "dm.h"
-
 #define MAX_DEVICES 64
 #define DEFAULT_READ_AHEAD 64
 

diff --git a/driver/device-mapper/dm.h b/driver/device-mapper/dm.h
index 96d90f0e15b2a6b3ab445c3eb7ea73527962aa50..0db035806ba6842f43134a0352a1f777f9bc5886 100644 (file)
--- a/driver/device-mapper/dm.h
+++ b/driver/device-mapper/dm.h
@@ -30,6 +30,18 @@
 #ifndef DM_INTERNAL_H
 #define DM_INTERNAL_H
 
+#include <linux/version.h>
+#include <linux/major.h>
+#include <linux/iobuf.h>
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/compatmac.h>
+#include <linux/cache.h>
+#include <linux/devfs_fs_kernel.h>
+#include <linux/device-mapper.h>
+
 #define MAX_DEPTH 16
 #define NODE_SIZE L1_CACHE_BYTES
 #define KEYS_PER_NODE (NODE_SIZE / sizeof(offset_t))
@@ -99,19 +111,19 @@ int dm_start_table(struct mapped_device *md);
 int dm_add_entry(struct mapped_device *md, offset_t high,
                 dm_map_fn target, void *context);
 int dm_complete_table(struct mapped_device *md);
-int dm_clear_table(struct mapped_device *md);
+void dm_free_table(struct mapped_device *md);
 
 
 /* dm-fs.c */
 int dm_init_fs(void);
 int dm_fin_fs(void);
 
-static int is_active(struct mapped_device *md)
+static inline int is_active(struct mapped_device *md)
 {
        return test_bit(DM_ACTIVE, &md->state);
 }
 
-static void set_active(struct mapped_device *md, int set)
+static inline void set_active(struct mapped_device *md, int set)
 {
        if (set)
                set_bit(DM_ACTIVE, &md->state);