f2fs: clean up with is_valid_blkaddr()

BugLink: https://bugs.launchpad.net/bugs/1836968
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>
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index d07a8c678787301060dd0d53f65458cf61d845c0..630e527bfdf65c39e1729142a3c8745a0013a5b4 100644 (file)
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -119,7 +119,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:
@@ -175,7 +175,7 @@ int ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages,
        blk_start_plug(&plug);
        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 2aa32566f69de05a855aa48c90078b90c8607118..8ba7d04eb20023758b6696dabdc736d89615aad2 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -414,7 +414,7 @@ next:
                spin_unlock(&io->io_lock);
        }
 
-       if (fio->old_blkaddr != NEW_ADDR)
+       if (is_valid_blkaddr(fio->old_blkaddr))
                verify_block_addr(fio, fio->old_blkaddr);
        verify_block_addr(fio, fio->new_blkaddr);
 
@@ -951,7 +951,7 @@ next_dnode:
 next_block:
        blkaddr = datablock_addr(dn.inode, dn.node_page, dn.ofs_in_node);
 
-       if (blkaddr == NEW_ADDR || blkaddr == NULL_ADDR) {
+       if (!is_valid_blkaddr(blkaddr)) {
                if (create) {
                        if (unlikely(f2fs_cp_error(sbi))) {
                                err = -EIO;
@@ -1394,15 +1394,6 @@ static inline bool need_inplace_update(struct f2fs_io_info *fio)
        return need_inplace_update_policy(inode, fio);
 }
 
-static inline bool valid_ipu_blkaddr(struct f2fs_io_info *fio)
-{
-       if (fio->old_blkaddr == NEW_ADDR)
-               return false;
-       if (fio->old_blkaddr == NULL_ADDR)
-               return false;
-       return true;
-}
-
 int do_write_data_page(struct f2fs_io_info *fio)
 {
        struct page *page = fio->page;
@@ -1417,7 +1408,7 @@ int do_write_data_page(struct f2fs_io_info *fio)
                        f2fs_lookup_extent_cache(inode, page->index, &ei)) {
                fio->old_blkaddr = ei.blk + page->index - ei.fofs;
 
-               if (valid_ipu_blkaddr(fio)) {
+               if (is_valid_blkaddr(fio->old_blkaddr)) {
                        ipu_force = true;
                        fio->need_lock = LOCK_DONE;
                        goto got_it;
@@ -1444,7 +1435,8 @@ got_it:
         * If current allocation needs SSR,
         * it had better in-place writes for updated data.
         */
-       if (ipu_force || (valid_ipu_blkaddr(fio) && need_inplace_update(fio))) {
+       if (ipu_force || (is_valid_blkaddr(fio->old_blkaddr) &&
+                                       need_inplace_update(fio))) {
                err = encrypt_one_page(fio);
                if (err)
                        goto out_writepage;

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index af773f79154435a3924c994935404c19a93b0041..d25f652ecfddcb1d825343518eb70c497955a027 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -2465,6 +2465,13 @@ static inline void f2fs_update_iostat(struct f2fs_sb_info *sbi,
        spin_unlock(&sbi->iostat_lock);
 }
 
+static inline bool is_valid_blkaddr(block_t blkaddr)
+{
+       if (blkaddr == NEW_ADDR || blkaddr == NULL_ADDR)
+               return false;
+       return true;
+}
+
 /*
  * file.c
  */
@@ -2678,7 +2685,7 @@ void f2fs_stop_checkpoint(struct f2fs_sb_info *sbi, bool end_io);
 struct page *grab_meta_page(struct f2fs_sb_info *sbi, pgoff_t index);
 struct page *get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index);
 struct page *get_tmp_page(struct f2fs_sb_info *sbi, pgoff_t index);
-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);
 int ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages,
                        int type, bool sync);
 void ra_meta_pages_cond(struct f2fs_sb_info *sbi, pgoff_t index);

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index cf873376a7037a7690e5bd7d7def92fa3c4aea13..70524e74990a78bee4b4aca9283cc600173145c8 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -348,7 +348,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 6ed22ebd9344cf68e5f517abc094eb9a9fa418bd..d3901dc6eafbacafe61ddc7bf45617847018808e 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -69,7 +69,7 @@ static bool __written_first_block(struct f2fs_inode *ri)
 {
        block_t addr = le32_to_cpu(ri->i_addr[offset_in_addr(ri)]);
 
-       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 4d42b2f73784cb0c7ee485873cc2280d20a43232..235fd91544b13637ad6e95454821cd1e5d06fd80 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -360,8 +360,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 */
@@ -372,7 +371,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 01ea70f86b56e045af46cda4409093d38ef61f5b..ba466b16ededbb818b229c72c5b2402f3a1493a5 100644 (file)
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -236,7 +236,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);
@@ -479,7 +479,7 @@ retry_dn:
                }
 
                /* 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);
@@ -540,7 +540,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 ca036ab9fa6288bf9066f683fc672be2f227d675..abc0c0a0a2aea157dea664f7229ed4d6834c36d8 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1935,7 +1935,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;
 
        down_read(&sit_i->sentry_lock);
@@ -2834,7 +2834,7 @@ void f2fs_wait_on_block_writeback(struct f2fs_sb_info *sbi, block_t blkaddr)
 {
        struct page *cpage;
 
-       if (blkaddr == NEW_ADDR || blkaddr == NULL_ADDR)
+       if (!is_valid_blkaddr(blkaddr))
                return;
 
        cpage = find_lock_page(META_MAPPING(sbi), blkaddr);

diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index eab89fc4190c63ffd59b92092c9325429b290a60..521b7a90bad04679f2ec581181f6fda51a19030a 100644 (file)
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -85,7 +85,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 BLKS_PER_SEC(sbi)                                      \