X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lwext4%2Fext4_fs.h;h=17019e5dd97054cc0d97efa3a524eea918069a08;hb=915c70b309ba95c4a798f9fc7234a8b843e6c90f;hp=d05b962e755b840ccb87dca3200dd3b2427a3453;hpb=0697bc2f9ff85fa341dc597495413b2160636d59;p=lwext4.git

diff --git a/lwext4/ext4_fs.h b/lwext4/ext4_fs.h
index d05b962..17019e5 100644
--- a/lwext4/ext4_fs.h
+++ b/lwext4/ext4_fs.h
@@ -42,6 +42,10 @@
 #ifndef EXT4_FS_H_
 #define EXT4_FS_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "ext4_config.h"
 #include "ext4_types.h"
 
@@ -53,10 +57,9 @@
  * @param baddr Block number to convert
  * @return Relative number of block
  */
-static inline uint32_t ext4_fs_baddr2_index_in_group(struct ext4_sblock *s,
-						     uint32_t baddr)
+static inline uint32_t ext4_fs_addr_to_idx_bg(struct ext4_sblock *s,
+						     ext4_fsblk_t baddr)
 {
-	ext4_assert(baddr);
 	if (ext4_get32(s, first_data_block))
 		baddr--;
 
@@ -69,7 +72,7 @@ static inline uint32_t ext4_fs_baddr2_index_in_group(struct ext4_sblock *s,
  * @param bgid Block group
  * @return Absolute block address
  */
-static inline uint32_t ext4_fs_index_in_group2_baddr(struct ext4_sblock *s,
+static inline ext4_fsblk_t ext4_fs_bg_idx_to_addr(struct ext4_sblock *s,
 						     uint32_t index,
 						     uint32_t bgid)
 {
@@ -80,7 +83,7 @@ static inline uint32_t ext4_fs_index_in_group2_baddr(struct ext4_sblock *s,
 }
 
 /**@brief TODO: */
-static inline uint64_t ext4_fs_first_bg_block_no(struct ext4_sblock *s,
+static inline ext4_fsblk_t ext4_fs_first_bg_block_no(struct ext4_sblock *s,
 						 uint32_t bgid)
 {
 	return (uint64_t)bgid * ext4_get32(s, blocks_per_group) +
@@ -146,6 +149,12 @@ void ext4_fs_inode_blocks_init(struct ext4_fs *fs, struct ext4_inode_ref *inode_
  */
 int ext4_fs_put_inode_ref(struct ext4_inode_ref *ref);
 
+/**@brief Convert filetype to inode mode.
+ * @param filetype
+ * @return inode mode
+ */
+uint32_t ext4_fs_correspond_inode_mode(int filetype);
+
 /**@brief Allocate new i-node in the filesystem.
  * @param fs        Filesystem to allocated i-node on
  * @param inode_ref Output pointer to return reference to allocated i-node
@@ -168,32 +177,41 @@ int ext4_fs_free_inode(struct ext4_inode_ref *inode_ref);
  */
 int ext4_fs_truncate_inode(struct ext4_inode_ref *inode_ref, uint64_t new_size);
 
+/**@brief Compute 'goal' for inode index
+ * @param inode_ref Reference to inode, to allocate block for
+ * @return goal
+ */
+ext4_fsblk_t ext4_fs_inode_to_goal_block(struct ext4_inode_ref *inode_ref);
+
+/**@brief Compute 'goal' for allocation algorithm (For blockmap).
+ * @param inode_ref Reference to inode, to allocate block for
+ * @param goal
+ * @return error code
+ */
+int ext4_fs_indirect_find_goal(struct ext4_inode_ref *inode_ref,
+				ext4_fsblk_t *goal);
+
 /**@brief Get physical block address by logical index of the block.
  * @param inode_ref I-node to read block address from
- * @param iblock    Logical index of block
- * @param fblock    Output pointer for return physical block address
+ * @param iblock            Logical index of block
+ * @param fblock            Output pointer for return physical
+ *                          block address
+ * @param support_unwritten Indicate whether unwritten block range
+ *                          is supported under the current context
  * @return Error code
  */
 int ext4_fs_get_inode_data_block_index(struct ext4_inode_ref *inode_ref,
-				       uint64_t iblock, uint32_t *fblock);
+				       uint64_t iblock, ext4_fsblk_t *fblock,
+				       bool support_unwritten);
 
-/**@brief Set physical block address for the block logical address into the
- * i-node.
- * @param inode_ref I-node to set block address to
+/**@brief Initialize a part of unwritten range of the inode.
+ * @param inode_ref I-node to proceed on.
  * @param iblock    Logical index of block
- * @param fblock    Physical block address
- * @return Error code
- */
-int ext4_fs_set_inode_data_block_index(struct ext4_inode_ref *inode_ref,
-				       uint64_t iblock, uint32_t fblock);
-
-/**@brief Release data block from i-node
- * @param inode_ref I-node to release block from
- * @param iblock    Logical block to be released
+ * @param fblock    Output pointer for return physical block address
  * @return Error code
  */
-int ext4_fs_release_inode_block(struct ext4_inode_ref *inode_ref,
-				uint32_t iblock);
+int ext4_fs_init_inode_data_block_index(struct ext4_inode_ref *inode_ref,
+				       uint64_t iblock, ext4_fsblk_t *fblock);
 
 /**@brief Append following logical block to the i-node.
  * @param inode_ref I-node to append block to
@@ -202,7 +220,7 @@ int ext4_fs_release_inode_block(struct ext4_inode_ref *inode_ref,
  * @return Error code
  */
 int ext4_fs_append_inode_block(struct ext4_inode_ref *inode_ref,
-			       uint32_t *fblock, uint32_t *iblock);
+			       ext4_fsblk_t *fblock, uint32_t *iblock);
 
 /**@brief   Increment inode link count.
  * @param   inode none handle
@@ -214,6 +232,10 @@ void ext4_fs_inode_links_count_inc(struct ext4_inode_ref *inode_ref);
  */
 void ext4_fs_inode_links_count_dec(struct ext4_inode_ref *inode_ref);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* EXT4_FS_H_ */
 
 /**