Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3519e3f9 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: use sbi->blocks_per_seg to avoid unnecessary calculation 



Use sbi->blocks_per_seg directly to avoid unnecessary calculation when using
1 << sbi->log_blocks_per_seg.

Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 9006f2c9

fs/f2fs/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static void update_sit_info(struct f2fs_sb_info *sbi) 


	bimodal = 0;

	total_vblocks = 0;

	blks_per_sec = sbi->segs_per_sec * (1 << sbi->log_blocks_per_seg);

	blks_per_sec = sbi->segs_per_sec * sbi->blocks_per_seg;

	hblks_per_sec = blks_per_sec / 2;

	for (segno = 0; segno < MAIN_SEGS(sbi); segno += sbi->segs_per_sec) {

		vblocks = get_valid_blocks(sbi, segno, sbi->segs_per_sec);

fs/f2fs/f2fs.h

+1 −2
Original line number Diff line number Diff line
@@ -1099,8 +1099,7 @@ static inline int get_dirty_pages(struct inode *inode) 


static inline int get_blocktype_secs(struct f2fs_sb_info *sbi, int block_type)

{

	unsigned int pages_per_sec = sbi->segs_per_sec *

					(1 << sbi->log_blocks_per_seg);

	unsigned int pages_per_sec = sbi->segs_per_sec * sbi->blocks_per_seg;

	return ((get_pages(sbi, block_type) + pages_per_sec - 1)

			>> sbi->log_blocks_per_seg) / sbi->segs_per_sec;

}

fs/f2fs/file.c

+2 −3
Original line number Diff line number Diff line
@@ -1654,10 +1654,9 @@ static int f2fs_defragment_range(struct f2fs_sb_info *sbi, 
	struct f2fs_map_blocks map;

	struct extent_info ei;

	pgoff_t pg_start, pg_end;

	unsigned int blk_per_seg = 1 << sbi->log_blocks_per_seg;

	unsigned int blk_per_seg = sbi->blocks_per_seg;

	unsigned int total = 0, sec_num;

	unsigned int pages_per_sec = sbi->segs_per_sec *

					(1 << sbi->log_blocks_per_seg);

	unsigned int pages_per_sec = sbi->segs_per_sec * blk_per_seg;

	block_t blk_end = 0;

	bool fragmented = false;

	int err;

fs/f2fs/gc.c

+2 −2
Original line number Diff line number Diff line
@@ -173,9 +173,9 @@ static unsigned int get_max_cost(struct f2fs_sb_info *sbi, 
{

	/* SSR allocates in a segment unit */

	if (p->alloc_mode == SSR)

		return 1 << sbi->log_blocks_per_seg;

		return sbi->blocks_per_seg;

	if (p->gc_mode == GC_GREEDY)

		return (1 << sbi->log_blocks_per_seg) * p->ofs_unit;

		return sbi->blocks_per_seg * p->ofs_unit;

	else if (p->gc_mode == GC_CB)

		return UINT_MAX;

	else /* No other gc_mode */

fs/f2fs/node.h

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static inline pgoff_t current_nat_addr(struct f2fs_sb_info *sbi, nid_t start) 


	block_addr = (pgoff_t)(nm_i->nat_blkaddr +

		(seg_off << sbi->log_blocks_per_seg << 1) +

		(block_off & ((1 << sbi->log_blocks_per_seg) - 1)));

		(block_off & (sbi->blocks_per_seg - 1)));



	if (f2fs_test_bit(block_off, nm_i->nat_bitmap))

		block_addr += sbi->blocks_per_seg;