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

Commit 695fd1ed authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: use existing macro to clean up some codes 



This patch use existing macro F2FS_INODE/NEXT_FREE_BLKADDR to clean up some
codes.

Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
parent 81c1a0f1

fs/f2fs/f2fs.h

+2 −4
Original line number Diff line number Diff line
@@ -1000,8 +1000,7 @@ static inline unsigned int addrs_per_inode(struct f2fs_inode_info *fi) 


static inline void *inline_xattr_addr(struct page *page)

{

	struct f2fs_inode *ri;

	ri = (struct f2fs_inode *)page_address(page);

	struct f2fs_inode *ri = F2FS_INODE(page);

	return (void *)&(ri->i_addr[DEF_ADDRS_PER_INODE -

					F2FS_INLINE_XATTR_ADDRS]);

}
@@ -1021,8 +1020,7 @@ static inline int f2fs_has_inline_data(struct inode *inode) 


static inline void *inline_data_addr(struct page *page)

{

	struct f2fs_inode *ri;

	ri = (struct f2fs_inode *)page_address(page);

	struct f2fs_inode *ri = F2FS_INODE(page);

	return (void *)&(ri->i_addr[1]);

}

fs/f2fs/recovery.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head) 


	/* get node pages in the current segment */

	curseg = CURSEG_I(sbi, CURSEG_WARM_NODE);

	blkaddr = START_BLOCK(sbi, curseg->segno) + curseg->next_blkoff;

	blkaddr = NEXT_FREE_BLKADDR(sbi, curseg);



	/* read node page */

	page = alloc_page(GFP_F2FS_ZERO);