Commit 13add3f6 authored by Zhang Yi's avatar Zhang Yi
Browse files

ext4: make ext4_insert_delayed_block() insert multi-blocks 

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9DN5Z


CVE: NA

--------------------------------

Rename ext4_insert_delayed_block() to ext4_insert_delayed_blocks(),
pass length parameter to make it insert multi delalloc blocks once a
time. For non-bigalloc case, just reserve len blocks and insert delalloc
extent. For bigalloc case, we can ensure the middle clusters are not
allocated, but need to check whether the start and end clusters are
delayed/allocated, if not, we should reserve more space for the start
and/or end block(s).

Signed-off-by: default avatarZhang Yi <yi.zhang@huawei.com>
parent e4ebad20

fs/ext4/inode.c

+36 −15
Original line number Diff line number Diff line
@@ -1680,24 +1680,28 @@ static int ext4_da_check_clu_allocated(struct inode *inode, ext4_lblk_t lblk, 
}



/*

 * ext4_insert_delayed_block - adds a delayed block to the extents status

 *                             tree, incrementing the reserved cluster/block

 *                             count or making a pending reservation

 *                             where needed

 * ext4_insert_delayed_blocks - adds a multiple delayed blocks to the extents

 *                              status tree, incrementing the reserved

 *                              cluster/block count or making pending

 *                              reservations where needed

 *

 * @inode - file containing the newly added block

 * @lblk - logical block to be added

 * @lblk - start logical block to be added

 * @len - length of blocks to be added

 *

 * Returns 0 on success, negative error code on failure.

 */

static int ext4_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk)

static int ext4_insert_delayed_blocks(struct inode *inode, ext4_lblk_t lblk,

				      ext4_lblk_t len)

{

	struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);

	int ret;

	bool allocated = false;

	int resv_clu, ret;

	bool lclu_allocated = false;

	bool end_allocated = false;

	ext4_lblk_t end = lblk + len - 1;



	/*

	 * If the cluster containing lblk is shared with a delayed,

	 * If the cluster containing lblk or end is shared with a delayed,

	 * written, or unwritten extent in a bigalloc file system, it's

	 * already been accounted for and does not need to be reserved.

	 * A pending reservation must be made for the cluster if it's
@@ -1708,21 +1712,38 @@ static int ext4_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk) 
	 * extents status tree doesn't get a match.

	 */

	if (sbi->s_cluster_ratio == 1) {

		ret = ext4_da_reserve_space(inode, 1);

		ret = ext4_da_reserve_space(inode, len);

		if (ret != 0)   /* ENOSPC */

			return ret;

	} else {   /* bigalloc */

		ret = ext4_da_check_clu_allocated(inode, lblk, &allocated);

		resv_clu = EXT4_B2C(sbi, end) - EXT4_B2C(sbi, lblk) - 1;

		if (resv_clu < 0)

			resv_clu = 0;



		ret = ext4_da_check_clu_allocated(inode, lblk, &lclu_allocated);

		if (ret < 0)

			return ret;

		if (ret > 0) {

			ret = ext4_da_reserve_space(inode, 1);

		if (ret > 0)

			resv_clu++;



		if (EXT4_B2C(sbi, lblk) != EXT4_B2C(sbi, end)) {

			ret = ext4_da_check_clu_allocated(inode, end,

							  &end_allocated);

			if (ret < 0)

				return ret;

			if (ret > 0)

				resv_clu++;

		}



		if (resv_clu) {

			ret = ext4_da_reserve_space(inode, resv_clu);

			if (ret != 0)   /* ENOSPC */

				return ret;

		}

	}



	ext4_es_insert_delayed_extent(inode, lblk, 1, allocated, false);

	ext4_es_insert_delayed_extent(inode, lblk, len, lclu_allocated,

				      end_allocated);

	return 0;

}
@@ -1825,7 +1846,7 @@ static int ext4_da_map_blocks(struct inode *inode, struct ext4_map_blocks *map, 
		}

	}



	retval = ext4_insert_delayed_block(inode, map->m_lblk);

	retval = ext4_insert_delayed_blocks(inode, map->m_lblk, map->m_len);

	up_write(&EXT4_I(inode)->i_data_sem);

	if (retval)

		return retval;