f2fs: fix block migration when section is not aligned to pow2

As for zoned-UFS, f2fs section size is forced to zone size. And zone
size may not aligned to pow2.

Fixes: 859fca6b706e ("f2fs: swap: support migrating swapfile in aligned write mode")
Signed-off-by: Liao Yuanhong <liaoyuanhong@vivo.com>
Signed-off-by: Wu Bo <bo.wu@vivo.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index a990236f137ea4c389fd72d2e5d49ff87fab10da..bdbd4195cadc7540469986840a07b72ab6c78a66 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3917,15 +3917,14 @@ static int check_swap_activate(struct swap_info_struct *sis,
        struct address_space *mapping = swap_file->f_mapping;
        struct inode *inode = mapping->host;
        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
-       sector_t cur_lblock;
-       sector_t last_lblock;
-       sector_t pblock;
-       sector_t lowest_pblock = -1;
-       sector_t highest_pblock = 0;
+       block_t cur_lblock;
+       block_t last_lblock;
+       block_t pblock;
+       block_t lowest_pblock = -1;
+       block_t highest_pblock = 0;
        int nr_extents = 0;
-       unsigned long nr_pblocks;
+       unsigned int nr_pblocks;
        unsigned int blks_per_sec = BLKS_PER_SEC(sbi);
-       unsigned int sec_blks_mask = BLKS_PER_SEC(sbi) - 1;
        unsigned int not_aligned = 0;
        int ret = 0;
 
@@ -3963,8 +3962,8 @@ retry:
                pblock = map.m_pblk;
                nr_pblocks = map.m_len;
 
-               if ((pblock - SM_I(sbi)->main_blkaddr) & sec_blks_mask ||
-                               nr_pblocks & sec_blks_mask ||
+               if ((pblock - SM_I(sbi)->main_blkaddr) % blks_per_sec ||
+                               nr_pblocks % blks_per_sec ||
                                !f2fs_valid_pinned_area(sbi, pblock)) {
                        bool last_extent = false;