Changeset 01ab41b in mainline

Timestamp:

2011-10-03T11:57:14Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9c0c0e1

Parents:

54935cf6

Message:

added more methods needed during ext4 mounting (also copied from ext2)

Location:

uspace

Files:

• lib/ext4/libext4_filesystem.c (modified) (2 diffs)
• lib/ext4/libext4_filesystem.h (modified) (1 diff)
• lib/ext4/libext4_inode.c (modified) (1 diff)
• lib/ext4/libext4_superblock.c (modified) (1 diff)
• lib/ext4/libext4_superblock.h (modified) (2 diffs)
• srv/fs/ext4fs/ext4fs_ops.c (modified) (4 diffs)

uspace/lib/ext4/libext4_filesystem.c

@@ -37 +37 @@
 
 #include <errno.h>
+#include <malloc.h>
 #include "libext4_filesystem.h"
 
+/**
+ * TODO doxy
+ */
 int ext4_filesystem_init(ext4_filesystem_t *fs, service_id_t service_id)
 {
+
+        int rc;
+        ext4_superblock_t *temp_superblock;
+        size_t block_size;
+
+        fs->device = service_id;
+
+        // TODO block size !!!
+        rc = block_init(EXCHANGE_SERIALIZE, fs->device, 2048);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        rc = ext4_superblock_read_direct(fs->device, &temp_superblock);
+        if (rc != EOK) {
+                block_fini(fs->device);
+                return rc;
+        }
+
+        block_size = ext4_superblock_get_block_size(temp_superblock);
+
+        if (block_size > EXT4_MAX_BLOCK_SIZE) {
+                block_fini(fs->device);
+                return ENOTSUP;
+        }
+
+        rc = block_cache_init(service_id, block_size, 0, CACHE_MODE_WT);
+        if (rc != EOK) {
+                block_fini(fs->device);
+                return rc;
+        }
+
+        fs->superblock = temp_superblock;
+
+
         // TODO
         return EOK;
 }
 
+/**
+ * TODO doxy
+ */
 int ext4_filesystem_check_sanity(ext4_filesystem_t *fs)
 {
-        // TODO
+        int rc;
+
+        rc = ext4_superblock_check_sanity(fs->superblock);
+        if (rc != EOK) {
+                return rc;
+        }
+
         return EOK;
 }
 
+/**
+ * TODO doxy
+ */
 int ext4_filesystem_check_flags(ext4_filesystem_t *fs, bool *o_read_only)
 {
@@ -57 +108 @@
 }
 
+/**
+ * TODO doxy
+ */
 void ext4_filesystem_fini(ext4_filesystem_t *fs)
 {
-        // TODO
+        free(fs->superblock);
+        block_fini(fs->device);
 }
 

uspace/lib/ext4/libext4_filesystem.h

@@ -42 +42 @@
 } ext4_filesystem_t;
 
+// TODO constant value
+#define EXT4_MAX_BLOCK_SIZE             8096
+
 extern int ext4_filesystem_init(ext4_filesystem_t *, service_id_t);
 extern int ext4_filesystem_check_sanity(ext4_filesystem_t *fs);

uspace/lib/ext4/libext4_inode.c

@@ -39 +39 @@
 
 // TODO check return type
+/**
+ * TODO doxy
+ */
 uint16_t ext4_inode_get_usage_count(ext4_inode_t *inode)
 {
-        // TODO
+        // TODO check
         return 0;
 }

uspace/lib/ext4/libext4_superblock.c

@@ -36 +36 @@
  */
 
+#include <byteorder.h>
+#include <errno.h>
+#include <libblock.h>
+#include <malloc.h>
 #include "libext4_superblock.h"
 
+/**
+ * TODO doxy
+ */
+uint16_t ext2_superblock_get_magic(ext4_superblock_t *sb)
+{
+        return uint16_t_le2host(sb->s_magic);
+}
+
+/**
+ * TODO doxy
+ */
+uint32_t ext4_superblock_get_first_block(ext4_superblock_t *sb)
+{
+        return uint32_t_le2host(sb->s_first_data_block);
+}
+
+/**
+ * TODO doxy
+ */
+uint32_t ext4_superblock_get_block_size_log2(ext4_superblock_t *sb)
+{
+        return uint32_t_le2host(sb->s_log_block_size);
+}
+
+/**
+ * TODO doxy
+ */
+uint32_t ext4_superblock_get_block_size(ext4_superblock_t *sb)
+{
+        return 1024 << ext4_superblock_get_block_size_log2(sb);
+}
+
+
+/**
+ * TODO doxy
+ */
+int ext4_superblock_read_direct(service_id_t service_id,
+    ext4_superblock_t **superblock)
+{
+        void *data;
+        int rc;
+
+        data = malloc(EXT4_SUPERBLOCK_SIZE);
+        if (data == NULL) {
+                return ENOMEM;
+        }
+
+        rc = block_read_bytes_direct(service_id, EXT4_SUPERBLOCK_OFFSET,
+            EXT4_SUPERBLOCK_SIZE, data);
+
+        if (rc != EOK) {
+                free(data);
+                return rc;
+        }
+
+        (*superblock) = data;
+
+        return EOK;
+}
+
+/**
+ * TODO doxy
+ */
+int ext4_superblock_check_sanity(ext4_superblock_t *sb)
+{
+        // TODO
+        return EOK;
+}
 
 /**

uspace/lib/ext4/libext4_superblock.h

@@ -34 +34 @@
 #define LIBEXT4_LIBEXT4_SUPERBLOCK_H_
 
+#include <libblock.h>
 #include <sys/types.h>
 
@@ -140 +141 @@
 } __attribute__((packed)) ext4_superblock_t;
 
+// TODO constants
+#define EXT4_SUPERBLOCK_MAGIC           0xEF53
+#define EXT4_SUPERBLOCK_SIZE            1024
+#define EXT4_SUPERBLOCK_OFFSET          1024
+
+extern uint32_t ext4_superblock_get_block_size_log2(ext4_superblock_t *);
+extern uint32_t ext4_superblock_get_block_size(ext4_superblock_t *);
+
+extern int ext4_superblock_read_direct(service_id_t, ext4_superblock_t **);
+extern int ext4_superblock_check_sanity(ext4_superblock_t *);
 
 #endif

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -98 +98 @@
 
 /**
- *      TODO comment
+ *      TODO doxy
  */
 int ext4fs_global_init(void)
@@ -106 +106 @@
 }
 
+/**
+ * TODO doxy
+ */
 int ext4fs_global_fini(void)
 {
@@ -144 +147 @@
 int ext4fs_root_get(fs_node_t **rfn, service_id_t service_id)
 {
-        // TODO
-        return 0;
+        return ext4fs_node_get(rfn, service_id, EXT4_INODE_ROOT_INDEX);
 }
 
@@ -167 +169 @@
 }
 
+/**
+ * TODO doxy
+ */
 int ext4fs_node_open(fs_node_t *fn)
 {
-        // TODO
+        // TODO stateless operation
         return EOK;
 }