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

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.c (modified) (2 diffs)

uspace/lib/ext4/libext4_inode.c

@@ -39 +39 @@
 #include "libext4.h"
 
+uint32_t ext4_inode_get_mode(ext4_superblock_t *sb, ext4_inode_t *inode)
+{
+        if (ext4_superblock_get_creator_os(sb) == EXT4_SUPERBLOCK_OS_HURD) {
+                return ((uint32_t)uint16_t_le2host(inode->osd2.hurd2.mode_high)) << 16 |
+                    ((uint32_t)uint16_t_le2host(inode->mode));
+        }
+        return uint16_t_le2host(inode->mode);
+}
+
+bool ext4_inode_is_type(ext4_superblock_t *sb, ext4_inode_t *inode, uint32_t type)
+{
+        uint32_t mode = ext4_inode_get_mode(sb, inode);
+        return (mode & EXT4_INODE_MODE_TYPE_MASK) == type;
+}
+
 /*
-uint32_t ext4_inode_get_mode(ext4_inode_t *inode)
 uint32_t ext4_inode_get_uid(ext4_inode_t *inode)
 */
 
-uint64_t ext4_inode_get_size(ext4_inode_t *inode)
+uint64_t ext4_inode_get_size(ext4_superblock_t *sb, ext4_inode_t *inode)
 {
-        return ((uint64_t)uint32_t_le2host(inode->size_hi)) << 32 |
-                        ((uint64_t)uint32_t_le2host(inode->size_lo));
+        uint32_t major_rev = ext4_superblock_get_rev_level(sb);
+
+        if (major_rev > 0 && ext4_inode_is_type(sb, inode, EXT4_INODE_MODE_FILE)) {
+                return ((uint64_t)uint32_t_le2host(inode->size_hi)) << 32 |
+                            ((uint64_t)uint32_t_le2host(inode->size_lo));
+                }
+        return uint32_t_le2host(inode->size_lo);
 }
 
@@ -68 +87 @@
 */
 
+uint32_t ext4_inode_get_direct_block(ext4_inode_t *inode, uint8_t idx)
+{
+        assert(idx < EXT4_INODE_DIRECT_BLOCK_COUNT);
+        return uint32_t_le2host(inode->blocks[idx]);
+}
+
+uint32_t ext4_inode_get_indirect_block(ext4_inode_t *inode, uint8_t idx)
+{
+        assert(idx < EXT4_INODE_INDIRECT_BLOCK_COUNT);
+        return uint32_t_le2host(inode->blocks[idx + EXT4_INODE_INDIRECT_BLOCK]);
+}
+
 /**
  * @}