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

Commit f91108b8 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Jaegeuk Kim
Browse files

f2fs: Use DIV_ROUND_UP() instead of open-coding 



Replace the open-coded divisions with round-up by calls to the
DIV_ROUND_UP() helper macro.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 2d821c12

fs/f2fs/f2fs.h

+2 −2
Original line number Diff line number Diff line
@@ -480,8 +480,8 @@ static inline int get_inline_xattr_addrs(struct inode *inode); 
#define NR_INLINE_DENTRY(inode)	(MAX_INLINE_DATA(inode) * BITS_PER_BYTE / \

				((SIZE_OF_DIR_ENTRY + F2FS_SLOT_LEN) * \

				BITS_PER_BYTE + 1))

#define INLINE_DENTRY_BITMAP_SIZE(inode)	((NR_INLINE_DENTRY(inode) + \

					BITS_PER_BYTE - 1) / BITS_PER_BYTE)

#define INLINE_DENTRY_BITMAP_SIZE(inode) \

	DIV_ROUND_UP(NR_INLINE_DENTRY(inode), BITS_PER_BYTE)

#define INLINE_RESERVED_SIZE(inode)	(MAX_INLINE_DATA(inode) - \

				((SIZE_OF_DIR_ENTRY + F2FS_SLOT_LEN) * \

				NR_INLINE_DENTRY(inode) + \

fs/f2fs/file.c

+3 −3
Original line number Diff line number Diff line
@@ -1211,7 +1211,7 @@ static int __exchange_data_block(struct inode *src_inode, 
static int f2fs_do_collapse(struct inode *inode, loff_t offset, loff_t len)

{

	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);

	pgoff_t nrpages = (i_size_read(inode) + PAGE_SIZE - 1) / PAGE_SIZE;

	pgoff_t nrpages = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE);

	pgoff_t start = offset >> PAGE_SHIFT;

	pgoff_t end = (offset + len) >> PAGE_SHIFT;

	int ret;
@@ -1464,7 +1464,7 @@ static int f2fs_insert_range(struct inode *inode, loff_t offset, loff_t len) 
	pg_start = offset >> PAGE_SHIFT;

	pg_end = (offset + len) >> PAGE_SHIFT;

	delta = pg_end - pg_start;

	idx = (i_size_read(inode) + PAGE_SIZE - 1) / PAGE_SIZE;

	idx = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE);



	/* avoid gc operation during block exchange */

	down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
@@ -2362,7 +2362,7 @@ static int f2fs_defragment_range(struct f2fs_sb_info *sbi, 
	if (!fragmented)

		goto out;



	sec_num = (total + BLKS_PER_SEC(sbi) - 1) / BLKS_PER_SEC(sbi);

	sec_num = DIV_ROUND_UP(total, BLKS_PER_SEC(sbi));



	/*

	 * make sure there are enough free section for LFS allocation, this can

fs/f2fs/segment.h

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ 
#define	START_SEGNO(segno)		\

	(SIT_BLOCK_OFFSET(segno) * SIT_ENTRY_PER_BLOCK)

#define SIT_BLK_CNT(sbi)			\

	((MAIN_SEGS(sbi) + SIT_ENTRY_PER_BLOCK - 1) / SIT_ENTRY_PER_BLOCK)

	DIV_ROUND_UP(MAIN_SEGS(sbi), SIT_ENTRY_PER_BLOCK)

#define f2fs_bitmap_size(nr)			\

	(BITS_TO_LONGS(nr) * sizeof(unsigned long))