o proposed interface to the kernel driver

diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index a02514a8191f1721d087196c302b0c05eedf611f..602cbee2d74faa3023e90f557939aa3cb1867678 100644 (file)
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -6,35 +6,14 @@
 
 #include "activate.h"
 
-struct kernel_interface {
-       int already_mounted;
-       char *mount_point;
-};
-
-/*
- * Checks that device mapper has been compiled into the kernel.
- */
-int _check_kernel(void)
-{
-       return 0;
-}
-
-int _find_mountpoint(char *buffer, int len)
+int lv_activate(struct dmfs *dm,
+               struct volume_group *vg, struct logical_volume *lv)
 {
        
 }
 
-
-
-int _
-
-int vg_activate(struct volume_group *vg)
+int lv_deactivate(struct dmfs *dm, struct volume_group *vg,
+                 struct logical_volume *lv)
 {
-       
-}
 
-int lv_activate(struct volume_group *vg, struct logical_volume *lv)
-{
-       
 }
-

diff --git a/lib/activate/activate.h b/lib/activate/activate.h
index 34ff481e3e5836e3c621e3572c7f520e32f7b05e..921fa5f68e7f20a2ca5c4a0ad5c3e262ffe09e06 100644 (file)
--- a/lib/activate/activate.h
+++ b/lib/activate/activate.h
@@ -7,7 +7,12 @@
 #ifndef ACTIVATE_H
 #define ACTIVATE_H
 
-int vg_activate(struct volume_group *vg);
-int lv_activate(struct volume_group *vg, struct logical_volume *lv);
+#include "dmfs-driver.h"
+
+int lv_activate(struct dmfs *dm,
+               struct volume_group *vg, struct logical_volume *lv);
+
+int lv_deactivate(struct dmfs *dm, struct volume_group *vg,
+                 struct logical_volume *lv);
 
 #endif

diff --git a/lib/activate/dmfs-driver.h b/lib/activate/dmfs-driver.h
new file mode 100644 (file)
index 0000000..3393bd3
--- /dev/null
+++ b/lib/activate/dmfs-driver.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2001 Sistina Software (UK) Limited.
+ *
+ * This file is released under the GPL.
+ */
+
+#ifndef DMFS_INTERFACE_H
+#define DMFS_INTERFACE_H
+
+struct dmfs;
+
+struct dmfs *dmfs_create(void);
+void dmfs_destroy(struct dmfs *dm);
+
+int dmfs_dev_is_present(struct dmfs *dm, const char *dev);
+int dmfs_dev_is_active(struct dmfs *dm, const char *dev);
+
+int dmfs_table_is_present(struct dmfs *dm, const char *dev, const char *table);
+int dmfs_table_is_active(struct dmfs *dm, const char *dev, const char *table);
+
+int dmfs_dev_create(struct dmfs *dm, const char *name);
+int dmfs_dev_load_table(struct dmfs *dm, const char *dev, 
+                       const char *table, const char *file);
+int dmfs_dev_drop_table(struct dmfs *dm, const char *dev, const char *table);
+
+int dmfs_dev_activate_table(struct dmfs *dm, const char *dev,
+                           const char *table);
+
+int dmfs_dev_deactivate(struct dmfs *dm, const char *dev);
+
+#endif