X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=lwext4%2Fext4_types.h;h=41cb33f215fea2bdc2402cbbfd3bb4be84f11c37;hb=809b27e9dcf7f7120b98b03b13ceb624302e8183;hp=5b8441d1c74bfc1ff254d43ae6785d306f95a52c;hpb=e0720c64b73449e31a960d09e2f06cfce3b2bdeb;p=lwext4.git

diff --git a/lwext4/ext4_types.h b/lwext4/ext4_types.h
index 5b8441d..41cb33f 100644
--- a/lwext4/ext4_types.h
+++ b/lwext4/ext4_types.h
@@ -48,7 +48,7 @@ extern "C" {
 
 #include "ext4_config.h"
 #include "ext4_blockdev.h"
-#include "tree.h"
+#include "misc/tree.h"
 
 #include <stddef.h>
 #include <stdint.h>
@@ -57,6 +57,8 @@ extern "C" {
 
 #define UUID_SIZE 16
 
+#pragma pack(push, 1)
+
 /*
  * Structure of the super block
  */
@@ -167,7 +169,9 @@ struct ext4_sblock {
 	uint32_t lpf_ino;		/* Location of the lost+found inode */
 	uint32_t padding[100];	/* Padding to the end of the block */
 	uint32_t checksum;		/* crc32c(superblock) */
-} __attribute__((packed));
+};
+
+#pragma pack(pop)
 
 #define EXT4_SUPERBLOCK_MAGIC 0xEF53
 #define EXT4_SUPERBLOCK_SIZE 1024
@@ -306,6 +310,10 @@ struct ext4_fs {
 	uint64_t inode_blocks_per_level[4];
 
 	uint32_t last_inode_bg_id;
+
+	struct jbd_fs *jbd_fs;
+	struct jbd_journal *jbd_journal;
+	struct jbd_trans *curr_trans;
 };
 
 /* Inode table/bitmap not in use */
@@ -370,6 +378,8 @@ struct ext4_block_group_ref {
 #define EXT4_INODE_INDIRECT_BLOCK_COUNT                                        \
 	(EXT4_INODE_BLOCKS - EXT4_INODE_DIRECT_BLOCK_COUNT)
 
+#pragma pack(push, 1)
+
 /*
  * Structure of an inode on the disk
  */
@@ -408,7 +418,7 @@ struct ext4_inode {
 			uint16_t gid_high;
 			uint32_t author;
 		} hurd2;
-	} __attribute__((packed)) osd2;
+	} osd2;
 
 	uint16_t extra_isize;
 	uint16_t checksum_hi;	/* crc32c(uuid+inum+inode) BE */
@@ -419,7 +429,9 @@ struct ext4_inode {
 	uint32_t
 	    crtime_extra;    /* Extra file creation time (nsec << 2 | epoch) */
 	uint32_t version_hi; /* High 32 bits for 64-bit version */
-} __attribute__((packed));
+};
+
+#pragma pack(pop)
 
 #define EXT4_INODE_MODE_FIFO 0x1000
 #define EXT4_INODE_MODE_CHARDEV 0x2000
@@ -487,10 +499,12 @@ enum { EXT4_DE_UNKNOWN = 0,
 
 #define EXT4_DIRENTRY_DIR_CSUM 0xDE
 
+#pragma pack(push, 1)
+
 union ext4_dir_en_internal {
 	uint8_t name_length_high; /* Higher 8 bits of name length */
 	uint8_t inode_type;       /* Type of referenced inode (in rev >= 0.5) */
-} __attribute__((packed));
+};
 
 /**
  * Linked list directory entry structure
@@ -503,7 +517,7 @@ struct ext4_dir_en {
 	union ext4_dir_en_internal in;
 
 	uint8_t name[EXT4_DIRECTORY_FILENAME_LEN]; /* Entry name */
