Commit 5a4fed7c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jaegeuk Kim
Browse files

f2fs: simplify do_checkpoint 



For each loop add a local curseg_info pointer insted of looking it up
for each of the three fields.

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 2163a691

fs/f2fs/checkpoint.c

+10 −12
Original line number Diff line number Diff line
@@ -1470,20 +1470,18 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) 
	ckpt->elapsed_time = cpu_to_le64(get_mtime(sbi, true));

	ckpt->free_segment_count = cpu_to_le32(free_segments(sbi));

	for (i = 0; i < NR_CURSEG_NODE_TYPE; i++) {

		ckpt->cur_node_segno[i] =

			cpu_to_le32(curseg_segno(sbi, i + CURSEG_HOT_NODE));

		ckpt->cur_node_blkoff[i] =

			cpu_to_le16(curseg_blkoff(sbi, i + CURSEG_HOT_NODE));

		ckpt->alloc_type[i + CURSEG_HOT_NODE] =

				curseg_alloc_type(sbi, i + CURSEG_HOT_NODE);

		struct curseg_info *curseg = CURSEG_I(sbi, i + CURSEG_HOT_NODE);



		ckpt->cur_node_segno[i] = cpu_to_le32(curseg->segno);

		ckpt->cur_node_blkoff[i] = cpu_to_le16(curseg->next_blkoff);

		ckpt->alloc_type[i + CURSEG_HOT_NODE] = curseg->alloc_type;

	}

	for (i = 0; i < NR_CURSEG_DATA_TYPE; i++) {

		ckpt->cur_data_segno[i] =

			cpu_to_le32(curseg_segno(sbi, i + CURSEG_HOT_DATA));

		ckpt->cur_data_blkoff[i] =

			cpu_to_le16(curseg_blkoff(sbi, i + CURSEG_HOT_DATA));

		ckpt->alloc_type[i + CURSEG_HOT_DATA] =

				curseg_alloc_type(sbi, i + CURSEG_HOT_DATA);

		struct curseg_info *curseg = CURSEG_I(sbi, i + CURSEG_HOT_DATA);



		ckpt->cur_data_segno[i] = cpu_to_le32(curseg->segno);

		ckpt->cur_data_blkoff[i] = cpu_to_le16(curseg->next_blkoff);

		ckpt->alloc_type[i + CURSEG_HOT_DATA] = curseg->alloc_type;

	}



	/* 2 cp + n data seg summary + orphan inode blocks */