ext4: remove unneeded test in ext4_alloc_file_blocks() (c3fe493c) · Commits · 戴 / test

ext4_alloc_file_blocks() is called from ext4_zero_range() and ext4_fallocate() both already testing EXT4_INODE_EXTENTS We can call ext_depth(inode) unconditionnally. [ Added BUG_ON check to make sure ext4_alloc_file_blocks() won't get called for a indirect-mapped inode in the future. -- tytso ] Signed-off-by:

Fabian Frederick <fabf@skynet.be> Signed-off-by:

Theodore Ts'o <tytso@mit.edu>

fs/ext4/extents.c

+2 −7

Original line number	Diff line number	Diff line
		@@ -4679,6 +4679,7 @@ static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset,
		unsigned int credits;
		loff_t epos;

		BUG_ON(!ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS));
		map.m_lblk = offset;
		map.m_len = len;
		/*
		@@ -4693,13 +4694,7 @@ static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset,
		* credits to insert 1 extent into extent tree
		*/
		credits = ext4_chunk_trans_blocks(inode, len);
		/*
		* We can only call ext_depth() on extent based inodes
		*/
		if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))
		depth = ext_depth(inode);
		else
		depth = -1;

		retry:
		while (ret >= 0 && len) {

Admin message