Index: uspace/app/ext2info/ext2info.c
===================================================================
--- uspace/app/ext2info/ext2info.c	(revision 6a7e497a7d1685485756693cc42f76f38039ad44)
+++ uspace/app/ext2info/ext2info.c	(revision 82a3b31fadb5fab16e1ccb42fffae5ec8192d9f8)
@@ -586,4 +586,5 @@
 	ext2_directory_iterator_t it;
 	size_t name_size;
+	uint32_t inode;
 	
 	printf("  Directory contents:\n");
@@ -600,5 +601,7 @@
 		printf("    ");
 		print_data(&it.current->name, name_size);
-		printf(" --> %u\n", it.current->inode);
+		
+		inode = ext2_directory_entry_ll_get_inode(it.current);
+		printf(" --> %u\n", inode);
 		
 		rc = ext2_directory_iterator_next(&it);
Index: uspace/lib/ext2/libext2_superblock.c
===================================================================
--- uspace/lib/ext2/libext2_superblock.c	(revision 6a7e497a7d1685485756693cc42f76f38039ad44)
+++ uspace/lib/ext2/libext2_superblock.c	(revision 82a3b31fadb5fab16e1ccb42fffae5ec8192d9f8)
@@ -184,5 +184,5 @@
 		return EXT2_REV0_INODE_SIZE;
 	}
-	return uint32_t_le2host(sb->inode_size);
+	return uint16_t_le2host(sb->inode_size);
 }
 
Index: uspace/srv/fs/ext2fs/ext2fs_ops.c
===================================================================
--- uspace/srv/fs/ext2fs/ext2fs_ops.c	(revision 6a7e497a7d1685485756693cc42f76f38039ad44)
+++ uspace/srv/fs/ext2fs/ext2fs_ops.c	(revision 82a3b31fadb5fab16e1ccb42fffae5ec8192d9f8)
@@ -232,4 +232,5 @@
 	size_t component_size;
 	bool found = false;
+	uint32_t inode;
 	
 	fs = eparent->instance->filesystem;
@@ -254,6 +255,8 @@
 	
 	while (it.current != NULL) {
+		inode = ext2_directory_entry_ll_get_inode(it.current);
+		
 		/* ignore empty directory entries */
-		if (it.current->inode != 0) {
+		if (inode != 0) {
 			name_size = ext2_directory_entry_ll_get_name_length(fs->superblock,
 				it.current);
@@ -262,5 +265,5 @@
 				    name_size) == 0) {
 				rc = ext2fs_node_get_core(rfn, eparent->instance,
-					it.current->inode);
+					inode);
 				if (rc != EOK) {
 					ext2_directory_iterator_fini(&it);