f2fs: clean up val{>>,<<}F2FS_BLKSIZE_BITS

[ Upstream commit 8fb9f31984bdc0aaa1b0f7c7e7a27bd3137f8744 ]

Use F2FS_BYTES_TO_BLK(bytes) and F2FS_BLK_TO_BYTES(blk) for cleanup

Signed-off-by: Zhiguo Niu <zhiguo.niu@unisoc.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Stable-dep-of: 3273d8ad947d ("f2fs: fix to do cast in F2FS_{BLK_TO_BYTES, BTYES_TO_BLK} to avoid overflow")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 4184755535553b98c6fa046fb9c209bc82faf08a..ee8b29745a5b28019f27debadf7c078da5c1eb8f 100644 (file)
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -1551,7 +1551,7 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
                blk = start_blk + BLKS_PER_SEG(sbi) - nm_i->nat_bits_blocks;
                for (i = 0; i < nm_i->nat_bits_blocks; i++)
                        f2fs_update_meta_page(sbi, nm_i->nat_bits +
-                                       (i << F2FS_BLKSIZE_BITS), blk + i);
+                                       F2FS_BLK_TO_BYTES(i), blk + i);
        }
 
        /* write out checkpoint buffer at block 0 */

diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
index 8b0e1e71b667448afce3cb7b094fc2bc4644a892..546b8ba91261300c3b7517066d7ed25b08d17b90 100644 (file)
--- a/fs/f2fs/debug.c
+++ b/fs/f2fs/debug.c
@@ -275,7 +275,7 @@ static void update_mem_info(struct f2fs_sb_info *sbi)
        /* build nm */
        si->base_mem += sizeof(struct f2fs_nm_info);
        si->base_mem += __bitmap_size(sbi, NAT_BITMAP);
-       si->base_mem += (NM_I(sbi)->nat_bits_blocks << F2FS_BLKSIZE_BITS);
+       si->base_mem += F2FS_BLK_TO_BYTES(NM_I(sbi)->nat_bits_blocks);
        si->base_mem += NM_I(sbi)->nat_blocks *
                                f2fs_bitmap_size(NAT_ENTRY_PER_BLOCK);
        si->base_mem += NM_I(sbi)->nat_blocks / 8;

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index b4047d8092890fd0e649d4132c814f99e0e297f8..5f79d49b22bb80edc7db8c76e401c56a9c2d6ae4 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -3013,9 +3013,9 @@ static int f2fs_move_file_range(struct file *file_in, loff_t pos_in,
        }
 
        f2fs_lock_op(sbi);
-       ret = __exchange_data_block(src, dst, pos_in >> F2FS_BLKSIZE_BITS,
-                               pos_out >> F2FS_BLKSIZE_BITS,
-                               len >> F2FS_BLKSIZE_BITS, false);
+       ret = __exchange_data_block(src, dst, F2FS_BYTES_TO_BLK(pos_in),
+                               F2FS_BYTES_TO_BLK(pos_out),
+                               F2FS_BYTES_TO_BLK(len), false);
 
        if (!ret) {
                if (dst_max_i_size)

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index b72ef96f7e33af7a1cc3fcbe3762cdd4babcd799..296cd3a0049a71ab0778920ed8f41cb1e21ff9cd 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -3166,7 +3166,7 @@ static int __get_nat_bitmaps(struct f2fs_sb_info *sbi)
 
        nm_i->nat_bits_blocks = F2FS_BLK_ALIGN((nat_bits_bytes << 1) + 8);
        nm_i->nat_bits = f2fs_kvzalloc(sbi,
-                       nm_i->nat_bits_blocks << F2FS_BLKSIZE_BITS, GFP_KERNEL);
+                       F2FS_BLK_TO_BYTES(nm_i->nat_bits_blocks), GFP_KERNEL);
        if (!nm_i->nat_bits)
                return -ENOMEM;
 
@@ -3185,7 +3185,7 @@ static int __get_nat_bitmaps(struct f2fs_sb_info *sbi)
                if (IS_ERR(page))
                        return PTR_ERR(page);
 
-               memcpy(nm_i->nat_bits + (i << F2FS_BLKSIZE_BITS),
+               memcpy(nm_i->nat_bits + F2FS_BLK_TO_BYTES(i),
                                        page_address(page), F2FS_BLKSIZE);
                f2fs_put_page(page, 1);
        }

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index bb892d92c5b2630eca34ff106623e37956674297..403b5877c748e919910c0eaf1ae80620b09cbfde 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -3323,7 +3323,7 @@ loff_t max_file_blocks(struct inode *inode)
         * fit within U32_MAX + 1 data units.
         */
 
-       result = min(result, (((loff_t)U32_MAX + 1) * 4096) >> F2FS_BLKSIZE_BITS);
+       result = min(result, F2FS_BYTES_TO_BLK(((loff_t)U32_MAX + 1) * 4096));
 
        return result;
 }

diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h
index c68e37201a12adfea5fc268a9d41245fe55d6b96..b0b821edfd97d1dfa8fbfdad1ef9e303ad97b91b 100644 (file)
--- a/include/linux/f2fs_fs.h
+++ b/include/linux/f2fs_fs.h
@@ -19,7 +19,6 @@
 #define F2FS_BLKSIZE_BITS              PAGE_SHIFT /* bits for F2FS_BLKSIZE */
 #define F2FS_MAX_EXTENSION             64      /* # of extension entries */
 #define F2FS_EXTENSION_LEN             8       /* max size of extension */
-#define F2FS_BLK_ALIGN(x)      (((x) + F2FS_BLKSIZE - 1) >> F2FS_BLKSIZE_BITS)
 
 #define NULL_ADDR              ((block_t)0)    /* used as block_t addresses */
 #define NEW_ADDR               ((block_t)-1)   /* used as block_t addresses */
@@ -28,6 +27,7 @@
 #define F2FS_BYTES_TO_BLK(bytes)       ((bytes) >> F2FS_BLKSIZE_BITS)
 #define F2FS_BLK_TO_BYTES(blk)         ((blk) << F2FS_BLKSIZE_BITS)
 #define F2FS_BLK_END_BYTES(blk)                (F2FS_BLK_TO_BYTES(blk + 1) - 1)
+#define F2FS_BLK_ALIGN(x)                      (F2FS_BYTES_TO_BLK((x) + F2FS_BLKSIZE - 1))
 
 /* 0, 1(node nid), 2(meta nid) are reserved node id */
 #define F2FS_RESERVED_NODE_NUM         3