f2fs: update blkaddr in __set_data_blkaddr() for cleanup

chaseyu · Jaegeuk Kim · commit 59d0d4c3eae0 · 2023-12-11T13:34:04.000-08:00
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-&gt;data_blkaddr w/ last value of blkaddr.

Just cleanup, no logic changes.

Signed-off-by: Chao Yu &lt;chao@kernel.org&gt;
Signed-off-by: Jaegeuk Kim &lt;jaegeuk@kernel.org&gt;
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
@@ -1179,10 +1179,11 @@ static int f2fs_submit_page_read(struct inode *inode, struct page *page,
 	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);
 
+	dn->data_blkaddr = blkaddr;
 	addr[dn->ofs_in_node] = cpu_to_le32(dn->data_blkaddr);
 }
 
@@ -1192,18 +1193,17 @@ static void __set_data_blkaddr(struct dnode_of_data *dn)
  *  ->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);
-	__set_data_blkaddr(dn);
+	__set_data_blkaddr(dn, blkaddr);
 	if (set_page_dirty(dn->node_page))
 		dn->node_changed = true;
 }
 
 void f2fs_update_data_blkaddr(struct dnode_of_data *dn, block_t blkaddr)
 {
-	dn->data_blkaddr = blkaddr;
-	f2fs_set_data_blkaddr(dn);
+	f2fs_set_data_blkaddr(dn, blkaddr);
 	f2fs_update_read_extent_cache(dn);
 }
 
@@ -1230,8 +1230,7 @@ int f2fs_reserve_new_blocks(struct dnode_of_data *dn, blkcnt_t count)
 		block_t blkaddr = f2fs_data_blkaddr(dn);
 
 		if (blkaddr == NULL_ADDR) {
-			dn->data_blkaddr = NEW_ADDR;
-			__set_data_blkaddr(dn);
+			__set_data_blkaddr(dn, NEW_ADDR);
 			count--;
 		}
 	}
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
@@ -3822,7 +3822,7 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio);
 struct block_device *f2fs_target_device(struct f2fs_sb_info *sbi,
 		block_t blk_addr, sector_t *sector);
 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);
 int f2fs_reserve_new_blocks(struct dnode_of_data *dn, blkcnt_t count);
 int f2fs_reserve_new_block(struct dnode_of_data *dn);
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
@@ -582,8 +582,7 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count)
 		if (blkaddr == NULL_ADDR)
 			continue;
 
-		dn->data_blkaddr = NULL_ADDR;
-		f2fs_set_data_blkaddr(dn);
+		f2fs_set_data_blkaddr(dn, NULL_ADDR);
 
 		if (__is_valid_data_blkaddr(blkaddr)) {
 			if (!f2fs_is_valid_blkaddr(sbi, blkaddr,
@@ -1478,8 +1477,7 @@ static int f2fs_do_zero_range(struct dnode_of_data *dn, pgoff_t start,
 		}
 
 		f2fs_invalidate_blocks(sbi, dn->data_blkaddr);
-		dn->data_blkaddr = NEW_ADDR;
-		f2fs_set_data_blkaddr(dn);
+		f2fs_set_data_blkaddr(dn, NEW_ADDR);
 	}
 
 	f2fs_update_read_extent_cache_range(dn, start, 0, index - start);
@@ -3454,8 +3452,7 @@ static int release_compress_blocks(struct dnode_of_data *dn, pgoff_t count)
 			if (blkaddr != NEW_ADDR)
 				continue;
 
-			dn->data_blkaddr = NULL_ADDR;
-			f2fs_set_data_blkaddr(dn);
+			f2fs_set_data_blkaddr(dn, NULL_ADDR);
 		}
 
 		f2fs_i_compr_blocks_update(dn->inode, compr_blocks, false);
@@ -3621,8 +3618,7 @@ static int reserve_compress_blocks(struct dnode_of_data *dn, pgoff_t count)
 				continue;
 			}
 
-			dn->data_blkaddr = NEW_ADDR;
-			f2fs_set_data_blkaddr(dn);
+			f2fs_set_data_blkaddr(dn, NEW_ADDR);
 		}
 
 		reserved = cluster_size - compr_blocks;

Original file line number	Diff line number	Diff line change
`@@ -1179,10 +1179,11 @@ static int f2fs_submit_page_read(struct inode inode, struct page page,`
`1179`	`1179`	`return 0;`
`1180`	`1180`	`}`
`1181`	`1181`
`1182`		`-static void __set_data_blkaddr(struct dnode_of_data *dn)`
	`1182`	`+static void __set_data_blkaddr(struct dnode_of_data *dn, block_t blkaddr)`
`1183`	`1183`	`{`
`1184`	`1184`	`__le32 *addr = get_dnode_addr(dn->inode, dn->node_page);`
`1185`	`1185`
	`1186`	`+ dn->data_blkaddr = blkaddr;`
