quota: Replace all block number checking with helper function
authorZhihao Cheng <chengzhihao1@huawei.com>
Fri, 23 Sep 2022 13:45:53 +0000 (21:45 +0800)
committerJan Kara <jack@suse.cz>
Thu, 29 Sep 2022 13:37:28 +0000 (15:37 +0200)
Cleanup all block checking places, replace them with helper function
do_check_range().

Link: https://lore.kernel.org/r/20220923134555.2623931-3-chengzhihao1@huawei.com
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: Jan Kara <jack@suse.cz>
fs/quota/quota_tree.c

index 7e65d67..0fa73ca 100644 (file)
@@ -518,12 +518,10 @@ static int remove_tree(struct qtree_mem_dqinfo *info, struct dquot *dquot,
                goto out_buf;
        }
        newblk = le32_to_cpu(ref[get_index(info, dquot->dq_id, depth)]);
-       if (newblk < QT_TREEOFF || newblk >= info->dqi_blocks) {
-               quota_error(dquot->dq_sb, "Getting block too big (%u >= %u)",
-                           newblk, info->dqi_blocks);
-               ret = -EUCLEAN;
+       ret = do_check_range(dquot->dq_sb, "block", newblk, QT_TREEOFF,
+                            info->dqi_blocks - 1);
+       if (ret)
                goto out_buf;
-       }
 
        if (depth == info->dqi_qtree_depth - 1) {
                ret = free_dqentry(info, dquot, newblk);
@@ -624,12 +622,10 @@ static loff_t find_tree_dqentry(struct qtree_mem_dqinfo *info,
        blk = le32_to_cpu(ref[get_index(info, dquot->dq_id, depth)]);
        if (!blk)       /* No reference? */
                goto out_buf;
-       if (blk < QT_TREEOFF || blk >= info->dqi_blocks) {
-               quota_error(dquot->dq_sb, "Getting block too big (%u >= %u)",
-                           blk, info->dqi_blocks);
-               ret = -EUCLEAN;
+       ret = do_check_range(dquot->dq_sb, "block", blk, QT_TREEOFF,
+                            info->dqi_blocks - 1);
+       if (ret)
                goto out_buf;
-       }
 
        if (depth < info->dqi_qtree_depth - 1)
                ret = find_tree_dqentry(info, dquot, blk, depth+1);