Changeset b65cae22 in mainline

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

Location:

uspace

Files:

• app/ext2info/ext2info.c (modified) (5 diffs)
• lib/ext2/libext2_inode.c (modified) (7 diffs)
• lib/ext2/libext2_inode.h (modified) (3 diffs)
• lib/ext2/libext2_superblock.h (modified) (1 diff)

uspace/app/ext2info/ext2info.c

@@ -57 +57 @@
 static void print_block_group(ext2_block_group_t *);
 static void print_inode_by_number(ext2_filesystem_t *, uint32_t);
-static void print_inode(ext2_inode_t *);
+static void print_inode(ext2_filesystem_t *, ext2_inode_t *);
 
 #define ARG_SUPERBLOCK 1
@@ -335 +335 @@
         }
         
-        print_inode(inode_ref->inode);
+        print_inode(fs, inode_ref->inode);
         
         rc = ext2_filesystem_put_inode_ref(inode_ref);
@@ -343 +343 @@
 }
 
-void print_inode(ext2_inode_t *inode)
-{
-        uint16_t mode;
+void print_inode(ext2_filesystem_t *fs, ext2_inode_t *inode)
+{
+        uint32_t mode;
         uint32_t user_id;
         uint32_t group_id;
-        uint32_t size;
+        uint64_t size;
         uint16_t usage_count;
         uint32_t flags;
@@ -357 +357 @@
         bool all_blocks = false;
         
-        mode = ext2_inode_get_mode(inode);
-        user_id = ext2_inode_get_user_id(inode);
-        group_id = ext2_inode_get_group_id(inode);
-        size = ext2_inode_get_size(inode);
+        mode = ext2_inode_get_mode(fs->superblock, inode);
+        user_id = ext2_inode_get_user_id(fs->superblock, inode);
+        group_id = ext2_inode_get_group_id(fs->superblock, inode);
+        size = ext2_inode_get_size(fs->superblock, inode);
         usage_count = ext2_inode_get_usage_count(inode);
         flags = ext2_inode_get_flags(inode);
@@ -389 +389 @@
         access = mode & EXT2_INODE_MODE_ACCESS_MASK;
         
-        printf("  Mode: %04x (Type: %s, Access bits: %04ho)\n", mode, type, access);
+        printf("  Mode: %08x (Type: %s, Access bits: %04ho)\n", mode, type, access);
         printf("  User ID: %u\n", user_id);
         printf("  Group ID: %u\n", group_id);
-        printf("  Size: %u\n", size);
+        printf("  Size: %" PRIu64 "\n", size);
         printf("  Usage (link) count: %u\n", usage_count);
         printf("  Flags: %u\n", flags);

uspace/lib/ext2/libext2_inode.c

@@ -36 +36 @@
 #include "libext2.h"
 #include "libext2_inode.h"
+#include "libext2_superblock.h"
 #include <byteorder.h>
 
@@ -43 +44 @@
  * @param inode pointer to inode
  */
-inline uint16_t ext2_inode_get_mode(ext2_inode_t *inode)
+inline uint32_t ext2_inode_get_mode(ext2_superblock_t *sb, ext2_inode_t *inode)
 {
+        if (ext2_superblock_get_os(sb) == EXT2_SUPERBLOCK_OS_HURD) {
+                return ((uint32_t)uint16_t_le2host(inode->mode_high)) << 16 |
+                    ((uint32_t)uint16_t_le2host(inode->mode));
+        }
         return uint16_t_le2host(inode->mode);
 }
@@ -53 +58 @@
  * @param inode pointer to inode
  */
-inline uint32_t ext2_inode_get_user_id(ext2_inode_t *inode)
+inline uint32_t ext2_inode_get_user_id(ext2_superblock_t *sb, ext2_inode_t *inode)
 {
-        // TODO: use additional OS specific bits
+        uint32_t os = ext2_superblock_get_os(sb);
+        if (os == EXT2_SUPERBLOCK_OS_LINUX || os == EXT2_SUPERBLOCK_OS_HURD) {
+                return ((uint32_t)uint16_t_le2host(inode->user_id_high)) << 16 |
+                    ((uint32_t)uint16_t_le2host(inode->user_id));
+        }
         return uint16_t_le2host(inode->user_id);
 }
@@ -62 +71 @@
  * Get size of file
  * 
+ * For regular files in revision 1 and later, the high 32 bits of
+ * file size are stored in inode->size_high and are 0 otherwise
+ * 
  * @param inode pointer to inode
  */
-inline uint32_t ext2_inode_get_size(ext2_inode_t *inode)
+inline uint64_t ext2_inode_get_size(ext2_superblock_t *sb, ext2_inode_t *inode)
 {
-        // TODO: Directory ACLS!
-        return uint16_t_le2host(inode->size);
+        uint32_t major_rev = ext2_superblock_get_rev_major(sb);
+        uint32_t mode = ext2_inode_get_mode(sb, inode);
+        
+        if (major_rev > 0 && mode & EXT2_INODE_MODE_FILE) {
+                return ((uint64_t)uint32_t_le2host(inode->size_high)) << 32 |
+                    ((uint64_t)uint32_t_le2host(inode->size));
+        }
+        return uint32_t_le2host(inode->size);
 }
 
@@ -73 +91 @@
  * Get gid this inode belongs to
  * 
+ * For Linux and Hurd, the high 16 bits are stored in OS dependent part
+ * of inode structure
+ * 
  * @param inode pointer to inode
  */
-inline uint32_t ext2_inode_get_group_id(ext2_inode_t *inode)
+inline uint32_t ext2_inode_get_group_id(ext2_superblock_t *sb, ext2_inode_t *inode)
 {
-        // TODO: use additional OS specific bits
+        uint32_t os = ext2_superblock_get_os(sb);
+        if (os == EXT2_SUPERBLOCK_OS_LINUX || os == EXT2_SUPERBLOCK_OS_HURD) {
+                return ((uint32_t)uint16_t_le2host(inode->group_id_high)) << 16 |
+                    ((uint32_t)uint16_t_le2host(inode->group_id));
+        }
         return uint16_t_le2host(inode->group_id);
 }
@@ -93 +118 @@
 
 /**
- * Get size of inode in 512 byte blocks
- * TODO: clarify this
+ * Get number of 512-byte data blocks allocated for contents of the file
+ * represented by this inode.
+ * This should be multiple of block size unless fragments are used.
  * 
  * @param inode pointer to inode
@@ -108 +134 @@
  * @param inode pointer to inode
  */
-
 inline uint32_t ext2_inode_get_flags(ext2_inode_t *inode) {
         return uint32_t_le2host(inode->flags);

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 *);

uspace/lib/ext2/libext2_superblock.h

@@ -78 +78 @@
 #define EXT2_SUPERBLOCK_LAST_BYTE       (EXT2_SUPERBLOCK_OFFSET + \
                                                                          EXT2_SUPERBLOCK_SIZE -1)
+#define EXT2_SUPERBLOCK_OS_LINUX        0
+#define EXT2_SUPERBLOCK_OS_HURD         1