f2fs: delete obsolete FI_FIRST_BLOCK_WRITTEN

[ Upstream commit a53936361330e4c55c0654605178281387d9c761 ]

Commit 3c6c2bebef79 ("f2fs: avoid punch_hole overhead when releasing
volatile data") introduced FI_FIRST_BLOCK_WRITTEN as below reason:

This patch is to avoid some punch_hole overhead when releasing volatile
data. If volatile data was not written yet, we just can make the first
page as zero.

After commit 7bc155fec5b3 ("f2fs: kill volatile write support"), we
won't support volatile write, but it missed to remove obsolete
FI_FIRST_BLOCK_WRITTEN, delete it in this patch.

Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Stable-dep-of: 54607494875e ("f2fs: compress: fix to avoid inconsistence bewteen i_blocks and dnode")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c
index 100353355213de4b62d1faa75e5fe4f009aa4809..8093d2f2a174f22d25e8e54b9429d12ff724d32d 100644 (file)
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@ -1364,8 +1364,6 @@ unlock_continue:
        add_compr_block_stat(inode, cc->valid_nr_cpages);
 
        set_inode_flag(cc->inode, FI_APPEND_WRITE);
-       if (cc->cluster_idx == 0)
-               set_inode_flag(inode, FI_FIRST_BLOCK_WRITTEN);
 
        f2fs_put_dnode(&dn);
        if (quota_inode)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 6f673fc44bdbcfc7f8027a46941d6072411ca86e..fee4c7130edaa19646761654f4107381f21646c3 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -2809,8 +2809,6 @@ got_it:
        f2fs_outplace_write_data(&dn, fio);
        trace_f2fs_do_write_data_page(page, OPU);
        set_inode_flag(inode, FI_APPEND_WRITE);
-       if (page->index == 0)
-               set_inode_flag(inode, FI_FIRST_BLOCK_WRITTEN);
 out_writepage:
        f2fs_put_dnode(&dn);
 out:

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index e4d2ac1f79c5975f7f5eadd7c189d38c2507899c..7acbc78b864b4648358b462eb781a39b7a6b7cbf 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -774,7 +774,6 @@ enum {
        FI_UPDATE_WRITE,        /* inode has in-place-update data */
        FI_NEED_IPU,            /* used for ipu per file */
        FI_ATOMIC_FILE,         /* indicate atomic file */
-       FI_FIRST_BLOCK_WRITTEN, /* indicate #0 data block was written */
        FI_DROP_CACHE,          /* drop dirty page cache */
        FI_DATA_EXIST,          /* indicate data exists */
        FI_INLINE_DOTS,         /* indicate inline dot dentries */
@@ -3272,11 +3271,6 @@ static inline bool f2fs_is_cow_file(struct inode *inode)
        return is_inode_flag_set(inode, FI_COW_FILE);
 }
 
-static inline bool f2fs_is_first_block_written(struct inode *inode)
-{
-       return is_inode_flag_set(inode, FI_FIRST_BLOCK_WRITTEN);
-}
-
 static inline bool f2fs_is_drop_cache(struct inode *inode)
 {
        return is_inode_flag_set(inode, FI_DROP_CACHE);

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 436a59d33c923a06eb297b86f9280fb1835b9342..c5ccdd3e58666a717dcbeb0180375f195a0ec1c9 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -599,9 +599,6 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count)
                                valid_blocks++;
                }
 
-               if (dn->ofs_in_node == 0 && IS_INODE(dn->node_page))
-                       clear_inode_flag(dn->inode, FI_FIRST_BLOCK_WRITTEN);
-
                f2fs_invalidate_blocks(sbi, blkaddr);
 
                if (!released || blkaddr != COMPRESS_ADDR)

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index f550cdeaa663845c61194f0c7e4be85304b62000..2fbe16ad726f457dee71e7d1b5d67893d04aa884 100644 (file)
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -1405,8 +1405,6 @@ static int move_data_block(struct inode *inode, block_t bidx,
 
        f2fs_update_data_blkaddr(&dn, newaddr);
        set_inode_flag(inode, FI_APPEND_WRITE);
-       if (page->index == 0)
-               set_inode_flag(inode, FI_FIRST_BLOCK_WRITTEN);
 put_page_out:
        f2fs_put_page(fio.encrypted_page, 1);
 recover_block:

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index cde243840abd19b1efc576cfaa34911d2f60e328..8d8e90152ca873d077050ef2548b5d5322974874 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -76,20 +76,6 @@ static void __get_inode_rdev(struct inode *inode, struct f2fs_inode *ri)
        }
 }
 
-static int __written_first_block(struct f2fs_sb_info *sbi,
-                                       struct f2fs_inode *ri)
-{
-       block_t addr = le32_to_cpu(ri->i_addr[offset_in_addr(ri)]);
-
-       if (!__is_valid_data_blkaddr(addr))
-               return 1;
-       if (!f2fs_is_valid_blkaddr(sbi, addr, DATA_GENERIC_ENHANCE)) {
-               f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);
-               return -EFSCORRUPTED;
-       }
-       return 0;
-}
-
 static void __set_inode_rdev(struct inode *inode, struct f2fs_inode *ri)
 {
        int extra_size = get_extra_isize(inode);
@@ -398,7 +384,6 @@ static int do_read_inode(struct inode *inode)
        struct page *node_page;
        struct f2fs_inode *ri;
        projid_t i_projid;
-       int err;
 
        /* Check if ino is within scope */
        if (f2fs_check_nid_range(sbi, inode->i_ino))
@@ -480,16 +465,6 @@ static int do_read_inode(struct inode *inode)
        /* get rdev by using inline_info */
        __get_inode_rdev(inode, ri);
 
-       if (S_ISREG(inode->i_mode)) {
-               err = __written_first_block(sbi, ri);
-               if (err < 0) {
-                       f2fs_put_page(node_page, 1);
-                       return err;
-               }
-               if (!err)
-                       set_inode_flag(inode, FI_FIRST_BLOCK_WRITTEN);
-       }
-
        if (!f2fs_need_inode_block_update(sbi, inode->i_ino))
                fi->last_disk_size = inode->i_size;