[f2fs-dev] [PATCH v2] f2fs: introduce sanity_check_blocks()

[Yangtao Li via Linux-f2fs-devel]

There are very similar codes in release_compress_blocks() and
reserve_compress_blocks() which is used for data blocks check.

This patch introduces a new helper sanity_check_blocks()
to include those common codes, and used it instead for cleanup.

Signed-off-by: Yangtao Li <frank...@vivo.com>
---
v2:
- s/rc/err/
 fs/f2fs/file.c | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 5e4b8c6daa1f..3967f6976b6f 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -3383,11 +3383,9 @@ static int f2fs_get_compress_blocks(struct file *filp, 
unsigned long arg)
        return put_user(blocks, (u64 __user *)arg);
 }
 
-static int release_compress_blocks(struct dnode_of_data *dn, pgoff_t count)
+static int sanity_check_blocks(struct dnode_of_data *dn, pgoff_t count)
 {
        struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode);
-       unsigned int released_blocks = 0;
-       int cluster_size = F2FS_I(dn->inode)->i_cluster_size;
        block_t blkaddr;
        int i;
 
@@ -3404,6 +3402,21 @@ static int release_compress_blocks(struct dnode_of_data 
*dn, pgoff_t count)
                }
        }
 
+       return 0;
+}
+
+static int release_compress_blocks(struct dnode_of_data *dn, pgoff_t count)
+{
+       struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode);
+       unsigned int released_blocks = 0;
+       int cluster_size = F2FS_I(dn->inode)->i_cluster_size;
+       block_t blkaddr;
+       int i, err;
+
+       err = sanity_check_blocks(dn, count);
+       if (err)
+               return err;
+
        while (count) {
                int compr_blocks = 0;
 
@@ -3553,20 +3566,11 @@ static int reserve_compress_blocks(struct dnode_of_data 
*dn, pgoff_t count)
        unsigned int reserved_blocks = 0;
        int cluster_size = F2FS_I(dn->inode)->i_cluster_size;
        block_t blkaddr;
-       int i;
-
-       for (i = 0; i < count; i++) {
-               blkaddr = data_blkaddr(dn->inode, dn->node_page,
-                                               dn->ofs_in_node + i);
+       int i, err;
 
-               if (!__is_valid_data_blkaddr(blkaddr))
-                       continue;
-               if (unlikely(!f2fs_is_valid_blkaddr(sbi, blkaddr,
-                                       DATA_GENERIC_ENHANCE))) {
-                       f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);
-                       return -EFSCORRUPTED;
-               }
-       }
+       err = sanity_check_blocks(dn, count);
+       if (err)
+               return err;
 
        while (count) {
                int compr_blocks = 0;
-- 
2.25.1



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel