Skip to content

Commit

Permalink
f2fs: Optimize f2fs_truncate_data_blocks_range()
Browse files Browse the repository at this point in the history
Function f2fs_invalidate_blocks() can process consecutive
blocks at a time, so f2fs_truncate_data_blocks_range() is
optimized to use the new functionality of
f2fs_invalidate_blocks().

Add two variables @blkstart and @blklen, @blkstart records
the first address of the consecutive blocks, and @blkstart
records the number of consecutive blocks.

Signed-off-by: Yi Sun <[email protected]>
Signed-off-by: Jaegeuk Kim <[email protected]>
  • Loading branch information
Yi Sun authored and Jaegeuk Kim committed Jan 16, 2025
1 parent 20befbe commit 8fa3718
Showing 1 changed file with 25 additions and 4 deletions.
29 changes: 25 additions & 4 deletions fs/f2fs/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -621,8 +621,11 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count)
int cluster_index = 0, valid_blocks = 0;
int cluster_size = F2FS_I(dn->inode)->i_cluster_size;
bool released = !atomic_read(&F2FS_I(dn->inode)->i_compr_blocks);
block_t blkstart;
int blklen = 0;

addr = get_dnode_addr(dn->inode, dn->node_page) + ofs;
blkstart = le32_to_cpu(*addr);

/* Assumption: truncation starts with cluster */
for (; count > 0; count--, addr++, dn->ofs_in_node++, cluster_index++) {
Expand All @@ -638,26 +641,44 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count)
}

if (blkaddr == NULL_ADDR)
continue;
goto next;

f2fs_set_data_blkaddr(dn, NULL_ADDR);

if (__is_valid_data_blkaddr(blkaddr)) {
if (time_to_inject(sbi, FAULT_BLKADDR_CONSISTENCE))
continue;
goto next;
if (!f2fs_is_valid_blkaddr_raw(sbi, blkaddr,
DATA_GENERIC_ENHANCE))
continue;
goto next;
if (compressed_cluster)
valid_blocks++;
}

f2fs_invalidate_blocks(sbi, blkaddr, 1);
if (blkstart + blklen == blkaddr) {
blklen++;
} else {
f2fs_invalidate_blocks(sbi, blkstart, blklen);
blkstart = blkaddr;
blklen = 1;
}

if (!released || blkaddr != COMPRESS_ADDR)
nr_free++;

continue;

next:
if (blklen)
f2fs_invalidate_blocks(sbi, blkstart, blklen);

blkstart = le32_to_cpu(*(addr + 1));
blklen = 0;
}

if (blklen)
f2fs_invalidate_blocks(sbi, blkstart, blklen);

if (compressed_cluster)
f2fs_i_compr_blocks_update(dn->inode, valid_blocks, false);

Expand Down

0 comments on commit 8fa3718

Please sign in to comment.