regression: elf loading

[lunaix-os.git] / lunaix-os / kernel / fs / iso9660 / directory.c

diff --git a/lunaix-os/kernel/fs/iso9660/directory.c b/lunaix-os/kernel/fs/iso9660/directory.c
index e1b37894681a46dfcf6bb51ad0e82210c750dea9..1d35978b06f84b3ead66688b1b661a875bb13a38 100644 (file)
--- a/lunaix-os/kernel/fs/iso9660/directory.c
+++ b/lunaix-os/kernel/fs/iso9660/directory.c
@@ -1,4 +1,3 @@
-#include <lunaix/dirent.h>

 #include <lunaix/fs.h>
 #include <lunaix/fs/iso9660.h>
 #include <lunaix/mm/cake.h>
 #include <lunaix/fs.h>
 #include <lunaix/fs/iso9660.h>
 #include <lunaix/mm/cake.h>


@@ -7,6 +6,8 @@
 
 #include <klibc/string.h>
 
 
 #include <klibc/string.h>
 

+#include <sys/dirent_defs.h>
+

 extern struct cake_pile* drec_cache_pile;
 
 void
 extern struct cake_pile* drec_cache_pile;
 
 void


@@ -68,16 +69,19 @@ iso9660_setup_dnode(struct v_dnode* dnode, struct v_inode* inode)
         return 0;
     }
 
         return 0;
     }
 

+    struct iso_inode* isoino = inode->data;
+    if (!llist_empty(&isoino->drecaches)) {
+        dnode->data = &isoino->drecaches;
+        vfs_assign_inode(dnode, inode);
+        return 0;
+    }
+

     int errno = 0;
     struct device* dev = dnode->super_block->dev;
     int errno = 0;
     struct device* dev = dnode->super_block->dev;

-    struct iso_inode* isoino = inode->data;
-    struct llist_header* lead = valloc(sizeof(*lead));

     void* records = valloc(ISO9660_BLKSZ);
     u32_t current_pos = -ISO9660_BLKSZ, max_pos = inode->fsize,
           blk = inode->lb_addr * ISO9660_BLKSZ, blk_offset = (u32_t)-1;
 
     void* records = valloc(ISO9660_BLKSZ);
     u32_t current_pos = -ISO9660_BLKSZ, max_pos = inode->fsize,
           blk = inode->lb_addr * ISO9660_BLKSZ, blk_offset = (u32_t)-1;
 

-    llist_init_head(lead);
-

     // As per 6.8.1, Directory structure shall NOT recorded in interleave mode.
     do {
         if (blk_offset >= ISO9660_BLKSZ - sizeof(struct iso_drecord)) {
     // As per 6.8.1, Directory structure shall NOT recorded in interleave mode.
     do {
         if (blk_offset >= ISO9660_BLKSZ - sizeof(struct iso_drecord)) {


@@ -105,13 +109,12 @@ iso9660_setup_dnode(struct v_dnode* dnode, struct v_inode* inode)
         struct iso_drecache* cache = cake_grab(drec_cache_pile);
 
         iso9660_fill_drecache(cache, drec, mdu->len);
         struct iso_drecache* cache = cake_grab(drec_cache_pile);
 
         iso9660_fill_drecache(cache, drec, mdu->len);

-        llist_append(lead, &cache->caches);
+        llist_append(&isoino->drecaches, &cache->caches);

     cont:
         blk_offset += mdu->len;
     } while (current_pos + blk_offset < max_pos);
 
     cont:
         blk_offset += mdu->len;
     } while (current_pos + blk_offset < max_pos);
 

-    dnode->data = lead;
-    isoino->drecaches = lead;
+    dnode->data = &isoino->drecaches;

 
     vfs_assign_inode(dnode, inode);
 
 
     vfs_assign_inode(dnode, inode);
 


@@ -126,10 +129,9 @@ int
 iso9660_dir_lookup(struct v_inode* this, struct v_dnode* dnode)
 {
     struct iso_inode* isoino = this->data;
 iso9660_dir_lookup(struct v_inode* this, struct v_dnode* dnode)
 {
     struct iso_inode* isoino = this->data;

-    struct llist_header* lead = isoino->drecaches;

     struct iso_drecache *pos, *n;
 
     struct iso_drecache *pos, *n;
 

-    llist_for_each(pos, n, lead, caches)
+    llist_for_each(pos, n, &isoino->drecaches, caches)

     {
         if (HSTR_EQ(&dnode->name, &pos->name)) {
             goto found;
     {
         if (HSTR_EQ(&dnode->name, &pos->name)) {
             goto found;