f2fs: clean up F2FS_I()
Chao Yu
maintainerPATCH 1/3 f2fs: clean up F2FS_I()
Use temporary variable instead of F2FS_I() for cleanup.
--- fs/f2fs/f2fs.h | 32 ++++++++++------------- fs/f2fs/file.c | 64 ++++++++++++++++++++++++---------------------- fs/f2fs/inode.c | 54 +++++++++++++++++--------------------- fs/f2fs/namei.c | 20 ++++++++------- fs/f2fs/recovery.c | 11 ++++---- 5 files changed, 88 insertions(+), 93 deletions(-)
fs/f2fs/f2fs.h +14 -18
@@ -4398,22 +4398,18 @@ static inline int set_compress_context(struct inode *inode) {#ifdef CONFIG_F2FS_FS_COMPRESSION struct f2fs_sb_info *sbi =F2FS_I_SB (inode); +struct f2fs_inode_info *fi =F2FS_I (inode); -F2FS_I (inode)->i_compress_algorithm = -F2FS_OPTION (sbi).compress_algorithm; -F2FS_I (inode)->i_log_cluster_size = -F2FS_OPTION (sbi).compress_log_size; -F2FS_I (inode)->i_compress_flag = -F2FS_OPTION (sbi).compress_chksum ? -BIT (COMPRESS_CHKSUM ) :0 ; -F2FS_I (inode)->i_cluster_size = -BIT (F2FS_I (inode)->i_log_cluster_size); -if ((F2FS_I (inode)->i_compress_algorithm ==COMPRESS_LZ4 || -F2FS_I (inode)->i_compress_algorithm ==COMPRESS_ZSTD ) && + fi->i_compress_algorithm =F2FS_OPTION (sbi).compress_algorithm; + fi->i_log_cluster_size =F2FS_OPTION (sbi).compress_log_size; + fi->i_compress_flag =F2FS_OPTION (sbi).compress_chksum ? +BIT (COMPRESS_CHKSUM ) :0 ; + fi->i_cluster_size =BIT (fi->i_log_cluster_size); +if ((fi->i_compress_algorithm ==COMPRESS_LZ4 || + fi->i_compress_algorithm ==COMPRESS_ZSTD ) &&F2FS_OPTION (sbi).compress_level) -F2FS_I (inode)->i_compress_level = -F2FS_OPTION (sbi).compress_level; -F2FS_I (inode)->i_flags |=F2FS_COMPR_FL ; + fi->i_compress_level =F2FS_OPTION (sbi).compress_level; + fi->i_flags |=F2FS_COMPR_FL ;set_inode_flag (inode,FI_COMPRESSED_FILE );stat_inc_compr_inode (inode);inc_compr_inode_stat (inode);
@@ -4428,15 +4424,15 @@ static inline bool f2fs_disable_compressed_file(struct inode *inode) {struct f2fs_inode_info *fi =F2FS_I (inode); -f2fs_down_write (&F2FS_I (inode)->i_sem); +f2fs_down_write (&fi->i_sem);if (!f2fs_compressed_file (inode)) { -f2fs_up_write (&F2FS_I (inode)->i_sem); +f2fs_up_write (&fi->i_sem);return true; }if (f2fs_is_mmap_file (inode) || (S_ISREG (inode->i_mode) &&F2FS_HAS_BLOCKS (inode))) { -f2fs_up_write (&F2FS_I (inode)->i_sem); +f2fs_up_write (&fi->i_sem);return false; }
@@ -4445,7 +4441,7 @@ static inline bool f2fs_disable_compressed_file(struct inode *inode)clear_inode_flag (inode,FI_COMPRESSED_FILE );f2fs_mark_inode_dirty_sync (inode, true); -f2fs_up_write (&F2FS_I (inode)->i_sem); +f2fs_up_write (&fi->i_sem);return true; }
fs/f2fs/file.c +34 -30
213 lines not on this page · raw message
fs/f2fs/inode.c +23 -31
96 lines not on this page · raw message
fs/f2fs/namei.c +11 -9
@@ -221,6 +221,7 @@ static struct inode *f2fs_new_inode(struct mnt_idmap *idmap, const char *name) {struct f2fs_sb_info *sbi =F2FS_I_SB (dir); +struct f2fs_inode_info *fi;nid_t ino;struct inode *inode;bool nid_free = false;
@@ -241,14 +242,15 @@ static struct inode *f2fs_new_inode(struct mnt_idmap *idmap,inode_init_owner (idmap, inode, dir, mode); + fi =F2FS_I (inode); inode->i_ino = ino; inode->i_blocks =0 ;simple_inode_init_ts (inode); -F2FS_I (inode)->i_crtime =inode_get_mtime (inode); + fi->i_crtime =inode_get_mtime (inode); inode->i_generation =get_random_u32 ();if (S_ISDIR (inode->i_mode)) -F2FS_I (inode)->i_current_depth =1 ; + fi->i_current_depth =1 ; err =insert_inode_locked (inode);if (err) {
@@ -258,9 +260,9 @@ static struct inode *f2fs_new_inode(struct mnt_idmap *idmap,if (f2fs_sb_has_project_quota (sbi) && (F2FS_I (dir)->i_flags &F2FS_PROJINHERIT_FL )) -F2FS_I (inode)->i_projid =F2FS_I (dir)->i_projid; + fi->i_projid =F2FS_I (dir)->i_projid;else -F2FS_I (inode)->i_projid =make_kprojid (&init_user_ns, + fi->i_projid =make_kprojid (&init_user_ns,F2FS_DEF_PROJID ); err =fscrypt_prepare_new_inode (dir, inode, &encrypt);
@@ -278,7 +280,7 @@ static struct inode *f2fs_new_inode(struct mnt_idmap *idmap,if (f2fs_sb_has_extra_attr (sbi)) {set_inode_flag (inode,FI_EXTRA_ATTR ); -F2FS_I (inode)->i_extra_isize =F2FS_TOTAL_EXTRA_ATTR_SIZE ; + fi->i_extra_isize =F2FS_TOTAL_EXTRA_ATTR_SIZE ; }if (test_opt (sbi,INLINE_XATTR ))
@@ -296,15 +298,15 @@ static struct inode *f2fs_new_inode(struct mnt_idmap *idmap, f2fs_has_inline_dentry(inode)) { xattr_size =DEFAULT_INLINE_XATTR_ADDRS ; } -F2FS_I (inode)->i_inline_xattr_size = xattr_size; + fi->i_inline_xattr_size = xattr_size; -F2FS_I (inode)->i_flags = + fi->i_flags =f2fs_mask_flags (mode,F2FS_I (dir)->i_flags &F2FS_FL_INHERITED );if (S_ISDIR (inode->i_mode)) -F2FS_I (inode)->i_flags |=F2FS_INDEX_FL ; + fi->i_flags |=F2FS_INDEX_FL ; -if (F2FS_I (inode)->i_flags &F2FS_PROJINHERIT_FL ) +if (fi->i_flags &F2FS_PROJINHERIT_FL )set_inode_flag (inode,FI_PROJ_INHERIT );/* Check compression first. */
fs/f2fs/recovery.c +6 -5
@@ -287,6 +287,7 @@ static void recover_inline_flags(struct inode *inode, struct f2fs_inode *ri)static int recover_inode (struct inode *inode,struct page *page) {struct f2fs_inode *raw =F2FS_INODE (page); +struct f2fs_inode_info *fi =F2FS_I (inode);char *name;int err;
@@ -309,12 +310,12 @@ static int recover_inode(struct inode *inode, struct page *page) i_projid = (projid_t )le32_to_cpu (raw->i_projid); kprojid =make_kprojid (&init_user_ns, i_projid); -if (!projid_eq (kprojid,F2FS_I (inode)->i_projid)) { +if (!projid_eq (kprojid, fi->i_projid)) { err =f2fs_transfer_project_quota (inode, kprojid);if (err)return err; -F2FS_I (inode)->i_projid = kprojid; + fi->i_projid = kprojid; } } }
@@ -327,10 +328,10 @@ static int recover_inode(struct inode *inode, struct page *page)inode_set_mtime (inode,le64_to_cpu (raw->i_mtime),le32_to_cpu (raw->i_mtime_nsec)); -F2FS_I (inode)->i_advise = raw->i_advise; -F2FS_I (inode)->i_flags =le32_to_cpu (raw->i_flags); + fi->i_advise = raw->i_advise; + fi->i_flags =le32_to_cpu (raw->i_flags);f2fs_set_inode_flags (inode); -F2FS_I (inode)->i_gc_failures =le16_to_cpu (raw->i_gc_failures); + fi->i_gc_failures =le16_to_cpu (raw->i_gc_failures);recover_inline_flags (inode, raw);
Signature · 1 line
2.40.1
Chao Yu
maintainerPATCH 2/3 f2fs: clean up addrs_per_{inode,block}()
Introduce a new help addrs_per_page() to wrap common code from addrs_per_inode() and addrs_per_block() for cleanup.
--- fs/f2fs/f2fs.h | 20 +++++++------------- include/linux/f2fs_fs.h | 7 +++---- 2 files changed, 10 insertions(+), 17 deletions(-)
fs/f2fs/f2fs.h +7 -13
@@ -3232,21 +3232,15 @@ static inline bool f2fs_need_compress_data(struct inode *inode)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) - -get_inline_xattr_addrs (inode); +unsigned int addrs = is_inode ? (CUR_ADDRS_PER_INODE (inode) - +get_inline_xattr_addrs (inode)) :DEF_ADDRS_PER_BLOCK ; -if (!f2fs_compressed_file (inode)) -return addrs; -return ALIGN_DOWN (addrs,F2FS_I (inode)->i_cluster_size); -} - -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); +if (f2fs_compressed_file (inode)) +return ALIGN_DOWN (addrs,F2FS_I (inode)->i_cluster_size); +return addrs; }static inline void *inline_xattr_addr (struct inode *inode,struct page *page)
include/linux/f2fs_fs.h +3 -4
@@ -259,15 +259,14 @@ struct node_footer {#define CUR_ADDRS_PER_INODE (inode) (DEF_ADDRS_PER_INODE - \ get_extra_isize(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 */ #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 */ #define NIDS_PER_BLOCK ((F2FS_BLKSIZE - sizeof(struct node_footer)) / sizeof(__le32)) -#define ADDRS_PER_PAGE (page, inode) \ - (IS_INODE(page) ? ADDRS_PER_INODE(inode) : ADDRS_PER_BLOCK(inode)) +#define ADDRS_PER_PAGE (page, inode) (addrs_per_page(inode, IS_INODE(page)))#define NODE_DIR1_BLOCK (DEF_ADDRS_PER_INODE + 1)#define NODE_DIR2_BLOCK (DEF_ADDRS_PER_INODE + 2)
Signature · 1 line
2.40.1
Chao Yu
maintainerPATCH 3/3 f2fs: clean up data_blkaddr() and get_dnode_addr()
In reply to Chao YuIntroudce a new help get_dnode_base() to wrap common code from get_dnode_addr() and data_blkaddr() for cleanup.
--- fs/f2fs/f2fs.h | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-)
fs/f2fs/f2fs.h +19 -27
@@ -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); +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); } +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))
Signature · 1 line
2.40.1
Jaegeuk Kim
maintainerRe: [PATCH 3/3] f2fs: clean up data_blkaddr() and get_dnode_addr()
Quoted 13 lines · Chao Yu
Introudce a new help
get_dnode_base()to wrap common code fromget_dnode_addr()anddata_blkaddr()for cleanup.Signed-off-by Chao Yu <[email protected]>--- fs/f2fs/f2fs.h | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-)fs/f2fs/f2fs.h +0
-0
fs/f2fs/f2fs.h static inline __le32 *blkaddr_in_node(struct f2fs_node *node) · line 2908
Quoted 6 lines
fs/f2fs/f2fs.h +1
-2@@ -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?
Quoted 9 lines
fs/f2fs/f2fs.h +2
-6+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);
fs/f2fs/f2fs.h static inline __le32 *blkaddr_in_node(struct f2fs_node *node) · line 2917
Quoted 10 lines
fs/f2fs/f2fs.h +3
-4- -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();
Quoted 49 lines
fs/f2fs/f2fs.h +13
-15} +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))Signature · 1 line
2.40.1
This series was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:
Hello:
This series was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
Quoted 10 lines · On Tue, 25 Jun 2024 11:16:02 +0800 you wrote:
Use temporary variable instead of
F2FS_I()for cleanup.Signed-off-by Chao Yu <[email protected]>--- fs/f2fs/f2fs.h | 32 ++++++++++------------- fs/f2fs/file.c | 64 ++++++++++++++++++++++++---------------------- fs/f2fs/inode.c | 54 +++++++++++++++++--------------------- fs/f2fs/namei.c | 20 ++++++++------- fs/f2fs/recovery.c | 11 ++++---- 5 files changed, 88 insertions(+), 93 deletions(-)
Here is the summary with links:
- [f2fs-dev,1/3] f2fs: clean up F2FS_I()
https://git.kernel.org/jaegeuk/f2fs/c/7309871c03be - [f2fs-dev,2/3] f2fs: clean up addrs_per_{inode,block}() https://git.kernel.org/jaegeuk/f2fs/c/bed6b0317441
- [f2fs-dev,3/3] f2fs: clean up data_blkaddr() and get_dnode_addr() (no matching commit)
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html