Make ext4_xattr & ext4_extents GPL licensed

3 files changed, 1 insertions, 443 deletions

diff --git a/include/ext4_extent.h b/include/ext4_extent.h
index 8f65289..c12a1b8 100644
--- a/include/ext4_extent.h
+++ b/include/ext4_extent.h
@@ -49,239 +49,9 @@ extern "C" {
 #include <ext4_types.h>
 #include <ext4_inode.h>
 
-
-/*
- * Array of ext4_ext_path contains path to some extent.
- * Creation/lookup routines use it for traversal/splitting/etc.
- * Truncate uses it to simulate recursive walking.
- */
-struct ext4_extent_path {
-	ext4_fsblk_t p_block;
-	struct ext4_block block;
-	int32_t depth;
-	int32_t maxdepth;
-	struct ext4_extent_header *header;
-	struct ext4_extent_index *index;
-	struct ext4_extent *extent;
-
-};
-
-
-/**@brief Get logical number of the block covered by extent.
- * @param extent Extent to load number from
- * @return Logical number of the first block covered by extent */
-static inline uint32_t ext4_extent_get_first_block(struct ext4_extent *extent)
-{
-	return to_le32(extent->first_block);
-}
-
-/**@brief Set logical number of the first block covered by extent.
- * @param extent Extent to set number to
- * @param iblock Logical number of the first block covered by extent */
-static inline void ext4_extent_set_first_block(struct ext4_extent *extent,
-		uint32_t iblock)
-{
-	extent->first_block = to_le32(iblock);
-}
-
-/**@brief Get number of blocks covered by extent.
- * @param extent Extent to load count from
- * @return Number of blocks covered by extent */
-static inline uint16_t ext4_extent_get_block_count(struct ext4_extent *extent)
-{
-	if (EXT4_EXT_IS_UNWRITTEN(extent))
-		return EXT4_EXT_GET_LEN_UNWRITTEN(extent);
-	else
-		return EXT4_EXT_GET_LEN(extent);
-}
-/**@brief Set number of blocks covered by extent.
- * @param extent Extent to load count from
- * @param count  Number of blocks covered by extent
- * @param unwritten Whether the extent is unwritten or not */
-static inline void ext4_extent_set_block_count(struct ext4_extent *extent,
-					       uint16_t count, bool unwritten)
-{
-	EXT4_EXT_SET_LEN(extent, count);
-	if (unwritten)
-		EXT4_EXT_SET_UNWRITTEN(extent);
-}
-
-/**@brief Get physical number of the first block covered by extent.
- * @param extent Extent to load number
- * @return Physical number of the first block covered by extent */
-static inline uint64_t ext4_extent_get_start(struct ext4_extent *extent)
-{
-	return ((uint64_t)to_le16(extent->start_hi)) << 32 |
-	       ((uint64_t)to_le32(extent->start_lo));
-}
-
-
-/**@brief Set physical number of the first block covered by extent.
- * @param extent Extent to load number
- * @param fblock Physical number of the first block covered by extent */
-static inline void ext4_extent_set_start(struct ext4_extent *extent, uint64_t fblock)
-{
-	extent->start_lo = to_le32((fblock << 32) >> 32);
-	extent->start_hi = to_le16((uint16_t)(fblock >> 32));
-}
-
-
-/**@brief Get logical number of the block covered by extent index.
- * @param index Extent index to load number from
- * @return Logical number of the first block covered by extent index */
-static inline uint32_t
-ext4_extent_index_get_first_block(struct ext4_extent_index *index)
-{
-	return to_le32(index->first_block);
-}
-
-/**@brief Set logical number of the block covered by extent index.
- * @param index  Extent index to set number to
- * @param iblock Logical number of the first block covered by extent index */
-static inline void
-ext4_extent_index_set_first_block(struct ext4_extent_index *index,
-				  uint32_t iblock)
-{
-	index->first_block = to_le32(iblock);
-}
-
-/**@brief Get physical number of block where the child node is located.
- * @param index Extent index to load number from
- * @return Physical number of the block with child node */
-static inline uint64_t
-ext4_extent_index_get_leaf(struct ext4_extent_index *index)
-{
-	return ((uint64_t)to_le16(index->leaf_hi)) << 32 |
-	       ((uint64_t)to_le32(index->leaf_lo));
-}
-
-/**@brief Set physical number of block where the child node is located.
- * @param index  Extent index to set number to
- * @param fblock Ohysical number of the block with child node */
-static inline void ext4_extent_index_set_leaf(struct ext4_extent_index *index,
-					      uint64_t fblock)
-{
-	index->leaf_lo = to_le32((fblock << 32) >> 32);
-	index->leaf_hi = to_le16((uint16_t)(fblock >> 32));
-}
-
-/**@brief Get magic value from extent header.
- * @param header Extent header to load value from
- * @return Magic value of extent header */
-static inline uint16_t
-ext4_extent_header_get_magic(struct ext4_extent_header *header)
-{
-	return to_le16(header->magic);
-}
-
-/**@brief Set magic value to extent header.
- * @param header Extent header to set value to
- * @param magic  Magic value of extent header */
-static inline void ext4_extent_header_set_magic(struct ext4_extent_header *header,
-						uint16_t magic)
-{
-	header->magic = to_le16(magic);
-}
-
-/**@brief Get number of entries from extent header
- * @param header Extent header to get value from
- * @return Number of entries covered by extent header */
-static inline uint16_t
-ext4_extent_header_get_entries_count(struct ext4_extent_header *header)
-{
-	return to_le16(header->entries_count);
-}
-
-/**@brief Set number of entries to extent header
- * @param header Extent header to set value to
- * @param count  Number of entries covered by extent header */
-static inline void
-ext4_extent_header_set_entries_count(struct ext4_extent_header *header,
-				     uint16_t count)
-{
-	header->entries_count = to_le16(count);
-}
-
-/**@brief Get maximum number of entries from extent header
- * @param header Extent header to get value from
- * @return Maximum number of entries covered by extent header */
-static inline uint16_t
-ext4_extent_header_get_max_entries_count(struct ext4_extent_header *header)
-{
-	return to_le16(header->max_entries_count);
-}
-
-/**@brief Set maximum number of entries to extent header
- * @param header    Extent header to set value to
- * @param max_count Maximum number of entries covered by extent header */
-static inline void
-ext4_extent_header_set_max_entries_count(struct ext4_extent_header *header,
-					      uint16_t max_count)
-{
-	header->max_entries_count = to_le16(max_count);
-}
-
-/**@brief Get depth of extent subtree.
- * @param header Extent header to get value from
- * @return Depth of extent subtree */
-static inline uint16_t
-ext4_extent_header_get_depth(struct ext4_extent_header *header)
-{
-	return to_le16(header->depth);
-}
-
-/**@brief Set depth of extent subtree.
- * @param header Extent header to set value to
- * @param depth  Depth of extent subtree */
-static inline void
-ext4_extent_header_set_depth(struct ext4_extent_header *header, uint16_t depth)
-{
-	header->depth = to_le16(depth);
-}
-
-/**@brief Get generation from extent header
- * @param header Extent header to get value from
- * @return Generation */
-static inline uint32_t
-ext4_extent_header_get_generation(struct ext4_extent_header *header)
-{
-	return to_le32(header->generation);
-}
-
-/**@brief Set generation to extent header
- * @param header     Extent header to set value to
- * @param generation Generation */
-static inline void
-ext4_extent_header_set_generation(struct ext4_extent_header *header,
-				       uint32_t generation)
-{
-	header->generation = to_le32(generation);
-}
-
-/******************************************************************************/
-
-/**TODO:  */
-static inline void ext4_extent_tree_init(struct ext4_inode_ref *inode_ref)
-{
-	/* Initialize extent root header */
-	struct ext4_extent_header *header =
-			ext4_inode_get_extent_header(inode_ref->inode);
-	ext4_extent_header_set_depth(header, 0);
-	ext4_extent_header_set_entries_count(header, 0);
-	ext4_extent_header_set_generation(header, 0);
-	ext4_extent_header_set_magic(header, EXT4_EXTENT_MAGIC);
-
-	uint16_t max_entries = (EXT4_INODE_BLOCKS * sizeof(uint32_t) -
-			sizeof(struct ext4_extent_header)) /
-					sizeof(struct ext4_extent);
-
-	ext4_extent_header_set_max_entries_count(header, max_entries);
-	inode_ref->dirty  = true;
-}
-
+void ext4_extent_tree_init(struct ext4_inode_ref *inode_ref);
 
 
-/**TODO:  */
 int ext4_extent_get_blocks(struct ext4_inode_ref *inode_ref, ext4_lblk_t iblock,
 			   uint32_t max_blocks, ext4_fsblk_t *result, bool create,
 			   uint32_t *blocks_count);
diff --git a/include/ext4_types.h b/include/ext4_types.h
index d927cd8..c9cdd34 100644
--- a/include/ext4_types.h
+++ b/include/ext4_types.h
@@ -582,146 +582,7 @@ struct ext4_dir_entry_tail {
 #define EXT4_JOURNAL_INO 8
 
 #define EXT4_GOOD_OLD_FIRST_INO 11
-
-#define EXT4_EXT_UNWRITTEN_MASK (1L << 15)
-
-#define EXT4_EXT_MAX_LEN_WRITTEN (1L << 15)
-#define EXT4_EXT_MAX_LEN_UNWRITTEN \
-	(EXT4_EXT_MAX_LEN_WRITTEN - 1)
-
-#define EXT4_EXT_GET_LEN(ex) to_le16((ex)->block_count)
-#define EXT4_EXT_GET_LEN_UNWRITTEN(ex) \
-	(EXT4_EXT_GET_LEN(ex) &= ~(EXT4_EXT_UNWRITTEN_MASK))
-#define EXT4_EXT_SET_LEN(ex, count) \
-	((ex)->block_count = to_le16(count))
-
-#define EXT4_EXT_IS_UNWRITTEN(ex) \
-	(EXT4_EXT_GET_LEN(ex) > EXT4_EXT_MAX_LEN_WRITTEN)
-#define EXT4_EXT_SET_UNWRITTEN(ex) \
-	((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
- * block_size % 12 >= 4 for at least all powers of 2 greater than 512, which
- * covers all valid ext4 block sizes.  Therefore, this tail structure can be
- * crammed into the end of the block without having to rebalance the tree.
- */
-struct ext4_extent_tail
-{
-	uint32_t et_checksum; /* crc32c(uuid+inum+extent_block) */
-};
-
-/*
- * This is the extent on-disk structure.
- * It's used at the bottom of the tree.
- */
-struct ext4_extent {
-	uint32_t first_block; /* First logical block extent covers */
-	uint16_t block_count; /* Number of blocks covered by extent */
-	uint16_t start_hi;    /* High 16 bits of physical block */
-	uint32_t start_lo;    /* Low 32 bits of physical block */
-};
-
-/*
- * This is index on-disk structure.
- * It's used at all the levels except the bottom.
- */
-struct ext4_extent_index {
-	uint32_t first_block; /* Index covers logical blocks from 'block' */
-
-	/**
-	 * Pointer to the physical block of the next
-	 * level. leaf or next index could be there
-	 * high 16 bits of physical block
-	 */
-	uint32_t leaf_lo;
-	uint16_t leaf_hi;
-	uint16_t padding;
-};
-
-/*
- * Each block (leaves and indexes), even inode-stored has header.
- */
-struct ext4_extent_header {
-	uint16_t magic;
-	uint16_t entries_count;     /* Number of valid entries */
-	uint16_t max_entries_count; /* Capacity of store in entries */
-	uint16_t depth;             /* Has tree real underlying blocks? */
-	uint32_t generation;    /* generation of the tree */
-};
-
-#pragma pack(pop)
-
-
-#define EXT4_EXTENT_MAGIC 0xF30A
-
-#define EXT4_EXTENT_FIRST(header)                                              \
-	((struct ext4_extent *)(((char *)(header)) +                           \
-				sizeof(struct ext4_extent_header)))
-
-#define EXT4_EXTENT_FIRST_INDEX(header)                                        \
-	((struct ext4_extent_index *)(((char *)(header)) +                     \
-				      sizeof(struct ext4_extent_header)))
-
-/*
- * EXT_INIT_MAX_LEN is the maximum number of blocks we can have in an
- * initialized extent. This is 2^15 and not (2^16 - 1), since we use the
- * MSB of ee_len field in the extent datastructure to signify if this
- * particular extent is an initialized extent or an uninitialized (i.e.
- * preallocated).
- * EXT_UNINIT_MAX_LEN is the maximum number of blocks we can have in an
- * uninitialized extent.
- * If ee_len is <= 0x8000, it is an initialized extent. Otherwise, it is an
- * uninitialized one. In other words, if MSB of ee_len is set, it is an
- * uninitialized extent with only one special scenario when ee_len = 0x8000.
- * In this case we can not have an uninitialized extent of zero length and
- * thus we make it as a special case of initialized extent with 0x8000 length.
- * This way we get better extent-to-group alignment for initialized extents.
- * Hence, the maximum number of blocks we can have in an *initialized*
- * extent is 2^15 (32768) and in an *uninitialized* extent is 2^15-1 (32767).
- */
-#define EXT_INIT_MAX_LEN (1L << 15)
-#define EXT_UNWRITTEN_MAX_LEN (EXT_INIT_MAX_LEN - 1)
-
-#define EXT_EXTENT_SIZE sizeof(struct ext4_extent)
-#define EXT_INDEX_SIZE sizeof(struct ext4_extent_idx)
-
-#define EXT_FIRST_EXTENT(__hdr__)                                              \
-	((struct ext4_extent *)(((char *)(__hdr__)) +                          \
-				sizeof(struct ext4_extent_header)))
-#define EXT_FIRST_INDEX(__hdr__)                                               \
-	((struct ext4_extent_index *)(((char *)(__hdr__)) +                    \
-				    sizeof(struct ext4_extent_header)))
-#define EXT_HAS_FREE_INDEX(__path__)                                           \
-	(to_le16((__path__)->header->entries_count) <                                \
-				    to_le16((__path__)->header->max_entries_count))
-#define EXT_LAST_EXTENT(__hdr__)                                               \
-	(EXT_FIRST_EXTENT((__hdr__)) + to_le16((__hdr__)->entries_count) - 1)
-#define EXT_LAST_INDEX(__hdr__)                                                \
-	(EXT_FIRST_INDEX((__hdr__)) + to_le16((__hdr__)->entries_count) - 1)
-#define EXT_MAX_EXTENT(__hdr__)                                                \
-	(EXT_FIRST_EXTENT((__hdr__)) + to_le16((__hdr__)->max_entries_count) - 1)
-#define EXT_MAX_INDEX(__hdr__)                                                 \
-	(EXT_FIRST_INDEX((__hdr__)) + to_le16((__hdr__)->max_entries_count) - 1)
-
-#define EXT4_EXTENT_TAIL_OFFSET(hdr)                                           \
-	(sizeof(struct ext4_extent_header) +                                   \
-	 (sizeof(struct ext4_extent) * to_le16((hdr)->max_entries_count)))
-
-/*
- * ext4_ext_next_allocated_block:
- * returns allocated block in subsequent extent or EXT_MAX_BLOCKS.
- * NOTE: it considers block number from index entry as
- * allocated block. Thus, index entries have to be consistent
- * with leaves.
- */
 #define EXT_MAX_BLOCKS (ext4_lblk_t) (-1)
-
 #define IN_RANGE(b, first, len)	((b) >= (first) && (b) <= (first) + (len) - 1)
 
 
@@ -737,53 +598,6 @@ struct ext4_extent_header {
 
 #define EXT2_HTREE_EOF 0x7FFFFFFFUL
 
-
-/* Extended Attribute(EA) */
-
-/* Magic value in attribute blocks */
-#define EXT4_XATTR_MAGIC		0xEA020000
-
-/* Maximum number of references to one attribute block */
-#define EXT4_XATTR_REFCOUNT_MAX		1024
-
-/* Name indexes */
-#define EXT4_XATTR_INDEX_USER			1
-#define EXT4_XATTR_INDEX_POSIX_ACL_ACCESS	2
-#define EXT4_XATTR_INDEX_POSIX_ACL_DEFAULT	3
-#define EXT4_XATTR_INDEX_TRUSTED		4
-#define	EXT4_XATTR_INDEX_LUSTRE			5
-#define EXT4_XATTR_INDEX_SECURITY	        6
-#define EXT4_XATTR_INDEX_SYSTEM			7
-#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 */
-	uint32_t h_blocks;	/* number of disk blocks used */
-	uint32_t h_hash;		/* hash value of all attributes */
-	uint32_t h_checksum;	/* crc32c(uuid+id+xattrblock) */
-				/* id = inum if refcount=1, blknum otherwise */
-	uint32_t h_reserved[3];	/* zero right now */
-};
-
-struct ext4_xattr_ibody_header {
-	uint32_t h_magic;	/* magic number for identification */
-};
-
-struct ext4_xattr_entry {
-	uint8_t e_name_len;	/* length of name */
-	uint8_t e_name_index;	/* attribute name index */
-	uint16_t e_value_offs;	/* offset in disk block of value */
-	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 */
-};
-
-#pragma pack(pop)
-
 #define EXT4_GOOD_OLD_INODE_SIZE	128
 
 /*****************************************************************************/
diff --git a/include/ext4_xattr.h b/include/ext4_xattr.h
index 5427d3a..d79febc 100644
--- a/include/ext4_xattr.h
+++ b/include/ext4_xattr.h
@@ -77,32 +77,6 @@ struct ext4_xattr_search {
 	bool not_found;
 };
 
-#define EXT4_XATTR_PAD_BITS 2
-#define EXT4_XATTR_PAD (1 << EXT4_XATTR_PAD_BITS)
-#define EXT4_XATTR_ROUND (EXT4_XATTR_PAD - 1)
-#define EXT4_XATTR_LEN(name_len)                                               \
-	(((name_len) + EXT4_XATTR_ROUND + sizeof(struct ext4_xattr_entry)) &   \
-	 ~EXT4_XATTR_ROUND)
-#define EXT4_XATTR_NEXT(entry)                                                 \
-	((struct ext4_xattr_entry *)((char *)(entry) +                         \
-				     EXT4_XATTR_LEN((entry)->e_name_len)))
-#define EXT4_XATTR_SIZE(size) (((size) + EXT4_XATTR_ROUND) & ~EXT4_XATTR_ROUND)
-#define EXT4_XATTR_NAME(entry) ((char *)((entry) + 1))
-
-#define EXT4_XATTR_IHDR(sb, raw_inode)                                         \
-	((struct ext4_xattr_ibody_header *)((char *)raw_inode +                \
-					    EXT4_GOOD_OLD_INODE_SIZE +         \
-					    ext4_inode_get_extra_isize(        \
-						sb, raw_inode)))
-#define EXT4_XATTR_IFIRST(hdr) ((struct ext4_xattr_entry *)((hdr) + 1))
-
-#define EXT4_XATTR_BHDR(block) ((struct ext4_xattr_header *)((block)->data))
-#define EXT4_XATTR_ENTRY(ptr) ((struct ext4_xattr_entry *)(ptr))
-#define EXT4_XATTR_BFIRST(block) EXT4_XATTR_ENTRY(EXT4_XATTR_BHDR(block) + 1)
-#define EXT4_XATTR_IS_LAST_ENTRY(entry) (*(uint32_t *)(entry) == 0)
-
-#define EXT4_ZERO_XATTR_VALUE ((void *)-1)
-
 const char *ext4_extract_xattr_name(const char *full_name, size_t full_name_len,
 				    uint8_t *name_index, size_t *name_len,
 				    bool *found);