Index: uspace/lib/ext4/libext4_block_group.h =================================================================== --- uspace/lib/ext4/libext4_block_group.h (revision 01ab41b7aac1dcb93cd817e4174b7f00288199b1) +++ uspace/lib/ext4/libext4_block_group.h (revision 9c0c0e1eb10d810e40534e09f763360954a6bec8) @@ -40,22 +40,22 @@ */ typedef struct ext4_block_group { - uint32_t bg_block_bitmap_lo; // Blocks bitmap block - uint32_t bg_inode_bitmap_lo; // Inodes bitmap block - uint32_t bg_inode_table_lo; // Inodes table block - uint16_t bg_free_blocks_count_lo; // Free blocks count - uint16_t bg_free_inodes_count_lo; // Free inodes count - uint16_t bg_used_dirs_count_lo; // Directories count - uint16_t bg_flags; // EXT4_BG_flags (INODE_UNINIT, etc) - uint32_t bg_reserved[2]; // Likely block/inode bitmap checksum - uint16_t bg_itable_unused_lo; // Unused inodes count - uint16_t bg_checksum; // crc16(sb_uuid+group+desc) - uint32_t bg_block_bitmap_hi; // Blocks bitmap block MSB - uint32_t bg_inode_bitmap_hi; // Inodes bitmap block MSB - uint32_t bg_inode_table_hi; // Inodes table block MSB - uint16_t bg_free_blocks_count_hi; // Free blocks count MSB - uint16_t bg_free_inodes_count_hi; // Free inodes count MSB - uint16_t bg_used_dirs_count_hi; // Directories count MSB - uint16_t bg_itable_unused_hi; // Unused inodes count MSB - uint32_t bg_reserved2[3]; // Padding + uint32_t block_bitmap_lo; // Blocks bitmap block + uint32_t inode_bitmap_lo; // Inodes bitmap block + uint32_t inode_table_lo; // Inodes table block + uint16_t free_blocks_count_lo; // Free blocks count + uint16_t free_inodes_count_lo; // Free inodes count + uint16_t used_dirs_count_lo; // Directories count + uint16_t flags; // EXT4_BG_flags (INODE_UNINIT, etc) + uint32_t reserved[2]; // Likely block/inode bitmap checksum + uint16_t itable_unused_lo; // Unused inodes count + uint16_t checksum; // crc16(sb_uuid+group+desc) + uint32_t block_bitmap_hi; // Blocks bitmap block MSB + uint32_t inode_bitmap_hi; // Inodes bitmap block MSB + uint32_t inode_table_hi; // Inodes table block MSB + uint16_t free_blocks_count_hi; // Free blocks count MSB + uint16_t free_inodes_count_hi; // Free inodes count MSB + uint16_t used_dirs_count_hi; // Directories count MSB + uint16_t itable_unused_hi; // Unused inodes count MSB + uint32_t reserved2[3]; // Padding } ext4_group_desc_t; Index: uspace/lib/ext4/libext4_filesystem.c =================================================================== --- uspace/lib/ext4/libext4_filesystem.c (revision 01ab41b7aac1dcb93cd817e4174b7f00288199b1) +++ uspace/lib/ext4/libext4_filesystem.c (revision 9c0c0e1eb10d810e40534e09f763360954a6bec8) @@ -52,5 +52,5 @@ fs->device = service_id; - // TODO block size !!! + // TODO what does constant 2048 mean? rc = block_init(EXCHANGE_SERIALIZE, fs->device, 2048); if (rc != EOK) { @@ -58,4 +58,5 @@ } + /* Read superblock from device */ rc = ext4_superblock_read_direct(fs->device, &temp_superblock); if (rc != EOK) { @@ -64,6 +65,6 @@ } + /* Read block size from superblock and check */ block_size = ext4_superblock_get_block_size(temp_superblock); - if (block_size > EXT4_MAX_BLOCK_SIZE) { block_fini(fs->device); @@ -71,4 +72,5 @@ } + /* Initialize block caching */ rc = block_cache_init(service_id, block_size, 0, CACHE_MODE_WT); if (rc != EOK) { @@ -77,8 +79,7 @@ } + /* Return loaded superblock */ fs->superblock = temp_superblock; - - // TODO return EOK; } @@ -102,7 +103,27 @@ * TODO doxy */ -int ext4_filesystem_check_flags(ext4_filesystem_t *fs, bool *o_read_only) +int ext4_filesystem_check_features(ext4_filesystem_t *fs, bool *o_read_only) { - // TODO + /* Feature flags are present in rev 1 and later */ + if (ext4_superblock_get_rev_level(fs->superblock) == 0) { + *o_read_only = false; + return EOK; + } + + uint32_t incompatible_features; + incompatible_features = ext4_superblock_get_features_incompatible(fs->superblock); + incompatible_features &= ~EXT4_FEATURE_INCOMPAT_SUPP; + if (incompatible_features > 0) { + *o_read_only = true; + return ENOTSUP; + } + + uint32_t compatible_read_only; + compatible_read_only = ext4_superblock_get_features_read_only(fs->superblock); + compatible_read_only &= ~EXT4_FEATURE_RO_COMPAT_SUPP; + if (compatible_read_only > 0) { + *o_read_only = true; + } + return EOK; } Index: uspace/lib/ext4/libext4_filesystem.h =================================================================== --- uspace/lib/ext4/libext4_filesystem.h (revision 01ab41b7aac1dcb93cd817e4174b7f00288199b1) +++ uspace/lib/ext4/libext4_filesystem.h (revision 9c0c0e1eb10d810e40534e09f763360954a6bec8) @@ -42,10 +42,63 @@ } ext4_filesystem_t; -// TODO constant value -#define EXT4_MAX_BLOCK_SIZE 8096 +#define EXT4_MAX_BLOCK_SIZE 65536 //64 KiB + + +/* Compatible features */ +// TODO features comments !!! +#define EXT4_FEATURE_COMPAT_DIR_PREALLOC 0x0001 +#define EXT4_FEATURE_COMPAT_IMAGIC_INODES 0x0002 +#define EXT4_FEATURE_COMPAT_HAS_JOURNAL 0x0004 +#define EXT4_FEATURE_COMPAT_EXT_ATTR 0x0008 +#define EXT4_FEATURE_COMPAT_RESIZE_INODE 0x0010 +#define EXT4_FEATURE_COMPAT_DIR_INDEX 0x0020 + +/* Read-only compatible features */ +// TODO features comments !!! +#define EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001 +#define EXT4_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 +#define EXT4_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 +#define EXT4_FEATURE_RO_COMPAT_HUGE_FILE 0x0008 +#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM 0x0010 +#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020 +#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040 + +/* Incompatible features */ +// TODO features comments !!! +#define EXT4_FEATURE_INCOMPAT_COMPRESSION 0x0001 +#define EXT4_FEATURE_INCOMPAT_FILETYPE 0x0002 +#define EXT4_FEATURE_INCOMPAT_RECOVER 0x0004 /* Needs recovery */ +#define EXT4_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008 /* Journal device */ +#define EXT4_FEATURE_INCOMPAT_META_BG 0x0010 +#define EXT4_FEATURE_INCOMPAT_EXTENTS 0x0040 /* extents support */ +#define EXT4_FEATURE_INCOMPAT_64BIT 0x0080 +#define EXT4_FEATURE_INCOMPAT_MMP 0x0100 +#define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200 +#define EXT4_FEATURE_INCOMPAT_EA_INODE 0x0400 /* EA in inode */ +#define EXT4_FEATURE_INCOMPAT_DIRDATA 0x1000 /* data in dirent */ + + +// TODO MODIFY features corresponding with implementation +#define EXT4_FEATURE_COMPAT_SUPP EXT4_FEATURE_COMPAT_EXT_ATTR + +#define EXT4_FEATURE_INCOMPAT_SUPP (EXT4_FEATURE_INCOMPAT_FILETYPE| \ + EXT4_FEATURE_INCOMPAT_RECOVER| \ + EXT4_FEATURE_INCOMPAT_META_BG| \ + EXT4_FEATURE_INCOMPAT_EXTENTS| \ + EXT4_FEATURE_INCOMPAT_64BIT| \ + EXT4_FEATURE_INCOMPAT_FLEX_BG) + +#define EXT4_FEATURE_RO_COMPAT_SUPP (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \ + EXT4_FEATURE_RO_COMPAT_LARGE_FILE| \ + EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \ + EXT4_FEATURE_RO_COMPAT_DIR_NLINK | \ + EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE | \ + EXT4_FEATURE_RO_COMPAT_BTREE_DIR |\ + EXT4_FEATURE_RO_COMPAT_HUGE_FILE) + extern int ext4_filesystem_init(ext4_filesystem_t *, service_id_t); extern int ext4_filesystem_check_sanity(ext4_filesystem_t *fs); -extern int ext4_filesystem_check_flags(ext4_filesystem_t *, bool *); +extern int ext4_filesystem_check_features(ext4_filesystem_t *, bool *); extern void ext4_filesystem_fini(ext4_filesystem_t *fs); Index: uspace/lib/ext4/libext4_inode.c =================================================================== --- uspace/lib/ext4/libext4_inode.c (revision 01ab41b7aac1dcb93cd817e4174b7f00288199b1) +++ uspace/lib/ext4/libext4_inode.c (revision 9c0c0e1eb10d810e40534e09f763360954a6bec8) @@ -36,4 +36,5 @@ */ +#include #include "libext4_inode.h" @@ -44,6 +45,5 @@ uint16_t ext4_inode_get_usage_count(ext4_inode_t *inode) { - // TODO check - return 0; + return uint16_t_le2host(inode->links_count); } Index: uspace/lib/ext4/libext4_inode.h =================================================================== --- uspace/lib/ext4/libext4_inode.h (revision 01ab41b7aac1dcb93cd817e4174b7f00288199b1) +++ uspace/lib/ext4/libext4_inode.h (revision 9c0c0e1eb10d810e40534e09f763360954a6bec8) @@ -37,6 +37,9 @@ #include -// TODO better constant definition !!! -#define EXT4_N_BLOCKS 15 +#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) /* @@ -44,74 +47,36 @@ */ typedef struct ext4_inode { - uint16_t i_mode; // File mode - uint16_t i_uid; // Low 16 bits of owner uid - uint32_t i_size_lo; // Size in bytes - uint32_t i_atime; // Access time - uint32_t i_ctime; // Inode change time - uint32_t i_mtime; // Modification time - uint32_t i_dtime; // Deletion time - uint16_t i_gid; // Low 16 bits of group id - uint16_t i_links_count; // Links count - uint32_t i_blocks_lo; // Blocks count - uint32_t i_flags; // File flags + uint16_t mode; // File mode + uint16_t uid; // Low 16 bits of owner uid + uint32_t size_lo; // Size in bytes - /* - union { - struct { - __le32 l_i_version; - } linux1; - struct { - __u32 h_i_translator; - } hurd1; - struct { - __u32 m_i_reserved1; - } masix1; - } osd1; - */ + // TODO Used in HelenOS ??? + uint32_t atime; // Access time + uint32_t ctime; // Inode change time + uint32_t mtime; // Modification time + uint32_t dtime; // Deletion time + + uint16_t gid; // Low 16 bits of group id + uint16_t links_count; // Links count + uint32_t blocks_lo; // Blocks count + uint32_t flags; // File flags uint32_t unused_osd1; // OS dependent - not used in HelenOS - - uint32_t i_block[EXT4_N_BLOCKS]; // Pointers to blocks - uint32_t i_generation; // File version (for NFS) - uint32_t i_file_acl_lo; // File ACL - uint32_t i_size_high; - uint32_t i_obso_faddr; // Obsoleted fragment address - - /* - union { - struct { - __le16 l_i_blocks_high; - __le16 l_i_file_acl_high; - __le16 l_i_uid_high; - __le16 l_i_gid_high; - __u32 l_i_reserved2; - } linux2; - struct { - __le16 h_i_reserved1; - __u16 h_i_mode_high; - __u16 h_i_uid_high; - __u16 h_i_gid_high; - __u32 h_i_author; - } hurd2; - struct { - __le16 h_i_reserved1; - __le16 m_i_file_acl_high; - __u32 m_i_reserved2[2]; - } masix2; - } osd2; - */ - - uint32_t unused_osd2[3]; // OS dependent - not used in HelenOS - uint16_t i_extra_isize; - uint16_t i_pad1; - uint32_t i_ctime_extra; // Extra change time (nsec << 2 | epoch) - uint32_t i_mtime_extra; // Extra Modification time (nsec << 2 | epoch) - uint32_t i_atime_extra; // Extra Access time (nsec << 2 | epoch) - uint32_t i_crtime; // File creation time - uint32_t i_crtime_extra; // Extra file creation time (nsec << 2 | epoch) - uint32_t i_version_hi; // High 32 bits for 64-bit version + uint32_t blocks[EXT4_INODE_BLOCKS]; // Pointers to blocks + uint32_t generation; // File version (for NFS) + uint32_t file_acl_lo; // File ACL + uint32_t size_hi; + uint32_t obso_faddr; // Obsoleted fragment address + uint32_t unused_osd2[3]; // OS dependent - not used in HelenOS + uint16_t extra_isize; + uint16_t pad1; + uint32_t ctime_extra; // Extra change time (nsec << 2 | epoch) + uint32_t mtime_extra; // Extra Modification time (nsec << 2 | epoch) + uint32_t atime_extra; // Extra Access time (nsec << 2 | epoch) + uint32_t crtime; // File creation time + uint32_t crtime_extra; // Extra file creation time (nsec << 2 | epoch) + uint32_t version_hi; // High 32 bits for 64-bit version } __attribute__ ((packed)) ext4_inode_t; -// TODO check value #define EXT4_INODE_ROOT_INDEX 2 Index: uspace/lib/ext4/libext4_superblock.c =================================================================== --- uspace/lib/ext4/libext4_superblock.c (revision 01ab41b7aac1dcb93cd817e4174b7f00288199b1) +++ uspace/lib/ext4/libext4_superblock.c (revision 9c0c0e1eb10d810e40534e09f763360954a6bec8) @@ -45,7 +45,7 @@ * TODO doxy */ -uint16_t ext2_superblock_get_magic(ext4_superblock_t *sb) +uint16_t ext4_superblock_get_magic(ext4_superblock_t *sb) { - return uint16_t_le2host(sb->s_magic); + return uint16_t_le2host(sb->magic); } @@ -55,5 +55,5 @@ uint32_t ext4_superblock_get_first_block(ext4_superblock_t *sb) { - return uint32_t_le2host(sb->s_first_data_block); + return uint32_t_le2host(sb->first_data_block); } @@ -63,5 +63,5 @@ uint32_t ext4_superblock_get_block_size_log2(ext4_superblock_t *sb) { - return uint32_t_le2host(sb->s_log_block_size); + return uint32_t_le2host(sb->log_block_size); } @@ -72,4 +72,36 @@ { return 1024 << ext4_superblock_get_block_size_log2(sb); +} + +/** + * TODO doxy + */ +uint32_t ext4_superblock_get_rev_level(ext4_superblock_t *sb) +{ + return uint32_t_le2host(sb->rev_level); +} + +/** + * TODO doxy + */ +uint32_t ext4_superblock_get_features_compatible(ext4_superblock_t *sb) +{ + return uint32_t_le2host(sb->features_compatible); +} + +/** + * TODO doxy + */ +uint32_t ext4_superblock_get_features_incompatible(ext4_superblock_t *sb) +{ + return uint32_t_le2host(sb->features_incompatible); +} + +/** + * TODO doxy + */ +uint32_t ext4_superblock_get_features_read_only(ext4_superblock_t *sb) +{ + return uint32_t_le2host(sb->features_read_only); } @@ -107,5 +139,10 @@ int ext4_superblock_check_sanity(ext4_superblock_t *sb) { - // TODO + if (ext4_superblock_get_magic(sb) != EXT4_SUPERBLOCK_MAGIC) { + return ENOTSUP; + } + + // TODO more checks !!! + return EOK; } Index: uspace/lib/ext4/libext4_superblock.h =================================================================== --- uspace/lib/ext4/libext4_superblock.h (revision 01ab41b7aac1dcb93cd817e4174b7f00288199b1) +++ uspace/lib/ext4/libext4_superblock.h (revision 9c0c0e1eb10d810e40534e09f763360954a6bec8) @@ -41,11 +41,11 @@ */ typedef struct ext4_superblock { - uint32_t s_inodes_count; // Inodes count + uint32_t inodes_count; // Inodes count uint32_t s_blocks_count_lo; // Blocks count uint32_t s_r_blocks_count_lo; // Reserved blocks count - uint32_t s_free_blocks_count_lo; // Free blocks count - uint32_t s_free_inodes_count; // Free inodes count - uint32_t s_first_data_block; // First Data Block - uint32_t s_log_block_size; // Block size + uint32_t free_blocks_count_lo; // Free blocks count + uint32_t free_inodes_count; // Free inodes count + uint32_t first_data_block; // First Data Block + uint32_t log_block_size; // Block size uint32_t s_obso_log_frag_size; // Obsoleted fragment size uint32_t s_blocks_per_group; // Number of blocks per group @@ -54,14 +54,14 @@ uint32_t s_mtime; // Mount time uint32_t s_wtime; // Write time - uint16_t s_mnt_count; // Mount count - uint16_t s_max_mnt_count; // Maximal mount count - uint16_t s_magic; // Magic signature - uint16_t s_state; // File system state - uint16_t s_errors; // Behaviour when detecting errors - uint16_t s_minor_rev_level; // Minor revision level - uint32_t s_lastcheck; // Time of last check - uint32_t s_checkinterval; // Maximum time between checks - uint32_t s_creator_os; // Creator OS - uint32_t s_rev_level; // Revision level + uint16_t mount_count; // Mount count + uint16_t max_mount_count; // Maximal mount count + uint16_t magic; // Magic signature + uint16_t state; // File system state + uint16_t errors; // Behaviour when detecting errors + uint16_t minor_rev_level; // Minor revision level + uint32_t last_check; // Time of last check + uint32_t checkinterval; // Maximum time between checks + uint32_t creator_os; // Creator OS + uint32_t rev_level; // Revision level uint16_t s_def_resuid; // Default uid for reserved blocks uint16_t s_def_resgid; // Default gid for reserved blocks @@ -71,7 +71,7 @@ uint16_t s_inode_size; // Size of inode structure uint16_t s_block_group_nr; // Block group number of this superblock - uint32_t s_feature_compat; // Compatible feature set - uint32_t s_feature_incompat; // Incompatible feature set - uint32_t s_feature_ro_compat; // Readonly-compatible feature set + uint32_t features_compatible; // Compatible feature set + uint32_t features_incompatible; // Incompatible feature set + uint32_t features_read_only; // Readonly-compatible feature set uint8_t s_uuid[16]; // 128-bit uuid for volume char s_volume_name[16]; // Volume name @@ -122,6 +122,4 @@ uint64_t s_snapshot_r_blocks_count; /* reserved blocks for active snapshot's future use */ uint32_t s_snapshot_list; // inode number of the head of the on-disk snapshot list - - //#define EXT4_S_ERR_START offsetof(struct ext4_super_block, s_error_count) uint32_t s_error_count; // number of fs errors uint32_t s_first_error_time; // First time an error happened @@ -135,5 +133,4 @@ uint64_t s_last_error_block; /* block involved of last error */ uint8_t s_last_error_func[32]; /* function where the error happened */ - //#define EXT4_S_ERR_END offsetof(struct ext4_super_block, s_mount_opts) uint8_t s_mount_opts[64]; uint32_t s_reserved[112]; // Padding to the end of the block @@ -141,11 +138,16 @@ } __attribute__((packed)) ext4_superblock_t; -// TODO constants #define EXT4_SUPERBLOCK_MAGIC 0xEF53 #define EXT4_SUPERBLOCK_SIZE 1024 #define EXT4_SUPERBLOCK_OFFSET 1024 +extern uint16_t ext4_superblock_get_magic(ext4_superblock_t *); +extern uint32_t ext4_superblock_get_first_block(ext4_superblock_t *); extern uint32_t ext4_superblock_get_block_size_log2(ext4_superblock_t *); extern uint32_t ext4_superblock_get_block_size(ext4_superblock_t *); +extern uint32_t ext4_superblock_get_rev_level(ext4_superblock_t *); +extern uint32_t ext4_superblock_get_features_compatible(ext4_superblock_t *); +extern uint32_t ext4_superblock_get_features_incompatible(ext4_superblock_t *); +extern uint32_t ext4_superblock_get_features_read_only(ext4_superblock_t *); extern int ext4_superblock_read_direct(service_id_t, ext4_superblock_t **);