`1186`	`1187`	`addr[dn->ofs_in_node] = cpu_to_le32(dn->data_blkaddr);`
`1187`	`1188`	`}`
`1188`	`1189`
`@@ -1192,18 +1193,17 @@ static void __set_data_blkaddr(struct dnode_of_data *dn)`
`1192`	`1193`	`* ->node_page`
`1193`	`1194`	`* update block addresses in the node page`
`1194`	`1195`	`*/`
`1195`		`-void f2fs_set_data_blkaddr(struct dnode_of_data *dn)`
	`1196`	`+void f2fs_set_data_blkaddr(struct dnode_of_data *dn, block_t blkaddr)`
`1196`	`1197`	`{`
`1197`	`1198`	`f2fs_wait_on_page_writeback(dn->node_page, NODE, true, true);`
`1198`		`- __set_data_blkaddr(dn);`
	`1199`	`+ __set_data_blkaddr(dn, blkaddr);`
`1199`	`1200`	`if (set_page_dirty(dn->node_page))`
`1200`	`1201`	`dn->node_changed = true;`
`1201`	`1202`	`}`
`1202`	`1203`
`1203`	`1204`	`void f2fs_update_data_blkaddr(struct dnode_of_data *dn, block_t blkaddr)`
`1204`	`1205`	`{`
`1205`		`- dn->data_blkaddr = blkaddr;`
`1206`		`- f2fs_set_data_blkaddr(dn);`
	`1206`	`+ f2fs_set_data_blkaddr(dn, blkaddr);`
`1207`	`1207`	`f2fs_update_read_extent_cache(dn);`
`1208`	`1208`	`}`
`1209`	`1209`
`@@ -1230,8 +1230,7 @@ int f2fs_reserve_new_blocks(struct dnode_of_data *dn, blkcnt_t count)`
`1230`	`1230`	`block_t blkaddr = f2fs_data_blkaddr(dn);`
`1231`	`1231`
`1232`	`1232`	`if (blkaddr == NULL_ADDR) {`
`1233`		`- dn->data_blkaddr = NEW_ADDR;`
`1234`		`- __set_data_blkaddr(dn);`
	`1233`	`+ __set_data_blkaddr(dn, NEW_ADDR);`
`1235`	`1234`	`count--;`
`1236`	`1235`	`}`
`1237`	`1236`	`}`
Original file line number	Diff line number	Diff line change
`@@ -582,8 +582,7 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count)`
`582`	`582`	`if (blkaddr == NULL_ADDR)`
`583`	`583`	`continue;`
`584`	`584`
`585`		`- dn->data_blkaddr = NULL_ADDR;`
`586`		`- f2fs_set_data_blkaddr(dn);`
	`585`	`+ f2fs_set_data_blkaddr(dn, NULL_ADDR);`
`587`	`586`
`588`	`587`	`if (__is_valid_data_blkaddr(blkaddr)) {`
`589`	`588`	`if (!f2fs_is_valid_blkaddr(sbi, blkaddr,`
`@@ -1478,8 +1477,7 @@ static int f2fs_do_zero_range(struct dnode_of_data *dn, pgoff_t start,`
`1478`	`1477`	`}`
`1479`	`1478`
`1480`	`1479`	`f2fs_invalidate_blocks(sbi, dn->data_blkaddr);`
`1481`		`- dn->data_blkaddr = NEW_ADDR;`
`1482`		`- f2fs_set_data_blkaddr(dn);`
	`1480`	`+ f2fs_set_data_blkaddr(dn, NEW_ADDR);`
`1483`	`1481`	`}`
`1484`	`1482`
`1485`	`1483`	`f2fs_update_read_extent_cache_range(dn, start, 0, index - start);`
`@@ -3454,8 +3452,7 @@ static int release_compress_blocks(struct dnode_of_data *dn, pgoff_t count)`
`3454`	`3452`	`if (blkaddr != NEW_ADDR)`
`3455`	`3453`	`continue;`
`3456`	`3454`
`3457`		`- dn->data_blkaddr = NULL_ADDR;`
`3458`		`- f2fs_set_data_blkaddr(dn);`
	`3455`	`+ f2fs_set_data_blkaddr(dn, NULL_ADDR);`
`3459`	`3456`	`}`
`3460`	`3457`
`3461`	`3458`	`f2fs_i_compr_blocks_update(dn->inode, compr_blocks, false);`
`@@ -3621,8 +3618,7 @@ static int reserve_compress_blocks(struct dnode_of_data *dn, pgoff_t count)`
`3621`	`3618`	`continue;`
`3622`	`3619`	`}`
`3623`	`3620`
`3624`		`- dn->data_blkaddr = NEW_ADDR;`
`3625`		`- f2fs_set_data_blkaddr(dn);`
	`3621`	`+ f2fs_set_data_blkaddr(dn, NEW_ADDR);`
`3626`	`3622`	`}`
`3627`	`3623`
`3628`	`3624`	`reserved = cluster_size - compr_blocks;`