-} __attribute__((packed));
+};
 
 struct ext4_dir_iter {
 	struct ext4_inode_ref *inode_ref;
@@ -589,6 +603,8 @@ struct ext4_dir_entry_tail {
 	uint32_t checksum;		/* crc32c(uuid+inum+dirblock) */
 };
 
+#pragma pack(pop)
+
 #define EXT4_DIRENT_TAIL(block, blocksize) \
 	((struct ext4_dir_entry_tail *)(((char *)(block)) + ((blocksize) - \
 					sizeof(struct ext4_dir_entry_tail))))
@@ -624,6 +640,9 @@ struct ext4_dir_entry_tail {
 	((ex)->block_count |= to_le16(EXT4_EXT_UNWRITTEN_MASK))
 #define EXT4_EXT_SET_WRITTEN(ex) \
 	((ex)->block_count &= ~(to_le16(EXT4_EXT_UNWRITTEN_MASK)))
+
+#pragma pack(push, 1)
+
 /*
  * This is the extent tail on-disk structure.
  * All other extent structures are 12 bytes long.  It turns out that
@@ -675,6 +694,8 @@ struct ext4_extent_header {
 	uint32_t generation;    /* generation of the tree */
 };
 
+#pragma pack(pop)
+
 
 /*
  * Types of blocks.
@@ -803,6 +824,8 @@ struct ext4_hash_info {
 #define EXT4_XATTR_INDEX_RICHACL		8
 #define EXT4_XATTR_INDEX_ENCRYPTION		9
 
+#pragma pack(push, 1)
+
 struct ext4_xattr_header {
 	uint32_t h_magic;	/* magic number for identification */
 	uint32_t h_refcount;	/* reference count */
@@ -811,11 +834,11 @@ struct ext4_xattr_header {
 	uint32_t h_checksum;	/* crc32c(uuid+id+xattrblock) */
 				/* id = inum if refcount=1, blknum otherwise */
 	uint32_t h_reserved[3];	/* zero right now */
-} __attribute__((packed));
+};
 
 struct ext4_xattr_ibody_header {
 	uint32_t h_magic;	/* magic number for identification */
-} __attribute__((packed));
+};
 
 struct ext4_xattr_entry {
 	uint8_t e_name_len;	/* length of name */
@@ -824,7 +847,9 @@ struct ext4_xattr_entry {
 	uint32_t e_value_block;	/* disk block attribute is stored on (n/i) */
 	uint32_t e_value_size;	/* size of attribute value */
 	uint32_t e_hash;		/* hash value of name and value */
-} __attribute__((packed));
+};
+
+#pragma pack(pop)
 
 struct ext4_xattr_item {
 	/* This attribute should be stored in inode body */
@@ -911,6 +936,8 @@ struct ext4_xattr_ref {
 #define JBD_SUPERBLOCK_V2	4
 #define JBD_REVOKE_BLOCK	5
 
+#pragma pack(push, 1)
+
 /*
  * Standard header for all descriptor blocks:
  */
@@ -920,6 +947,8 @@ struct jbd_bhdr {
 	uint32_t		sequence;
 };
 
+#pragma pack(pop)
+
 /*
  * Checksum types.
  */
@@ -931,6 +960,9 @@ struct jbd_bhdr {
 #define JBD_CRC32_CHKSUM_SIZE 4
 
 #define JBD_CHECKSUM_BYTES (32 / sizeof(uint32_t))
+
+#pragma pack(push, 1)
+
 /*
  * Commit block header for storing transactional checksums:
  *
@@ -949,6 +981,7 @@ struct jbd_bhdr {
  *
  * Checksum v1, v2, and v3 are mutually exclusive features.
  */
+
 struct jbd_commit_header {
 	struct jbd_bhdr header;
 	uint8_t chksum_type;
@@ -976,12 +1009,16 @@ struct jbd_block_tag {
 	uint32_t		blocknr_high; /* most-significant high 32bits. */
 };
 
+#pragma pack(pop)
+
 /* Definitions for the journal tag flags word: */
 #define JBD_FLAG_ESCAPE		1	/* on-disk block is escaped */
 #define JBD_FLAG_SAME_UUID	2	/* block has same uuid as previous */
 #define JBD_FLAG_DELETED	4	/* block deleted by this transaction */
 #define JBD_FLAG_LAST_TAG	8	/* last tag in this descriptor block */
 
+#pragma pack(push, 1)
+
 /* Tail of descriptor block, for checksumming */
 struct jbd_block_tail {
 	uint32_t	checksum;
@@ -1001,9 +1038,13 @@ struct jbd_revoke_tail {
 	uint32_t		checksum;
 };
 
+#pragma pack(pop)
+
 #define JBD_USERS_MAX 48
 #define JBD_USERS_SIZE (UUID_SIZE * JBD_USERS_MAX)
 
+#pragma pack(push, 1)
+
 /*
  * The journal superblock.  All fields are in big-endian byte order.
  */
@@ -1055,6 +1096,8 @@ struct jbd_sb {
 /* 0x0400 */
 };
 
+#pragma pack(pop)
+
 #define JBD_SUPERBLOCK_SIZE sizeof(struct jbd_sb)
 
 #define JBD_HAS_COMPAT_FEATURE(jsb,mask)					\
@@ -1093,6 +1136,63 @@ struct jbd_fs {
 	bool dirty;
 };
 
+struct jbd_buf {
+	uint64_t jbd_lba;
+	struct ext4_block block;
+	struct jbd_trans *trans;
+	struct jbd_block_rec *block_rec;
+	TAILQ_ENTRY(jbd_buf) buf_node;
+	TAILQ_ENTRY(jbd_buf) dirty_buf_node;
+};
+
+struct jbd_revoke_rec {
+	ext4_fsblk_t lba;
+	LIST_ENTRY(jbd_revoke_rec) revoke_node;
+};
+
+struct jbd_block_rec {
+	ext4_fsblk_t lba;
+	struct ext4_buf *buf;
+	struct jbd_trans *trans;
+	RB_ENTRY(jbd_block_rec) block_rec_node;
+	LIST_ENTRY(jbd_block_rec) tbrec_node;
+	TAILQ_HEAD(jbd_buf_dirty, jbd_buf) dirty_buf_queue;
+};
+
+struct jbd_trans {
+	uint32_t trans_id;
+
+	uint32_t start_iblock;
+	int alloc_blocks;
+	int data_cnt;
+	uint32_t data_csum;
+	int written_cnt;
+	int error;
+
+	struct jbd_journal *journal;
+
+	TAILQ_HEAD(jbd_trans_buf, jbd_buf) buf_queue;
+	LIST_HEAD(jbd_revoke_list, jbd_revoke_rec) revoke_list;
+	LIST_HEAD(jbd_trans_block_rec, jbd_block_rec) tbrec_list;
+	TAILQ_ENTRY(jbd_trans) trans_node;
+};
+
+struct jbd_journal {
+	uint32_t first;
+	uint32_t start;
+	uint32_t last;
+	uint32_t trans_id;
+	uint32_t alloc_trans_id;
+
+	uint32_t block_size;
+
+	TAILQ_HEAD(jbd_trans_queue, jbd_trans) trans_queue;
+	TAILQ_HEAD(jbd_cp_queue, jbd_trans) cp_queue;
+	RB_HEAD(jbd_block, jbd_block_rec) block_rec_root;
+
+	struct jbd_fs *jbd_fs;
+};
+
 /*****************************************************************************/
 
 #define EXT4_CRC32_INIT (0xFFFFFFFFUL)
@@ -1181,9 +1281,11 @@ static inline uint16_t reorder16(uint16_t n)
 	while (0)
 
 #ifdef __GNUC__
-#ifndef __unused
-#define __unused __attribute__ ((__unused__))
-#endif
+ #ifndef __unused
+ #define __unused __attribute__ ((__unused__))
+ #endif
+#else
+ #define __unused
 #endif
 
 #ifndef offsetof