shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

f2fs: update blkaddr in __set_data_blkaddr() for cleanup

Browse Source 
[ Upstream commit 59d0d4c3eae0f3dd8886ed59f89f21fa09e324f5 ]

This patch allows caller to pass blkaddr to f2fs_set_data_blkaddr()
and let __set_data_blkaddr() inside f2fs_set_data_blkaddr() to update
dn->data_blkaddr w/ last value of blkaddr.

Just cleanup, no logic changes.

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>
This commit is contained in:
Chao Yu
2023-12-10 17:20:38 +08:00
committed by Sasha Levin
parent ebe3a9f3c2
commit bba2a0ba00
3 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fs/f2fs/data.c
View File

@@ -1103,10 +1103,11 @@ static int f2fs_submit_page_read(struct inode *inode, struct page *page,
return 0; return 0;
} }
static void __set_data_blkaddr(struct dnode_of_data *dn) static void __set_data_blkaddr(struct dnode_of_data *dn, block_t blkaddr)
{ {
__le32 *addr = get_dnode_addr(dn->inode, dn->node_page); __le32 *addr = get_dnode_addr(dn->inode, dn->node_page);
dn->data_blkaddr = blkaddr;
addr[dn->ofs_in_node] = cpu_to_le32(dn->data_blkaddr); addr[dn->ofs_in_node] = cpu_to_le32(dn->data_blkaddr);
} }
@@ -1116,18 +1117,17 @@ static void __set_data_blkaddr(struct dnode_of_data *dn)
* ->node_page * ->node_page
* update block addresses in the node page * update block addresses in the node page
*/ */
void f2fs_set_data_blkaddr(struct dnode_of_data *dn) void f2fs_set_data_blkaddr(struct dnode_of_data *dn, block_t blkaddr)
{ {
f2fs_wait_on_page_writeback(dn->node_page, NODE, true, true); f2fs_wait_on_page_writeback(dn->node_page, NODE, true, true);
__set_data_blkaddr(dn); __set_data_blkaddr(dn, blkaddr);
if (set_page_dirty(dn->node_page)) if (set_page_dirty(dn->node_page))
dn->node_changed = true; dn->node_changed = true;
} }
void f2fs_update_data_blkaddr(struct dnode_of_data *dn, block_t blkaddr) void f2fs_update_data_blkaddr(struct dnode_of_data *dn, block_t blkaddr)
{ {
dn->data_blkaddr = blkaddr; f2fs_set_data_blkaddr(dn, blkaddr);
f2fs_set_data_blkaddr(dn);
f2fs_update_read_extent_cache(dn); f2fs_update_read_extent_cache(dn);
} }
@@ -1154,8 +1154,7 @@ int f2fs_reserve_new_blocks(struct dnode_of_data *dn, blkcnt_t count)
block_t blkaddr = f2fs_data_blkaddr(dn); block_t blkaddr = f2fs_data_blkaddr(dn);
if (blkaddr == NULL_ADDR) { if (blkaddr == NULL_ADDR) {
dn->data_blkaddr = NEW_ADDR; __set_data_blkaddr(dn, NEW_ADDR);
__set_data_blkaddr(dn);
count--; count--;
} }
} }

2
fs/f2fs/f2fs.h
View File

@@ -3781,7 +3781,7 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio);
struct block_device *f2fs_target_device(struct f2fs_sb_info *sbi, struct block_device *f2fs_target_device(struct f2fs_sb_info *sbi,
block_t blk_addr, sector_t *sector); block_t blk_addr, sector_t *sector);
int f2fs_target_device_index(struct f2fs_sb_info *sbi, block_t blkaddr); int f2fs_target_device_index(struct f2fs_sb_info *sbi, block_t blkaddr);
void f2fs_set_data_blkaddr(struct dnode_of_data *dn); void f2fs_set_data_blkaddr(struct dnode_of_data *dn, block_t blkaddr);
void f2fs_update_data_blkaddr(struct dnode_of_data *dn, block_t blkaddr); void f2fs_update_data_blkaddr(struct dnode_of_data *dn, block_t blkaddr);
int f2fs_reserve_new_blocks(struct dnode_of_data *dn, blkcnt_t count); int f2fs_reserve_new_blocks(struct dnode_of_data *dn, blkcnt_t count);
int f2fs_reserve_new_block(struct dnode_of_data *dn); int f2fs_reserve_new_block(struct dnode_of_data *dn);

12
fs/f2fs/file.c
View File

@@ -585,8 +585,7 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count)
if (blkaddr == NULL_ADDR) if (blkaddr == NULL_ADDR)
continue; continue;
dn->data_blkaddr = NULL_ADDR; f2fs_set_data_blkaddr(dn, NULL_ADDR);
f2fs_set_data_blkaddr(dn);
if (__is_valid_data_blkaddr(blkaddr)) { if (__is_valid_data_blkaddr(blkaddr)) {
if (!f2fs_is_valid_blkaddr(sbi, blkaddr, if (!f2fs_is_valid_blkaddr(sbi, blkaddr,
@@ -1488,8 +1487,7 @@ static int f2fs_do_zero_range(struct dnode_of_data *dn, pgoff_t start,
} }
f2fs_invalidate_blocks(sbi, dn->data_blkaddr); f2fs_invalidate_blocks(sbi, dn->data_blkaddr);
dn->data_blkaddr = NEW_ADDR; f2fs_set_data_blkaddr(dn, NEW_ADDR);
f2fs_set_data_blkaddr(dn);
} }
f2fs_update_read_extent_cache_range(dn, start, 0, index - start); f2fs_update_read_extent_cache_range(dn, start, 0, index - start);
@@ -3440,8 +3438,7 @@ static int release_compress_blocks(struct dnode_of_data *dn, pgoff_t count)
if (blkaddr != NEW_ADDR) if (blkaddr != NEW_ADDR)
continue; continue;
dn->data_blkaddr = NULL_ADDR; f2fs_set_data_blkaddr(dn, NULL_ADDR);
f2fs_set_data_blkaddr(dn);
} }
f2fs_i_compr_blocks_update(dn->inode, compr_blocks, false); f2fs_i_compr_blocks_update(dn->inode, compr_blocks, false);
@@ -3611,8 +3608,7 @@ static int reserve_compress_blocks(struct dnode_of_data *dn, pgoff_t count)
continue; continue;
} }
dn->data_blkaddr = NEW_ADDR; f2fs_set_data_blkaddr(dn, NEW_ADDR);
f2fs_set_data_blkaddr(dn);
} }
reserved = cluster_size - compr_blocks; reserved = cluster_size - compr_blocks;