Changeset b65cae22 in mainline for uspace/lib/ext2/libext2_inode.h

Timestamp:

2011-02-16T20:21:03Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

f483a15

Parents:

a2a1792

Message:

Add support for some OS specific fields

File:

• uspace/lib/ext2/libext2_inode.h (modified) (3 diffs)

uspace/lib/ext2/libext2_inode.h

@@ -38 +38 @@
 
 #include <libblock.h>
+#include "libext2_superblock.h"
 
 typedef struct ext2_inode {
@@ -53 +54 @@
         uint32_t double_indirect_block;
         uint32_t triple_indirect_block;
-} ext2_inode_t;
+        uint32_t version;
+        uint32_t file_acl;
+        union {
+                uint32_t dir_acl;
+                uint32_t size_high; // For regular files in version >= 1
+        } __attribute__ ((packed));
+        uint8_t unused3[6];
+        uint16_t mode_high; // Hurd only
+        uint16_t user_id_high; // Linux/Hurd only
+        uint16_t group_id_high; // Linux/Hurd only
+} __attribute__ ((packed)) ext2_inode_t;
 
 #define EXT2_INODE_MODE_FIFO            0x1000
@@ -69 +80 @@
 } ext2_inode_ref_t;
 
-inline uint16_t ext2_inode_get_mode(ext2_inode_t *);
-inline uint32_t ext2_inode_get_user_id(ext2_inode_t *);
-inline uint32_t ext2_inode_get_size(ext2_inode_t *);
-inline uint32_t ext2_inode_get_group_id(ext2_inode_t *);
+inline uint32_t ext2_inode_get_mode(ext2_superblock_t *, ext2_inode_t *);
+inline uint32_t ext2_inode_get_user_id(ext2_superblock_t *, ext2_inode_t *);
+inline uint64_t ext2_inode_get_size(ext2_superblock_t *, ext2_inode_t *);
+inline uint32_t ext2_inode_get_group_id(ext2_superblock_t *, ext2_inode_t *);
 inline uint16_t ext2_inode_get_usage_count(ext2_inode_t *);
 inline uint32_t ext2_inode_get_reserved_512_blocks(ext2_inode_t *);