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

Commit 60a3b782 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: avoid variable length array 



Instead of using variable length array, this patch let preallocate memory for
them.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 29e7043f

fs/f2fs/debug.c

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ static void update_mem_info(struct f2fs_sb_info *sbi) 
	si->base_mem += MAIN_SEGS(sbi) * sizeof(struct seg_entry);

	si->base_mem += f2fs_bitmap_size(MAIN_SEGS(sbi));

	si->base_mem += 2 * SIT_VBLOCK_MAP_SIZE * MAIN_SEGS(sbi);

	si->base_mem += SIT_VBLOCK_MAP_SIZE;

	if (sbi->segs_per_sec > 1)

		si->base_mem += MAIN_SECS(sbi) * sizeof(struct sec_entry);

	si->base_mem += __bitmap_size(sbi, SIT_BITMAP);

fs/f2fs/segment.c

+8 −2
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ static void add_discard_addrs(struct f2fs_sb_info *sbi, struct cp_control *cpc) 
	struct seg_entry *se = get_seg_entry(sbi, cpc->trim_start);

	unsigned long *cur_map = (unsigned long *)se->cur_valid_map;

	unsigned long *ckpt_map = (unsigned long *)se->ckpt_valid_map;

	unsigned long dmap[entries];

	unsigned long *dmap = SIT_I(sbi)->tmp_map;

	unsigned int start = 0, end = -1;

	bool force = (cpc->reason == CP_DISCARD);

	int i;
@@ -924,7 +924,7 @@ static void __next_free_blkoff(struct f2fs_sb_info *sbi, 
{

	struct seg_entry *se = get_seg_entry(sbi, seg->segno);

	int entries = SIT_VBLOCK_MAP_SIZE / sizeof(unsigned long);

	unsigned long target_map[entries];

	unsigned long *target_map = SIT_I(sbi)->tmp_map;

	unsigned long *ckpt_map = (unsigned long *)se->ckpt_valid_map;

	unsigned long *cur_map = (unsigned long *)se->cur_valid_map;

	int i, pos;
@@ -1855,6 +1855,10 @@ static int build_sit_info(struct f2fs_sb_info *sbi) 
			return -ENOMEM;

	}



	sit_i->tmp_map = kzalloc(SIT_VBLOCK_MAP_SIZE, GFP_KERNEL);

	if (!sit_i->tmp_map)

		return -ENOMEM;



	if (sbi->segs_per_sec > 1) {

		sit_i->sec_entries = vzalloc(MAIN_SECS(sbi) *

					sizeof(struct sec_entry));
@@ -2236,6 +2240,8 @@ static void destroy_sit_info(struct f2fs_sb_info *sbi) 
			kfree(sit_i->sentries[start].ckpt_valid_map);

		}

	}

	kfree(sit_i->tmp_map);



	vfree(sit_i->sentries);

	vfree(sit_i->sec_entries);

	kfree(sit_i->dirty_sentries_bitmap);

fs/f2fs/segment.h

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ struct sit_info { 
	char *sit_bitmap;		/* SIT bitmap pointer */

	unsigned int bitmap_size;	/* SIT bitmap size */



	unsigned long *tmp_map;			/* bitmap for temporal use */

	unsigned long *dirty_sentries_bitmap;	/* bitmap for dirty sentries */

	unsigned int dirty_sentries;		/* # of dirty sentries */

	unsigned int sents_per_block;		/* # of SIT entries per block */