renamed and cleaned up export header files to match linux convention

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

diff --git a/lunaix-os/kernel/fs/iso9660/inode.c b/lunaix-os/kernel/fs/iso9660/inode.c
index e5649106e46d920cf391de660ddb33d2c37ba0f1..ab6a396e1000b2035a0522fece687c5bbf9a0e0e 100644 (file)
--- a/lunaix-os/kernel/fs/iso9660/inode.c
+++ b/lunaix-os/kernel/fs/iso9660/inode.c
@@ -1,9 +1,12 @@
 #include <klibc/string.h>
-#include <lunaix/fs.h>
-#include <lunaix/fs/iso9660.h>
+#include <lunaix/fs/api.h>
+#include "iso9660.h"
+#include <lunaix/mm/cake.h>
 #include <lunaix/mm/valloc.h>
 #include <lunaix/spike.h>
 
+extern struct cake_pile* drec_cache_pile;
+
 static struct v_inode_ops iso_inode_ops = {
     .dir_lookup = iso9660_dir_lookup,
     .open = iso9660_open,
@@ -11,16 +14,33 @@ static struct v_inode_ops iso_inode_ops = {
 
 static struct v_file_ops iso_file_ops = { .close = iso9660_close,
                                           .read = iso9660_read,
-                                          .read_page = iso9660_read,
+                                          .read_page = iso9660_read_page,
                                           .write = iso9660_write,
-                                          .write_page = iso9660_write,
+                                          .write_page = iso9660_write_page,
                                           .seek = iso9660_seek,
                                           .readdir = iso9660_readdir };
 
+void
+iso9660_inode_destruct(struct v_inode* inode)
+{
+    struct iso_inode* isoino = inode->data;
+
+    struct iso_drecache *pos, *n;
+    llist_for_each(pos, n, &isoino->drecaches, caches)
+    {
+        cake_release(drec_cache_pile, pos);
+    }
+
+    vfree(isoino);
+}
+
 void
 iso9660_init_inode(struct v_superblock* vsb, struct v_inode* inode)
 {
-    inode->data = vzalloc(sizeof(struct iso_inode));
+    struct iso_inode* isoino = vzalloc(sizeof(struct iso_inode));
+    llist_init_head(&isoino->drecaches);
+    inode->data = isoino;
+    inode->destruct = iso9660_inode_destruct;
 }
 
 int
@@ -41,6 +61,7 @@ iso9660_fill_inode(struct v_inode* inode, struct iso_drecache* dir, int ino)
 
     inode->id = ino;
     inode->lb_addr = dir->extent_addr;
+    inode->lb_usage = ICEIL(dir->data_size, fu_len);
     inode->ops = &iso_inode_ops;
     inode->default_fops = &iso_file_ops;
 
@@ -56,8 +77,8 @@ iso9660_fill_inode(struct v_inode* inode, struct iso_drecache* dir, int ino)
     if (dir->xattr_len) {
         struct iso_xattr* xattr = (struct iso_xattr*)valloc(ISO9660_BLKSZ);
         // Only bring in single FU, as we only care about the attributes.
-        errno =
-          dev->read(dev, xattr, ISO9660_BLKSZ * inode->lb_addr, ISO9660_BLKSZ);
+        errno = dev->ops.read(
+          dev, xattr, ISO9660_BLKSZ * inode->lb_addr, ISO9660_BLKSZ);
         if (errno < 0) {
             return EIO;
         }
@@ -66,10 +87,17 @@ iso9660_fill_inode(struct v_inode* inode, struct iso_drecache* dir, int ino)
         inode->ctime = iso9660_dt2unix(&xattr->ctime);
         inode->mtime = iso9660_dt2unix(&xattr->mtime);
 
+        fsapi_inode_setaccess(inode, xattr->perm);
+        fsapi_inode_setowner(inode, xattr->owner.le, xattr->group.le);
+
         inode->lb_addr += dir->xattr_len * dir->fu_size;
 
         vfree(xattr);
     }
+    else {
+        fsapi_inode_setaccess(inode, FSACL_u(R, W, _) | FSACL_g(R, W, _));
+        fsapi_inode_setowner(inode,  0, 0);
+    }
 
     inode->ctime = dir->ctime ? dir->ctime : inode->ctime;
     inode->mtime = dir->mtime ? dir->mtime : inode->mtime;