Multiuser, Capabilities and Access Controls (#54)

[lunaix-os.git] / lunaix-os / kernel / fs / fsm.c

diff --git a/lunaix-os/kernel/fs/fsm.c b/lunaix-os/kernel/fs/fsm.c
index bce983a1c2b51d3c3743cf9edcdca9e2ef43780d..8638905b44a9bb2ff46853324c7a971e8b34f91d 100644 (file)
--- a/lunaix-os/kernel/fs/fsm.c
+++ b/lunaix-os/kernel/fs/fsm.c
@@ -13,9 +13,13 @@
 #include <lunaix/fs.h>
 #include <lunaix/mm/valloc.h>
 
 #include <lunaix/fs.h>
 #include <lunaix/mm/valloc.h>
 

+#include <lunaix/fs/twimap.h>
+#include <lunaix/fs/twifs.h>
+

 #define HASH_BUCKET_BITS 4
 #define HASH_BUCKET_NUM (1 << HASH_BUCKET_BITS)
 
 #define HASH_BUCKET_BITS 4
 #define HASH_BUCKET_NUM (1 << HASH_BUCKET_BITS)
 

+DEFINE_LLIST(fs_flatlist);

 DECLARE_HASHTABLE(fs_registry, HASH_BUCKET_NUM);
 
 void
 DECLARE_HASHTABLE(fs_registry, HASH_BUCKET_NUM);
 
 void


@@ -23,7 +27,7 @@ fsm_init()
 {
     hashtable_init(fs_registry);
 
 {
     hashtable_init(fs_registry);
 

-    fsm_register_all();
+    ldga_invoke_fn0(fs);

 }
 
 void
 }
 
 void


@@ -31,6 +35,7 @@ fsm_register(struct filesystem* fs)
 {
     hstr_rehash(&fs->fs_name, HSTR_FULL_HASH);
     hashtable_hash_in(fs_registry, &fs->fs_list, fs->fs_name.hash);
 {
     hstr_rehash(&fs->fs_name, HSTR_FULL_HASH);
     hashtable_hash_in(fs_registry, &fs->fs_list, fs->fs_name.hash);

+    llist_append(&fs_flatlist, &fs->fs_flat);

 }
 
 struct filesystem*
 }
 
 struct filesystem*


@@ -54,6 +59,39 @@ struct filesystem*
 fsm_new_fs(char* name, size_t name_len)
 {
     struct filesystem* fs = vzalloc(sizeof(*fs));
 fsm_new_fs(char* name, size_t name_len)
 {
     struct filesystem* fs = vzalloc(sizeof(*fs));

+    if (name_len == (size_t)-1) {
+        name_len = strlen(name);
+    }

     fs->fs_name = HHSTR(name, name_len, 0);
     return fs;
     fs->fs_name = HHSTR(name, name_len, 0);
     return fs;

-}
\ No newline at end of file
+}
+
+void
+fsm_itbegin(struct fs_iter* iterator)
+{
+    iterator->fs = list_entry(&fs_flatlist, struct filesystem, fs_flat);
+}
+
+bool
+fsm_itnext(struct fs_iter* iterator)
+{
+    iterator->fs = list_next(iterator->fs, struct filesystem, fs_flat);
+    return &iterator->fs->fs_flat != &fs_flatlist;
+}
+
+static void
+__twimap_read_fstab(struct twimap *mapping)
+{
+    struct filesystem *pos, *n;
+    llist_for_each(pos, n, &fs_flatlist, fs_flat)
+    {
+        twimap_printf(mapping, "%s %d\n", pos->fs_name.value, pos->types);
+    }
+}
+
+static void
+fstab_twifs_plugin()
+{
+    twimap_export_value(NULL, fstab, FSACL_ugR, NULL);
+}
+EXPORT_TWIFS_PLUGIN(fstab, fstab_twifs_plugin);
\ No newline at end of file