kevin/linux
1
Fork 0
Code

f2fs: clean up addrs_per_{inode,block}()

Browse Source 
Introduce a new help addrs_per_page() to wrap common code
from addrs_per_inode() and addrs_per_block() for cleanup.

Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Chao Yu 2024-06-25 11:16:03 +08:00 committed by Jaegeuk Kim
parent 7309871c03
commit bed6b03174
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/f2fs/f2fs.h
View File

@ -3227,21 +3227,15 @@ static inline bool f2fs_need_compress_data(struct inode *inode)
return false; return false;
} }
static inline unsigned int addrs_per_inode(struct inode *inode) static inline unsigned int addrs_per_page(struct inode *inode,
bool is_inode)
{ {
unsigned int addrs = CUR_ADDRS_PER_INODE(inode) - unsigned int addrs = is_inode ? (CUR_ADDRS_PER_INODE(inode) -
get_inline_xattr_addrs(inode); get_inline_xattr_addrs(inode)) : DEF_ADDRS_PER_BLOCK;
if (!f2fs_compressed_file(inode)) if (f2fs_compressed_file(inode))
return addrs; return ALIGN_DOWN(addrs, F2FS_I(inode)->i_cluster_size);
return ALIGN_DOWN(addrs, F2FS_I(inode)->i_cluster_size); return addrs;
}
static inline unsigned int addrs_per_block(struct inode *inode)
{
if (!f2fs_compressed_file(inode))
return DEF_ADDRS_PER_BLOCK;
return ALIGN_DOWN(DEF_ADDRS_PER_BLOCK, F2FS_I(inode)->i_cluster_size);
} }
static inline void *inline_xattr_addr(struct inode *inode, struct page *page) static inline void *inline_xattr_addr(struct inode *inode, struct page *page)

7
include/linux/f2fs_fs.h
View File

@ -259,15 +259,14 @@ struct node_footer {
#define CUR_ADDRS_PER_INODE(inode) (DEF_ADDRS_PER_INODE - \ #define CUR_ADDRS_PER_INODE(inode) (DEF_ADDRS_PER_INODE - \
get_extra_isize(inode)) get_extra_isize(inode))
#define DEF_NIDS_PER_INODE 5 /* Node IDs in an Inode */ #define DEF_NIDS_PER_INODE 5 /* Node IDs in an Inode */
#define ADDRS_PER_INODE(inode) addrs_per_inode(inode) #define ADDRS_PER_INODE(inode) addrs_per_page(inode, true)
/* Address Pointers in a Direct Block */ /* Address Pointers in a Direct Block */
#define DEF_ADDRS_PER_BLOCK ((F2FS_BLKSIZE - sizeof(struct node_footer)) / sizeof(__le32)) #define DEF_ADDRS_PER_BLOCK ((F2FS_BLKSIZE - sizeof(struct node_footer)) / sizeof(__le32))
#define ADDRS_PER_BLOCK(inode) addrs_per_block(inode) #define ADDRS_PER_BLOCK(inode) addrs_per_page(inode, false)
/* Node IDs in an Indirect Block */ /* Node IDs in an Indirect Block */
#define NIDS_PER_BLOCK ((F2FS_BLKSIZE - sizeof(struct node_footer)) / sizeof(__le32)) #define NIDS_PER_BLOCK ((F2FS_BLKSIZE - sizeof(struct node_footer)) / sizeof(__le32))
#define ADDRS_PER_PAGE(page, inode) \ #define ADDRS_PER_PAGE(page, inode) (addrs_per_page(inode, IS_INODE(page)))
(IS_INODE(page) ? ADDRS_PER_INODE(inode) : ADDRS_PER_BLOCK(inode))
#define NODE_DIR1_BLOCK (DEF_ADDRS_PER_INODE + 1) #define NODE_DIR1_BLOCK (DEF_ADDRS_PER_INODE + 1)
#define NODE_DIR2_BLOCK (DEF_ADDRS_PER_INODE + 2) #define NODE_DIR2_BLOCK (DEF_ADDRS_PER_INODE + 2)