Fix style/indentaton in ext4_inode

3 files changed, 18 insertions, 22 deletions

diff --git a/lwext4/ext4_fs.c b/lwext4/ext4_fs.c
index 934df4d..70d97ca 100644
--- a/lwext4/ext4_fs.c
+++ b/lwext4/ext4_fs.c
@@ -652,8 +652,8 @@ static uint32_t ext4_fs_inode_checksum(struct ext4_inode_ref *inode_ref)
 			to_le32(ext4_inode_get_generation(inode_ref->inode));
 
 		/* Preparation: temporarily set bg checksum to 0 */
-		orig_checksum = ext4_inode_get_checksum(sb, inode_ref->inode);
-		ext4_inode_set_checksum(sb, inode_ref->inode, 0);
+		orig_checksum = ext4_inode_get_csum(sb, inode_ref->inode);
+		ext4_inode_set_csum(sb, inode_ref->inode, 0);
 
 		/* First calculate crc32 checksum against fs uuid */
 		checksum = ext4_crc32c(EXT4_CRC32_INIT, sb->uuid,
@@ -665,7 +665,7 @@ static uint32_t ext4_fs_inode_checksum(struct ext4_inode_ref *inode_ref)
 		/* Finally calculate crc32 checksum against 
 		 * the entire inode */
 		checksum = ext4_crc32c(checksum, inode_ref->inode, inode_size);
-		ext4_inode_set_checksum(sb, inode_ref->inode, orig_checksum);
+		ext4_inode_set_csum(sb, inode_ref->inode, orig_checksum);
 
 		/* If inode size is not large enough to hold the
 		 * upper 16bit of the checksum */
@@ -686,7 +686,7 @@ static void ext4_fs_set_inode_checksum(struct ext4_inode_ref *inode_ref)
 		return;
 
 	uint32_t csum = ext4_fs_inode_checksum(inode_ref);
-	ext4_inode_set_checksum(sb, inode_ref->inode, csum);
+	ext4_inode_set_csum(sb, inode_ref->inode, csum);
 }
 
 #if CONFIG_META_CSUM_ENABLE
@@ -696,7 +696,7 @@ static bool ext4_fs_verify_inode_csum(struct ext4_inode_ref *inode_ref)
 	if (!ext4_sb_feature_ro_com(sb, EXT4_FRO_COM_METADATA_CSUM))
 		return true;
 
-	return ext4_inode_get_checksum(sb, inode_ref->inode) ==
+	return ext4_inode_get_csum(sb, inode_ref->inode) ==
 		ext4_fs_inode_checksum(inode_ref);
 }
 #else
diff --git a/lwext4/ext4_inode.c b/lwext4/ext4_inode.c
index f5df3e8..08f3bad 100644
--- a/lwext4/ext4_inode.c
+++ b/lwext4/ext4_inode.c
@@ -108,8 +108,7 @@ void ext4_inode_set_size(struct ext4_inode *inode, uint64_t size)
 	inode->size_hi = to_le32(size >> 32);
 }
 
-uint32_t
-ext4_inode_get_checksum(struct ext4_sblock *sb, struct ext4_inode *inode)
+uint32_t ext4_inode_get_csum(struct ext4_sblock *sb, struct ext4_inode *inode)
 {
 	uint16_t inode_size = ext4_get16(sb, inode_size);
 	uint32_t v = to_le16(inode->osd2.linux2.checksum_lo);
@@ -120,8 +119,7 @@ ext4_inode_get_checksum(struct ext4_sblock *sb, struct ext4_inode *inode)
 	return v;
 }
 
-void
-ext4_inode_set_checksum(struct ext4_sblock *sb, struct ext4_inode *inode,
+void ext4_inode_set_csum(struct ext4_sblock *sb, struct ext4_inode *inode,
 			uint32_t checksum)
 {
 	uint16_t inode_size = ext4_get16(sb, inode_size);
@@ -192,23 +190,22 @@ void ext4_inode_set_links_count(struct ext4_inode *inode, uint16_t cnt)
 uint64_t ext4_inode_get_blocks_count(struct ext4_sblock *sb,
 				     struct ext4_inode *inode)
 {
-	uint64_t count = to_le32(inode->blocks_count_lo);
+	uint64_t cnt = to_le32(inode->blocks_count_lo);
 
 	if (ext4_sb_feature_ro_com(sb, EXT4_FRO_COM_HUGE_FILE)) {
 
 		/* 48-bit field */
-		count |= ((uint64_t)to_le16(inode->osd2.linux2.blocks_high))
-			 << 32;
+		cnt |= (uint64_t)to_le16(inode->osd2.linux2.blocks_high) << 32;
 
 		if (ext4_inode_has_flag(inode, EXT4_INODE_FLAG_HUGE_FILE)) {
 
-			uint32_t block_bits = ext4_inode_block_bits_count(
-			    ext4_sb_get_block_size(sb));
-			return count << (block_bits - 9);
+			uint32_t block_count = ext4_sb_get_block_size(sb);
+			uint32_t b = ext4_inode_block_bits_count(block_count);
+			return cnt << (b - 9);
 		}
 	}
 
-	return count;
+	return cnt;
 }
 
 int ext4_inode_set_blocks_count(struct ext4_sblock *sb,
@@ -239,8 +236,8 @@ int ext4_inode_set_blocks_count(struct ext4_sblock *sb,
 		inode->osd2.linux2.blocks_high = to_le16(count >> 32);
 		ext4_inode_clear_flag(inode, EXT4_INODE_FLAG_HUGE_FILE);
 	} else {
-		uint32_t block_bits =
-		    ext4_inode_block_bits_count(ext4_sb_get_block_size(sb));
+		uint32_t block_count = ext4_sb_get_block_size(sb);
+		uint32_t block_bits =ext4_inode_block_bits_count(block_count);
 
 		ext4_inode_set_flag(inode, EXT4_INODE_FLAG_HUGE_FILE);
 		count = count >> (block_bits - 9);
@@ -285,8 +282,7 @@ uint64_t ext4_inode_get_file_acl(struct ext4_inode *inode,
 	uint64_t v = to_le32(inode->file_acl_lo);
 
 	if (ext4_get32(sb, creator_os) == EXT4_SUPERBLOCK_OS_LINUX)
-		v |= ((uint32_t)to_le16(inode->osd2.linux2.file_acl_high))
-		     << 16;
+		v |= (uint32_t)to_le16(inode->osd2.linux2.file_acl_high) << 16;
 
 	return v;
 }
diff --git a/lwext4/ext4_inode.h b/lwext4/ext4_inode.h
index 7e74f88..1da4b2c 100644
--- a/lwext4/ext4_inode.h
+++ b/lwext4/ext4_inode.h
@@ -297,14 +297,14 @@ void ext4_inode_set_flag(struct ext4_inode *inode, uint32_t f);
  * @param inode I-node to get checksum value from
  */
 uint32_t
-ext4_inode_get_checksum(struct ext4_sblock *sb, struct ext4_inode *inode);
+ext4_inode_get_csum(struct ext4_sblock *sb, struct ext4_inode *inode);
 
 /**@brief Get inode checksum(crc32)
  * @param sb    Superblock
  * @param inode I-node to get checksum value from
  */
 void
-ext4_inode_set_checksum(struct ext4_sblock *sb, struct ext4_inode *inode,
+ext4_inode_set_csum(struct ext4_sblock *sb, struct ext4_inode *inode,
 			uint32_t checksum);
 
 /**@brief Check if i-node can be truncated.