X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=lwext4%2Fext4_fs.h;h=97e1d1d5408bd1e44de887ae9f9fea32548cb5cd;hb=dba02ea68719d50d0fd45d4edf2eac5f81c83fd6;hp=4836640284bff7e6e5b0fc94a9093904a5e91372;hpb=39cfadf99cd75b56c4ee677098960623b5eccce3;p=lwext4.git

diff --git a/lwext4/ext4_fs.h b/lwext4/ext4_fs.h
index 4836640..97e1d1d 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,7 +57,7 @@
  * @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,
+static inline uint32_t ext4_fs_addr_to_idx_bg(struct ext4_sblock *s,
 						     ext4_fsblk_t baddr)
 {
 	if (ext4_get32(s, first_data_block))
@@ -68,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 ext4_fsblk_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)
 {
@@ -137,7 +141,8 @@ int ext4_fs_get_inode_ref(struct ext4_fs *fs, uint32_t index,
  * @param fs        Filesystem to reset blocks field of i-inode on
  * @param inode_ref ref Pointer for inode to be operated on
  */
-void ext4_fs_inode_blocks_init(struct ext4_fs *fs, struct ext4_inode_ref *inode_ref);
+void ext4_fs_inode_blocks_init(struct ext4_fs *fs,
+			       struct ext4_inode_ref *inode_ref);
 
 /**@brief Put reference to i-node.
  * @param ref Pointer for reference to be put back
@@ -145,6 +150,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
@@ -183,12 +194,16 @@ int ext4_fs_indirect_find_goal(struct ext4_inode_ref *inode_ref,
 
 /**@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, ext4_fsblk_t *fblock);
+int ext4_fs_get_inode_dblk_idx(struct ext4_inode_ref *inode_ref,
+				 uint64_t iblock, ext4_fsblk_t *fblock,
+				 bool support_unwritten);
 
 /**@brief Initialize a part of unwritten range of the inode.
  * @param inode_ref I-node to proceed on.
@@ -196,26 +211,8 @@ int ext4_fs_get_inode_data_block_index(struct ext4_inode_ref *inode_ref,
  * @param fblock    Output pointer for return physical block address
  * @return Error code
  */
-int ext4_fs_init_inode_data_block_index(struct ext4_inode_ref *inode_ref,
-				       uint64_t iblock, ext4_fsblk_t *fblock);
-
-/**@brief Set physical block address for the block logical address into the
- * i-node.
- * @param inode_ref I-node to set block address to
- * @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, ext4_fsblk_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
- * @return Error code
- */
-int ext4_fs_release_inode_block(struct ext4_inode_ref *inode_ref,
-				uint32_t iblock);
+int ext4_fs_init_inode_dblk_idx(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
@@ -223,8 +220,8 @@ int ext4_fs_release_inode_block(struct ext4_inode_ref *inode_ref,
  * @param iblock    Output logical number of newly allocated block
  * @return Error code
  */
-int ext4_fs_append_inode_block(struct ext4_inode_ref *inode_ref,
-			       ext4_fsblk_t *fblock, uint32_t *iblock);
+int ext4_fs_append_inode_dblk(struct ext4_inode_ref *inode_ref,
+			      ext4_fsblk_t *fblock, uint32_t *iblock);
 
 /**@brief   Increment inode link count.
  * @param   inode none handle
@@ -236,6 +233,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_ */
 
 /**