f2fs: clean up with is_valid_blkaddr()

commit 7b525dd01365c6764018e374d391c92466be1b7a upstream.

- rename is_valid_blkaddr() to is_valid_meta_blkaddr() for readability.
- introduce is_valid_blkaddr() for cleanup.

No logic change in this patch.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
[bwh: Backported to 4.4:
 - Drop inapplicable change to check on f2fs_fio_info::old_blkaddr
 - Adjust context]
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 70ef49bb2803f388b12d19bdd0038a1a08e540b0..dffce82b11beb4ca310499afc4283bb3f5aec596 100644 (file)
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -107,7 +107,7 @@ struct page *get_tmp_page(struct f2fs_sb_info *sbi, pgoff_t index)
        return __get_meta_page(sbi, index, false);
 }
 
-bool is_valid_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr, int type)
+bool is_valid_meta_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr, int type)
 {
        switch (type) {
        case META_NAT:
@@ -160,7 +160,7 @@ int ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages,
 
        for (; nrpages-- > 0; blkno++) {
 
-               if (!is_valid_blkaddr(sbi, blkno, type))
+               if (!is_valid_meta_blkaddr(sbi, blkno, type))
                        goto out;
 
                switch (type) {

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index a11a49ece238d1c91c91bb1ea1e04f03a36071a6..504f0126b369fb8bb76a27e3339bc195cddeb2cc 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -604,7 +604,7 @@ static int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map,
                goto unlock_out;
        }
 
-       if (dn.data_blkaddr == NEW_ADDR || dn.data_blkaddr == NULL_ADDR) {
+       if (!is_valid_blkaddr(dn.data_blkaddr)) {
                if (create) {
                        if (unlikely(f2fs_cp_error(sbi))) {
                                err = -EIO;
@@ -1090,7 +1090,7 @@ int do_write_data_page(struct f2fs_io_info *fio)
         * If current allocation needs SSR,
         * it had better in-place writes for updated data.
         */
-       if (unlikely(fio->blk_addr != NEW_ADDR &&
+       if (unlikely(is_valid_blkaddr(fio->blk_addr) &&
                        !is_cold_data(page) &&
                        need_inplace_update(inode))) {
                rewrite_data_page(fio);

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 9cf417ef871a7ac72b60002670fc95903b889f75..851eb457fc7c809428f22a694e111d4851682a4c 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1647,6 +1647,13 @@ static inline void *f2fs_kvzalloc(size_t size, gfp_t flags)
        (pgofs - ADDRS_PER_INODE(fi) + ADDRS_PER_BLOCK) /       \
        ADDRS_PER_BLOCK * ADDRS_PER_BLOCK + ADDRS_PER_INODE(fi))
 
+static inline bool is_valid_blkaddr(block_t blkaddr)
+{
+       if (blkaddr == NEW_ADDR || blkaddr == NULL_ADDR)
+               return false;
+       return true;
+}
+
 /*
  * file.c
  */
@@ -1818,7 +1825,7 @@ void destroy_segment_manager_caches(void);
 struct page *grab_meta_page(struct f2fs_sb_info *, pgoff_t);
 struct page *get_meta_page(struct f2fs_sb_info *, pgoff_t);
 struct page *get_tmp_page(struct f2fs_sb_info *, pgoff_t);
-bool is_valid_blkaddr(struct f2fs_sb_info *, block_t, int);
+bool is_valid_meta_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr, int type);
 int ra_meta_pages(struct f2fs_sb_info *, block_t, int, int, bool);
 void ra_meta_pages_cond(struct f2fs_sb_info *, pgoff_t);
 long sync_meta_pages(struct f2fs_sb_info *, enum page_type, long);

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 01eed94b01ea6aa7f68a10edb51c393a53b70527..d4eba12d4d1742fff9e070a5a854fef688300775 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -311,7 +311,7 @@ static bool __found_offset(block_t blkaddr, pgoff_t dirty, pgoff_t pgofs,
        switch (whence) {
        case SEEK_DATA:
                if ((blkaddr == NEW_ADDR && dirty == pgofs) ||
-                       (blkaddr != NEW_ADDR && blkaddr != NULL_ADDR))
+                       is_valid_blkaddr(blkaddr))
                        return true;
                break;
        case SEEK_HOLE:

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index 5528801a5baf3a13a75ffd16c831c1d7b1a650f4..aa0ce06d143a01fb89c043b184cdc9ae9b952bb9 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -54,7 +54,7 @@ static bool __written_first_block(struct f2fs_inode *ri)
 {
        block_t addr = le32_to_cpu(ri->i_addr[0]);
 
-       if (addr != NEW_ADDR && addr != NULL_ADDR)
+       if (is_valid_blkaddr(addr))
                return true;
        return false;
 }

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 1b2bdb8168e979fc5894c4f1c1c1c9906d5aa503..75f0a7fc891b06886023944deb5083311f8c426c 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -296,8 +296,7 @@ static void set_node_addr(struct f2fs_sb_info *sbi, struct node_info *ni,
                        new_blkaddr == NULL_ADDR);
        f2fs_bug_on(sbi, nat_get_blkaddr(e) == NEW_ADDR &&
                        new_blkaddr == NEW_ADDR);
-       f2fs_bug_on(sbi, nat_get_blkaddr(e) != NEW_ADDR &&
-                       nat_get_blkaddr(e) != NULL_ADDR &&
+       f2fs_bug_on(sbi, is_valid_blkaddr(nat_get_blkaddr(e)) &&
                        new_blkaddr == NEW_ADDR);
 
        /* increment version no as node is removed */
@@ -312,7 +311,7 @@ static void set_node_addr(struct f2fs_sb_info *sbi, struct node_info *ni,
 
        /* change address */
        nat_set_blkaddr(e, new_blkaddr);
-       if (new_blkaddr == NEW_ADDR || new_blkaddr == NULL_ADDR)
+       if (!is_valid_blkaddr(new_blkaddr))
                set_nat_flag(e, IS_CHECKPOINTED, false);
        __set_nat_cache_dirty(nm_i, e);
 

diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index 9b625ca19001e904490b07c5f641c07e1545aa7a..ae0d7d0e0e288606f1d9282866c441a002700b6f 100644 (file)
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -208,7 +208,7 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head)
        while (1) {
                struct fsync_inode_entry *entry;
 
-               if (!is_valid_blkaddr(sbi, blkaddr, META_POR))
+               if (!is_valid_meta_blkaddr(sbi, blkaddr, META_POR))
                        return 0;
 
                page = get_tmp_page(sbi, blkaddr);
@@ -443,7 +443,7 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,
                }
 
                /* dest is valid block, try to recover from src to dest */
-               if (is_valid_blkaddr(sbi, dest, META_POR)) {
+               if (is_valid_meta_blkaddr(sbi, dest, META_POR)) {
 
                        if (src == NULL_ADDR) {
                                err = reserve_new_block(&dn);
@@ -494,7 +494,7 @@ static int recover_data(struct f2fs_sb_info *sbi, struct list_head *inode_list,
        while (1) {
                struct fsync_inode_entry *entry;
 
-               if (!is_valid_blkaddr(sbi, blkaddr, META_POR))
+               if (!is_valid_meta_blkaddr(sbi, blkaddr, META_POR))
                        break;
 
                ra_meta_pages_cond(sbi, blkaddr);

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index adeeff67751b0fc0c1b49f5ea2c0d9fe31ffb7c5..a09849a39074b64290a74d31166203f28ae156b3 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -752,7 +752,7 @@ bool is_checkpointed_data(struct f2fs_sb_info *sbi, block_t blkaddr)
        struct seg_entry *se;
        bool is_cp = false;
 
-       if (blkaddr == NEW_ADDR || blkaddr == NULL_ADDR)
+       if (!is_valid_blkaddr(blkaddr))
                return true;
 
        mutex_lock(&sit_i->sentry_lock);
@@ -1466,7 +1466,7 @@ void f2fs_wait_on_encrypted_page_writeback(struct f2fs_sb_info *sbi,
 {
        struct page *cpage;
 
-       if (blkaddr == NEW_ADDR)
+       if (!is_valid_blkaddr(blkaddr))
                return;
 
        f2fs_bug_on(sbi, blkaddr == NULL_ADDR);

diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index cb61716070e863143a474f9535e3718d11ee27eb..c936e1a3f04f55fdc891491b06f0ba957c226a84 100644 (file)
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -80,7 +80,7 @@
        (GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & (sbi->blocks_per_seg - 1))
 
 #define GET_SEGNO(sbi, blk_addr)                                       \
-       (((blk_addr == NULL_ADDR) || (blk_addr == NEW_ADDR)) ?          \
+       ((!is_valid_blkaddr(blk_addr)) ?                        \
        NULL_SEGNO : GET_L2R_SEGNO(FREE_I(sbi),                 \
                GET_SEGNO_FROM_SEG0(sbi, blk_addr)))
 #define GET_SECNO(sbi, segno)                                  \