Commit 2163a691 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jaegeuk Kim
Browse files

f2fs: remove __add_sum_entry 



This function just assigns a summary entry.  This can be done entirely
typesafe with an open code struct assignment that relies on array
indexing.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent ae267fc1

fs/f2fs/segment.c

+2 −21
Original line number Diff line number Diff line
@@ -2339,19 +2339,6 @@ bool f2fs_is_checkpointed_data(struct f2fs_sb_info *sbi, block_t blkaddr) 
	return is_cp;

}



/*

 * This function should be resided under the curseg_mutex lock

 */

static void __add_sum_entry(struct f2fs_sb_info *sbi, int type,

					struct f2fs_summary *sum)

{

	struct curseg_info *curseg = CURSEG_I(sbi, type);

	void *addr = curseg->sum_blk;



	addr += curseg->next_blkoff * sizeof(struct f2fs_summary);

	memcpy(addr, sum, sizeof(struct f2fs_summary));

}



/*

 * Calculate the number of current summary pages for writing

 */
@@ -3278,13 +3265,7 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page, 


	f2fs_wait_discard_bio(sbi, *new_blkaddr);



	/*

	 * __add_sum_entry should be resided under the curseg_mutex

	 * because, this function updates a summary entry in the

	 * current summary block.

	 */

	__add_sum_entry(sbi, type, sum);



	curseg->sum_blk->entries[curseg->next_blkoff] = *sum;

	__refresh_next_blkoff(sbi, curseg);



	stat_inc_block_count(sbi, curseg);
@@ -3587,7 +3568,7 @@ void f2fs_do_replace_block(struct f2fs_sb_info *sbi, struct f2fs_summary *sum, 
	}



	curseg->next_blkoff = GET_BLKOFF_FROM_SEG0(sbi, new_blkaddr);

	__add_sum_entry(sbi, type, sum);

	curseg->sum_blk->entries[curseg->next_blkoff] = *sum;



	if (!recover_curseg || recover_newaddr) {

		if (!from_gc)