---

yaml --- r: 229137 b: refs/heads/master c: 0a2179b h: refs/heads/master i: 229135: eaf3378 v: v3
git-mirror · Jan 11, 2011 · 720643a · 720643a
1 parent 6c27c34
commit 720643a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d002ebf1d8daa5a317645b1c4a3a0b7ea2abc9ac
+refs/heads/master: 0a2179b169089f871e071c74316371ed43e6c8eb
diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c
@@ -4804,7 +4804,6 @@ 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)
 {
 	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 group, ngroups = ext4_get_groups_count(sb);
 	ext4_grpblk_t cnt = 0, first_block, last_block;
@@ -4816,11 +4815,6 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)
 	minlen = range->minlen >> sb->s_blocksize_bits;
 	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)))
 		return -EINVAL;