Changeset 9b9d37bb in mainline for uspace/lib/ext4/libext4_inode.h

Timestamp:

2011-10-06T09:48:53Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

1114173

Parents:

3712434

Message:

mounting + list of mounted directory (ported from ext2) - many TODO remaining

File:

• uspace/lib/ext4/libext4_inode.h (modified) (5 diffs)

uspace/lib/ext4/libext4_inode.h

@@ -36 +36 @@
 #include <libblock.h>
 #include <sys/types.h>
+#include "libext4_superblock.h"
 
-#define EXT4_DIRECT_BLOCK_COUNT         12
-#define EXT4_INDIRECT_BLOCK             EXT4_DIRECT_BLOCK_COUNT
-#define EXT4_DOUBLE_INDIRECT_BLOCK      (EXT4_INDIRECT_BLOCK + 1)
-#define EXT4_TRIPPLE_INDIRECT_BLOCK     (EXT4_DOUBLE_INDIRECT_BLOCK + 1)
-#define EXT4_INODE_BLOCKS                       (EXT4_TRIPPLE_INDIRECT_BLOCK + 1)
+
+#define EXT4_INODE_DIRECT_BLOCK_COUNT           12
+#define EXT4_INODE_INDIRECT_BLOCK                       EXT4_INODE_DIRECT_BLOCK_COUNT
+#define EXT4_INODE_DOUBLE_INDIRECT_BLOCK        (EXT4_INODE_INDIRECT_BLOCK + 1)
+#define EXT4_INODE_TRIPPLE_INDIRECT_BLOCK       (EXT4_INODE_DOUBLE_INDIRECT_BLOCK + 1)
+#define EXT4_INODE_BLOCKS                                       (EXT4_INODE_TRIPPLE_INDIRECT_BLOCK + 1)
+#define EXT4_INODE_INDIRECT_BLOCK_COUNT         (EXT4_INODE_BLOCKS - EXT4_INODE_DIRECT_BLOCK_COUNT)
 
 /*
@@ -64 +67 @@
     uint32_t size_hi;
     uint32_t obso_faddr; // Obsoleted fragment address
-    uint32_t unused_osd2[3]; // OS dependent - not used in HelenOS
+    union {
+        struct {
+                uint16_t blocks_high; /* were l_i_reserved1 */
+                uint16_t file_acl_high;
+                uint16_t uid_high;   /* these 2 fields */
+                uint16_t gid_high;   /* were reserved2[0] */
+                uint32_t reserved2;
+        } linux2;
+        struct {
+                uint16_t reserved1;  /* Obsoleted fragment number/size which are removed in ext4 */
+                uint16_t mode_high;
+                uint16_t uid_high;
+                uint16_t gid_high;
+                uint32_t author;
+        } hurd2;
+        struct {
+                uint16_t reserved1;  /* Obsoleted fragment number/size which are removed in ext4 */
+                uint16_t file_acl_high;
+                uint32_t reserved2[2];
+        } masix2;
+    } __attribute__ ((packed)) osd2;
+
     uint16_t extra_isize;
     uint16_t pad1;
@@ -75 +99 @@
 } __attribute__ ((packed)) ext4_inode_t;
 
+#define EXT4_INODE_MODE_FIFO            0x1000
+#define EXT4_INODE_MODE_CHARDEV         0x2000
+#define EXT4_INODE_MODE_DIRECTORY       0x4000
+#define EXT4_INODE_MODE_BLOCKDEV        0x6000
+#define EXT4_INODE_MODE_FILE            0x8000
+#define EXT4_INODE_MODE_SOFTLINK        0xA000
+#define EXT4_INODE_MODE_SOCKET          0xC000
+#define EXT4_INODE_MODE_TYPE_MASK       0xF000
 
 #define EXT4_INODE_ROOT_INDEX   2
@@ -84 +116 @@
 } ext4_inode_ref_t;
 
+
+extern uint32_t ext4_inode_get_mode(ext4_superblock_t *, ext4_inode_t *);
+extern bool ext4_inode_is_type(ext4_superblock_t *, ext4_inode_t *, uint32_t);
 /*
-extern uint16_t ext4_inode_get_mode(ext4_inode_t *);
 extern uint32_t ext4_inode_get_uid(ext4_inode_t *);
 */
-extern uint64_t ext4_inode_get_size(ext4_inode_t *);
+extern uint64_t ext4_inode_get_size(ext4_superblock_t *, ext4_inode_t *);
 /*
 extern uint32_t ext4_inode_get_access_time(ext4_inode_t *);
@@ -101 +135 @@
 extern uint32_t ext4_inode_get_flags(ext4_inode_t *);
 */
+
+uint32_t ext4_inode_get_direct_block(ext4_inode_t *, uint8_t);
+uint32_t ext4_inode_get_indirect_block(ext4_inode_t *, uint8_t);
 
 /*