|
@@ -4819,6 +4819,7 @@ ext4_grpblk_t ext4_trim_all_free(struct super_block *sb, struct ext4_buddy *e4b,
|
|
int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)
|
|
int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)
|
|
{
|
|
{
|
|
struct ext4_buddy e4b;
|
|
struct ext4_buddy e4b;
|
|
|
|
+ ext4_fsblk_t blocks_count = ext4_blocks_count(EXT4_SB(sb)->s_es);
|
|
ext4_group_t first_group, last_group;
|
|
ext4_group_t first_group, last_group;
|
|
ext4_group_t group, ngroups = ext4_get_groups_count(sb);
|
|
ext4_group_t group, ngroups = ext4_get_groups_count(sb);
|
|
ext4_grpblk_t cnt = 0, first_block, last_block;
|
|
ext4_grpblk_t cnt = 0, first_block, last_block;
|
|
@@ -4830,6 +4831,11 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)
|
|
minlen = range->minlen >> sb->s_blocksize_bits;
|
|
minlen = range->minlen >> sb->s_blocksize_bits;
|
|
trimmed = 0;
|
|
trimmed = 0;
|
|
|
|
|
|
|
|
+ if (start >= blocks_count)
|
|
|
|
+ return -EINVAL;
|
|
|
|
+ if (start + len > blocks_count)
|
|
|
|
+ len = blocks_count - start;
|
|
|
|
+
|
|
if (unlikely(minlen > EXT4_BLOCKS_PER_GROUP(sb)))
|
|
if (unlikely(minlen > EXT4_BLOCKS_PER_GROUP(sb)))
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|