ext4: remove unused code from ext4_remove_blocks() (78fb9cdf) · Commits · 戴 / test

The "head removal" branch in the condition is never used in any code path in ext4 since the function only caller ext4_ext_rm_leaf() will make sure that the extent is properly split before removing blocks. Note that there is a bug in this branch anyway. This commit removes the unused code completely and makes use of ext4_error() instead of printk if dubious range is provided. Signed-off-by:

Lukas Czerner <lczerner@redhat.com> Reviewed-by:

Jan Kara <jack@suse.cz> Signed-off-by:

Theodore Ts'o <tytso@mit.edu>

fs/ext4/extents.c

+4 −17

Original line number	Diff line number	Diff line
		@@ -2432,23 +2432,10 @@ static int ext4_remove_blocks(handle_t handle, struct inode inode,
		*partial_cluster = EXT4_B2C(sbi, pblk);
		else
		*partial_cluster = 0;
		} else if (from == le32_to_cpu(ex->ee_block)
		&& to <= le32_to_cpu(ex->ee_block) + ee_len - 1) {
		/* head removal */
		ext4_lblk_t num;
		ext4_fsblk_t start;

		num = to - from;
		start = ext4_ext_pblock(ex);

		ext_debug("free first %u blocks starting %llu\n", num, start);
		ext4_free_blocks(handle, inode, NULL, start, num, flags);

		} else {
		printk(KERN_INFO "strange request: removal(2) "
		} else
		ext4_error(sbi->s_sb, "strange request: removal(2) "
		"%u-%u from %u:%u\n",
		from, to, le32_to_cpu(ex->ee_block), ee_len);
		}
		return 0;
		}

Admin message