Re: [PATCH 3/3] f2fs: clean up data_blkaddr() and get_dnode_addr()

[Jaegeuk Kim]

On 06/25, Chao Yu wrote:
> Introudce a new help get_dnode_base() to wrap common code from
> get_dnode_addr() and data_blkaddr() for cleanup.
> 
> Signed-off-by: Chao Yu <chao@xxxxxxxxxx>
> ---
>  fs/f2fs/f2fs.h | 46 +++++++++++++++++++---------------------------
>  1 file changed, 19 insertions(+), 27 deletions(-)
> 
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index 1f78a39fe7f4..eacf0b0e6b2e 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -2905,26 +2905,31 @@ static inline __le32 *blkaddr_in_node(struct f2fs_node *node)
>  }
>  
>  static inline int f2fs_has_extra_attr(struct inode *inode);
> -static inline block_t data_blkaddr(struct inode *inode,
> -			struct page *node_page, unsigned int offset)
> +static inline int get_extra_isize(struct inode *inode);

It seems get_extra_isize was already declared above?

> +static inline unsigned int get_dnode_base(struct inode *inode,
> +					struct page *node_page)
>  {
> -	struct f2fs_node *raw_node;
> -	__le32 *addr_array;
> -	int base = 0;
> -	bool is_inode = IS_INODE(node_page);
> -
> -	raw_node = F2FS_NODE(node_page);
> -
> -	if (is_inode) {
> +	if (IS_INODE(node_page)) {
>  		if (!inode)
>  			/* from GC path only */
> -			base = offset_in_addr(&raw_node->i);
> +			return offset_in_addr(&F2FS_NODE(node_page)->i);
>  		else if (f2fs_has_extra_attr(inode))
> -			base = get_extra_isize(inode);
> +			return get_extra_isize(inode);

	if (!IS_INODE(node_page))
		return 0;

	return inode ? get_extra_isize(inode) :
		offset_in_addr();

>  	}
> +	return 0;
> +}
>  
> -	addr_array = blkaddr_in_node(raw_node);
> -	return le32_to_cpu(addr_array[base + offset]);
> +static inline __le32 *get_dnode_addr(struct inode *inode,
> +					struct page *node_page)
> +{
> +	return blkaddr_in_node(F2FS_NODE(node_page)) +
> +			get_dnode_base(inode, node_page);
> +}
> +
> +static inline block_t data_blkaddr(struct inode *inode,
> +			struct page *node_page, unsigned int offset)
> +{
> +	return le32_to_cpu(*(get_dnode_addr(inode, node_page) + offset));
>  }
>  
>  static inline block_t f2fs_data_blkaddr(struct dnode_of_data *dn)
> @@ -3297,8 +3302,6 @@ static inline bool f2fs_is_cow_file(struct inode *inode)
>  	return is_inode_flag_set(inode, FI_COW_FILE);
>  }
>  
> -static inline __le32 *get_dnode_addr(struct inode *inode,
> -					struct page *node_page);
>  static inline void *inline_data_addr(struct inode *inode, struct page *page)
>  {
>  	__le32 *addr = get_dnode_addr(inode, page);
> @@ -3437,17 +3440,6 @@ static inline int get_inline_xattr_addrs(struct inode *inode)
>  	return F2FS_I(inode)->i_inline_xattr_size;
>  }
>  
> -static inline __le32 *get_dnode_addr(struct inode *inode,
> -					struct page *node_page)
> -{
> -	int base = 0;
> -
> -	if (IS_INODE(node_page) && f2fs_has_extra_attr(inode))
> -		base = get_extra_isize(inode);
> -
> -	return blkaddr_in_node(F2FS_NODE(node_page)) + base;
> -}
> -
>  #define f2fs_get_inode_mode(i) \
>  	((is_inode_flag_set(i, FI_ACL_MODE)) ? \
>  	 (F2FS_I(i)->i_acl_mode) : ((i)->i_mode))
> -- 
> 2.40.1