Skip to content

Commit a539363

Browse files
chaseyuJaegeuk Kim
authored andcommitted
f2fs: delete obsolete FI_FIRST_BLOCK_WRITTEN
Commit 3c6c2be ("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 7bc155f ("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>
1 parent a6a010f commit a539363

File tree

6 files changed

+0
-40
lines changed

6 files changed

+0
-40
lines changed

fs/f2fs/compress.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,8 +1369,6 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,
13691369
add_compr_block_stat(inode, cc->valid_nr_cpages);
13701370

13711371
set_inode_flag(cc->inode, FI_APPEND_WRITE);
1372-
if (cc->cluster_idx == 0)
1373-
set_inode_flag(inode, FI_FIRST_BLOCK_WRITTEN);
13741372

13751373
f2fs_put_dnode(&dn);
13761374
if (quota_inode)

fs/f2fs/data.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2810,8 +2810,6 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio)
28102810
f2fs_outplace_write_data(&dn, fio);
28112811
trace_f2fs_do_write_data_page(page, OPU);
28122812
set_inode_flag(inode, FI_APPEND_WRITE);
2813-
if (page->index == 0)
2814-
set_inode_flag(inode, FI_FIRST_BLOCK_WRITTEN);
28152813
out_writepage:
28162814
f2fs_put_dnode(&dn);
28172815
out:

fs/f2fs/f2fs.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,6 @@ enum {
781781
FI_UPDATE_WRITE, /* inode has in-place-update data */
782782
FI_NEED_IPU, /* used for ipu per file */
783783
FI_ATOMIC_FILE, /* indicate atomic file */
784-
FI_FIRST_BLOCK_WRITTEN, /* indicate #0 data block was written */
785784
FI_DROP_CACHE, /* drop dirty page cache */
786785
FI_DATA_EXIST, /* indicate data exists */
787786
FI_INLINE_DOTS, /* indicate inline dot dentries */
@@ -3279,11 +3278,6 @@ static inline bool f2fs_is_cow_file(struct inode *inode)
32793278
return is_inode_flag_set(inode, FI_COW_FILE);
32803279
}
32813280

3282-
static inline bool f2fs_is_first_block_written(struct inode *inode)
3283-
{
3284-
return is_inode_flag_set(inode, FI_FIRST_BLOCK_WRITTEN);
3285-
}
3286-
32873281
static inline bool f2fs_is_drop_cache(struct inode *inode)
32883282
{
32893283
return is_inode_flag_set(inode, FI_DROP_CACHE);

fs/f2fs/file.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -599,9 +599,6 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count)
599599
valid_blocks++;
600600
}
601601

602-
if (dn->ofs_in_node == 0 && IS_INODE(dn->node_page))
603-
clear_inode_flag(dn->inode, FI_FIRST_BLOCK_WRITTEN);
604-
605602
f2fs_invalidate_blocks(sbi, blkaddr);
606603

607604
if (!released || blkaddr != COMPRESS_ADDR)

fs/f2fs/gc.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,8 +1405,6 @@ static int move_data_block(struct inode *inode, block_t bidx,
14051405

14061406
f2fs_update_data_blkaddr(&dn, newaddr);
14071407
set_inode_flag(inode, FI_APPEND_WRITE);
1408-
if (page->index == 0)
1409-
set_inode_flag(inode, FI_FIRST_BLOCK_WRITTEN);
14101408
put_page_out:
14111409
f2fs_put_page(fio.encrypted_page, 1);
14121410
recover_block:

fs/f2fs/inode.c

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,6 @@ static void __get_inode_rdev(struct inode *inode, struct f2fs_inode *ri)
7676
}
7777
}
7878

79-
static int __written_first_block(struct f2fs_sb_info *sbi,
80-
struct f2fs_inode *ri)
81-
{
82-
block_t addr = le32_to_cpu(ri->i_addr[offset_in_addr(ri)]);
83-
84-
if (!__is_valid_data_blkaddr(addr))
85-
return 1;
86-
if (!f2fs_is_valid_blkaddr(sbi, addr, DATA_GENERIC_ENHANCE)) {
87-
f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);
88-
return -EFSCORRUPTED;
89-
}
90-
return 0;
91-
}
92-
9379
static void __set_inode_rdev(struct inode *inode, struct f2fs_inode *ri)
9480
{
9581
int extra_size = get_extra_isize(inode);
@@ -398,7 +384,6 @@ static int do_read_inode(struct inode *inode)
398384
struct page *node_page;
399385
struct f2fs_inode *ri;
400386
projid_t i_projid;
401-
int err;
402387

403388
/* Check if ino is within scope */
404389
if (f2fs_check_nid_range(sbi, inode->i_ino))
@@ -480,16 +465,6 @@ static int do_read_inode(struct inode *inode)
480465
/* get rdev by using inline_info */
481466
__get_inode_rdev(inode, ri);
482467

483-
if (S_ISREG(inode->i_mode)) {
484-
err = __written_first_block(sbi, ri);
485-
if (err < 0) {
486-
f2fs_put_page(node_page, 1);
487-
return err;
488-
}
489-
if (!err)
490-
set_inode_flag(inode, FI_FIRST_BLOCK_WRITTEN);
491-
}
492-
493468
if (!f2fs_need_inode_block_update(sbi, inode->i_ino))
494469
fi->last_disk_size = inode->i_size;
495470

0 commit comments

Comments
 (0)