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

Commit 81ca7350 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: remove unneeded pointer conversion 



There are redundant pointer conversion in following call stack:
 - at position a, inode was been converted to f2fs_file_info.
 - at position b, f2fs_file_info was been converted to inode again.

 - truncate_blocks(inode,..)
  - fi = F2FS_I(inode)		---a
  - ADDRS_PER_PAGE(node_page, fi)
   - addrs_per_inode(fi)
    - inode = &fi->vfs_inode	---b
    - f2fs_has_inline_xattr(inode)
     - fi = F2FS_I(inode)
     - is_inode_flag_set(fi,..)

In order to avoid unneeded conversion, alter ADDRS_PER_PAGE and
addrs_per_inode to acept parameter with type of inode pointer.

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

fs/f2fs/data.c

+2 −3
Original line number Diff line number Diff line
@@ -497,7 +497,6 @@ struct page *get_new_data_page(struct inode *inode, 
static int __allocate_data_block(struct dnode_of_data *dn)

{

	struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode);

	struct f2fs_inode_info *fi = F2FS_I(dn->inode);

	struct f2fs_summary sum;

	struct node_info ni;

	int seg = CURSEG_WARM_DATA;
@@ -525,7 +524,7 @@ static int __allocate_data_block(struct dnode_of_data *dn) 
	set_data_blkaddr(dn);



	/* update i_size */

	fofs = start_bidx_of_node(ofs_of_node(dn->node_page), fi) +

	fofs = start_bidx_of_node(ofs_of_node(dn->node_page), dn->inode) +

							dn->ofs_in_node;

	if (i_size_read(dn->inode) < ((loff_t)(fofs + 1) << PAGE_CACHE_SHIFT))

		i_size_write(dn->inode,
@@ -592,7 +591,7 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, 
		goto unlock_out;

	}



	end_offset = ADDRS_PER_PAGE(dn.node_page, F2FS_I(inode));

	end_offset = ADDRS_PER_PAGE(dn.node_page, inode);



next_block:

	blkaddr = datablock_addr(dn.node_page, dn.ofs_in_node);

fs/f2fs/extent_cache.c

+2 −3
Original line number Diff line number Diff line
@@ -673,7 +673,6 @@ bool f2fs_lookup_extent_cache(struct inode *inode, pgoff_t pgofs, 


void f2fs_update_extent_cache(struct dnode_of_data *dn)

{

	struct f2fs_inode_info *fi = F2FS_I(dn->inode);

	pgoff_t fofs;



	if (!f2fs_may_extent_tree(dn->inode))
@@ -682,7 +681,7 @@ void f2fs_update_extent_cache(struct dnode_of_data *dn) 
	f2fs_bug_on(F2FS_I_SB(dn->inode), dn->data_blkaddr == NEW_ADDR);





	fofs = start_bidx_of_node(ofs_of_node(dn->node_page), fi) +

	fofs = start_bidx_of_node(ofs_of_node(dn->node_page), dn->inode) +

								dn->ofs_in_node;



	if (f2fs_update_extent_tree_range(dn->inode, fofs, dn->data_blkaddr, 1))

fs/f2fs/f2fs.h

+7 −7
Original line number Diff line number Diff line
@@ -1538,9 +1538,9 @@ static inline int f2fs_has_inline_xattr(struct inode *inode) 
	return is_inode_flag_set(F2FS_I(inode), FI_INLINE_XATTR);

}



static inline unsigned int addrs_per_inode(struct f2fs_inode_info *fi)

static inline unsigned int addrs_per_inode(struct inode *inode)

{

	if (f2fs_has_inline_xattr(&fi->vfs_inode))

	if (f2fs_has_inline_xattr(inode))

		return DEF_ADDRS_PER_INODE - F2FS_INLINE_XATTR_ADDRS;

	return DEF_ADDRS_PER_INODE;

}
@@ -1694,10 +1694,10 @@ static inline void *f2fs_kvzalloc(size_t size, gfp_t flags) 
	 (F2FS_I(i)->i_acl_mode) : ((i)->i_mode))



/* get offset of first page in next direct node */

#define PGOFS_OF_NEXT_DNODE(pgofs, fi)				\

	((pgofs < ADDRS_PER_INODE(fi)) ? ADDRS_PER_INODE(fi) :	\

	(pgofs - ADDRS_PER_INODE(fi) + ADDRS_PER_BLOCK) /	\

	ADDRS_PER_BLOCK * ADDRS_PER_BLOCK + ADDRS_PER_INODE(fi))

#define PGOFS_OF_NEXT_DNODE(pgofs, inode)				\

	((pgofs < ADDRS_PER_INODE(inode)) ? ADDRS_PER_INODE(inode) :	\

	(pgofs - ADDRS_PER_INODE(inode) + ADDRS_PER_BLOCK) /	\

	ADDRS_PER_BLOCK * ADDRS_PER_BLOCK + ADDRS_PER_INODE(inode))



/*

 * file.c
@@ -1916,7 +1916,7 @@ int f2fs_release_page(struct page *, gfp_t); 
 */

int start_gc_thread(struct f2fs_sb_info *);

void stop_gc_thread(struct f2fs_sb_info *);

block_t start_bidx_of_node(unsigned int, struct f2fs_inode_info *);

block_t start_bidx_of_node(unsigned int, struct inode *);

int f2fs_gc(struct f2fs_sb_info *, bool);

void build_gc_manager(struct f2fs_sb_info *);

fs/f2fs/file.c

+5 −6
Original line number Diff line number Diff line
@@ -358,15 +358,14 @@ static loff_t f2fs_seek_block(struct file *file, loff_t offset, int whence) 
		} else if (err == -ENOENT) {

			/* direct node does not exists */

			if (whence == SEEK_DATA) {

				pgofs = PGOFS_OF_NEXT_DNODE(pgofs,

							F2FS_I(inode));

				pgofs = PGOFS_OF_NEXT_DNODE(pgofs, inode);

				continue;

			} else {

				goto found;

			}

		}



		end_offset = ADDRS_PER_PAGE(dn.node_page, F2FS_I(inode));

		end_offset = ADDRS_PER_PAGE(dn.node_page, inode);



		/* find data/hole in dnode block */

		for (; dn.ofs_in_node < end_offset;
@@ -480,7 +479,7 @@ int truncate_data_blocks_range(struct dnode_of_data *dn, int count) 
		 * we will invalidate all blkaddr in the whole range.

		 */

		fofs = start_bidx_of_node(ofs_of_node(dn->node_page),

						F2FS_I(dn->inode)) + ofs;

							dn->inode) + ofs;

		f2fs_update_extent_cache_range(dn, fofs, 0, len);

		dec_valid_block_count(sbi, dn->inode, nr_free);

		sync_inode_page(dn);
