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.

Signed-off-by: Chao Yu <[email protected]>
Signed-off-by: Jaegeuk Kim <[email protected]>

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 5e414c8ed334ee786e1e8b7deed47f0bf94c8165..3948c181997fab3f9a639077c0d28036204bc2b4 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3227,21 +3227,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)

diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h
index 41d1d71c36ff5ded5326dccb1a3a4f744b00d08a..01bee2b289c2a7f766b7f68b9a0d839bcb4cb04b 100644 (file)
--- a/include/linux/f2fs_fs.h
+++ b/include/linux/f2fs_fs.h
@@ -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)