Multiuser, Capabilities and Access Controls (#54)

[lunaix-os.git] / lunaix-os / kernel / block / blk_mapping.c

diff --git a/lunaix-os/kernel/block/blk_mapping.c b/lunaix-os/kernel/block/blk_mapping.c
index 7dae2b8c67f2548f4f1a21c41f0a3a721fa62d61..ddc360a4e952a9250bb96b6b032d663585753812 100644 (file)
--- a/lunaix-os/kernel/block/blk_mapping.c
+++ b/lunaix-os/kernel/block/blk_mapping.c
@@ -9,37 +9,37 @@ blk_mapping_init()
     blk_root = twifs_dir_node(NULL, "block");
 }
 
-void
-__blk_rd_lblksz(struct twimap* map)
+static void
+__twimap_read_lblk_size(struct twimap* map)
 {
     struct block_dev* bdev = twimap_data(map, struct block_dev*);
     size_t lblksz = bdev->blk_size;
     twimap_printf(map, "%u", lblksz);
 }
 
-void
-__blk_rd_name(struct twimap* map)
+static void
+__twimap_read_name(struct twimap* map)
 {
     struct block_dev* bdev = twimap_data(map, struct block_dev*);
     twimap_printf(map, "%s", bdev->name);
 }
 
-void
-__blk_rd_start_lba(struct twimap* map)
+static void
+__twimap_read_lba_begin(struct twimap* map)
 {
     struct block_dev* bdev = twimap_data(map, struct block_dev*);
     twimap_printf(map, "%d", bdev->start_lba);
 }
 
-void
-__blk_rd_end_lba(struct twimap* map)
+static void
+__twimap_read_lba_end(struct twimap* map)
 {
     struct block_dev* bdev = twimap_data(map, struct block_dev*);
     twimap_printf(map, "%d", bdev->end_lba);
 }
 
-void
-__blk_rd_size(struct twimap* map)
+static void
+__twimap_read_size(struct twimap* map)
 {
     struct block_dev* bdev = twimap_data(map, struct block_dev*);
     twimap_printf(
@@ -49,22 +49,15 @@ __blk_rd_size(struct twimap* map)
 void
 __map_internal(struct block_dev* bdev, void* fsnode)
 {
-    struct twifs_node* dev_root = (struct twifs_node*)fsnode;
-
-    struct twimap* map = twifs_mapping(dev_root, bdev, "size");
-    map->read = __blk_rd_size;
-
-    map = twifs_mapping(dev_root, bdev, "lblk_size");
-    map->read = __blk_rd_lblksz;
-
-    map = twifs_mapping(dev_root, bdev, "name");
-    map->read = __blk_rd_name;
-
-    map = twifs_mapping(dev_root, bdev, "begin");
-    map->read = __blk_rd_start_lba;
-
-    map = twifs_mapping(dev_root, bdev, "end");
-    map->read = __blk_rd_end_lba;
+    struct twifs_node* dev_root;
+    
+    dev_root = (struct twifs_node*)fsnode;
+    
+    twimap_export_value(dev_root, size,      FSACL_aR, bdev);
+    twimap_export_value(dev_root, lblk_size, FSACL_aR, bdev);
+    twimap_export_value(dev_root, name,      FSACL_aR, bdev);
+    twimap_export_value(dev_root, lba_begin, FSACL_aR, bdev);
+    twimap_export_value(dev_root, lba_end,   FSACL_aR, bdev);
 }
 
 void