@@ -568,7 +567,7 @@ int truncate_blocks(struct inode *inode, u64 from, bool lock) 
		goto out;

	}



	count = ADDRS_PER_PAGE(dn.node_page, F2FS_I(inode));

	count = ADDRS_PER_PAGE(dn.node_page, inode);



	count -= dn.ofs_in_node;

	f2fs_bug_on(sbi, count < 0);
@@ -768,7 +767,7 @@ int truncate_hole(struct inode *inode, pgoff_t pg_start, pgoff_t pg_end) 
			return err;

		}



		end_offset = ADDRS_PER_PAGE(dn.node_page, F2FS_I(inode));

		end_offset = ADDRS_PER_PAGE(dn.node_page, inode);

		count = min(end_offset - dn.ofs_in_node, pg_end - pg_start);



		f2fs_bug_on(F2FS_I_SB(inode), count == 0 || count > end_offset);

fs/f2fs/gc.c

+4 −4
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ static void gc_node_segment(struct f2fs_sb_info *sbi, 
 * as indirect or double indirect node blocks, are given, it must be a caller's

 * bug.

 */

block_t start_bidx_of_node(unsigned int node_ofs, struct f2fs_inode_info *fi)

block_t start_bidx_of_node(unsigned int node_ofs, struct inode *inode)

{

	unsigned int indirect_blks = 2 * NIDS_PER_BLOCK + 4;

	unsigned int bidx;
@@ -503,7 +503,7 @@ block_t start_bidx_of_node(unsigned int node_ofs, struct f2fs_inode_info *fi) 
		int dec = (node_ofs - indirect_blks - 3) / (NIDS_PER_BLOCK + 1);

		bidx = node_ofs - 5 - dec;

	}

	return bidx * ADDRS_PER_BLOCK + ADDRS_PER_INODE(fi);

	return bidx * ADDRS_PER_BLOCK + ADDRS_PER_INODE(inode);

}



static bool is_alive(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,
@@ -722,7 +722,7 @@ static void gc_data_segment(struct f2fs_sb_info *sbi, struct f2fs_summary *sum, 
				continue;

			}



			start_bidx = start_bidx_of_node(nofs, F2FS_I(inode));

			start_bidx = start_bidx_of_node(nofs, inode);

			data_page = get_read_data_page(inode,

					start_bidx + ofs_in_node, READA, true);

			if (IS_ERR(data_page)) {
@@ -738,7 +738,7 @@ static void gc_data_segment(struct f2fs_sb_info *sbi, struct f2fs_summary *sum, 
		/* phase 3 */

		inode = find_gc_inode(gc_list, dni.ino);

		if (inode) {

			start_bidx = start_bidx_of_node(nofs, F2FS_I(inode))

			start_bidx = start_bidx_of_node(nofs, inode)

								+ ofs_in_node;

			if (f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode))

				move_encrypted_block(inode, start_bidx);