* [PATCH] fsf2: Use DIV_ROUND_UP() instead of open-coding
@ 2019-06-20 14:42 Geert Uytterhoeven
2019-06-21 9:58 ` Chao Yu
0 siblings, 1 reply; 2+ messages in thread
From: Geert Uytterhoeven @ 2019-06-20 14:42 UTC (permalink / raw)
To: Jaegeuk Kim, Chao Yu; +Cc: linux-f2fs-devel, linux-kernel, Geert Uytterhoeven
Replace the open-coded divisions with round-up by calls to the
DIV_ROUND_UP() helper macro.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
fs/f2fs/f2fs.h | 4 ++--
fs/f2fs/file.c | 6 +++---
fs/f2fs/segment.h | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 9afe15675dbbd369..52f477eaaee93bc3 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -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) + \
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 1180eca879331eba..fc00d8bdc31c18b0 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -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
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index 166ac0f07a4e472d..2ae6df03b9982d12 100644
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -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))
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] fsf2: Use DIV_ROUND_UP() instead of open-coding
2019-06-20 14:42 [PATCH] fsf2: Use DIV_ROUND_UP() instead of open-coding Geert Uytterhoeven
@ 2019-06-21 9:58 ` Chao Yu
0 siblings, 0 replies; 2+ messages in thread
From: Chao Yu @ 2019-06-21 9:58 UTC (permalink / raw)
To: Geert Uytterhoeven, Jaegeuk Kim; +Cc: linux-f2fs-devel, linux-kernel
fsf2: Use DIV_ROUND_UP() instead of open-coding
fsf2 -> f2fs
Otherwise, it looks good to me.
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Thanks,
On 2019/6/20 22:42, Geert Uytterhoeven wrote:
> Replace the open-coded divisions with round-up by calls to the
> DIV_ROUND_UP() helper macro.
>
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---
> fs/f2fs/f2fs.h | 4 ++--
> fs/f2fs/file.c | 6 +++---
> fs/f2fs/segment.h | 2 +-
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index 9afe15675dbbd369..52f477eaaee93bc3 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -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) + \
> diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
> index 1180eca879331eba..fc00d8bdc31c18b0 100644
> --- a/fs/f2fs/file.c
> +++ b/fs/f2fs/file.c
> @@ -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
> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
> index 166ac0f07a4e472d..2ae6df03b9982d12 100644
> --- a/fs/f2fs/segment.h
> +++ b/fs/f2fs/segment.h
> @@ -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))
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-06-21 9:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-20 14:42 [PATCH] fsf2: Use DIV_ROUND_UP() instead of open-coding Geert Uytterhoeven
2019-06-21 9:58 ` Chao Yu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).