aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext3/balloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext3/balloc.c')
-rw-r--r--fs/ext3/balloc.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
index 045995c8ce5a..5b8344fab79d 100644
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -2090,7 +2090,8 @@ int ext3_trim_fs(struct super_block *sb, struct fstrim_range *range)
2090 ext3_fsblk_t max_blks = le32_to_cpu(es->s_blocks_count); 2090 ext3_fsblk_t max_blks = le32_to_cpu(es->s_blocks_count);
2091 int ret = 0; 2091 int ret = 0;
2092 2092
2093 start = range->start >> sb->s_blocksize_bits; 2093 start = (range->start >> sb->s_blocksize_bits) +
2094 le32_to_cpu(es->s_first_data_block);
2094 len = range->len >> sb->s_blocksize_bits; 2095 len = range->len >> sb->s_blocksize_bits;
2095 minlen = range->minlen >> sb->s_blocksize_bits; 2096 minlen = range->minlen >> sb->s_blocksize_bits;
2096 trimmed = 0; 2097 trimmed = 0;
@@ -2099,10 +2100,6 @@ int ext3_trim_fs(struct super_block *sb, struct fstrim_range *range)
2099 return -EINVAL; 2100 return -EINVAL;
2100 if (start >= max_blks) 2101 if (start >= max_blks)
2101 goto out; 2102 goto out;
2102 if (start < le32_to_cpu(es->s_first_data_block)) {
2103 len -= le32_to_cpu(es->s_first_data_block) - start;
2104 start = le32_to_cpu(es->s_first_data_block);
2105 }
2106 if (start + len > max_blks) 2103 if (start + len > max_blks)
2107 len = max_blks - start; 2104 len = max_blks - start;
2108 2105