diff options
| author | Tao Ma <boyu.mt@taobao.com> | 2011-01-21 10:52:56 +0800 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2011-02-24 11:42:45 +0100 |
| commit | 4b44dd300d5bfd500f170bae13f95f589de0b28f (patch) | |
| tree | 2add4705a56c0fc665029baa122e466359c56eb2 /fs/ext3 | |
| parent | 7a39de1510a3fd07a77530440292735d305fe510 (diff) | |
| download | talos-obmc-linux-4b44dd300d5bfd500f170bae13f95f589de0b28f.tar.gz talos-obmc-linux-4b44dd300d5bfd500f170bae13f95f589de0b28f.zip | |
ext3: Adjust trim start with first_data_block.
As we have make the consense in the e-mail[1], the trim start should
be added with first_data_block. So this patch fulfill it and remove
the check for start < first_data_block.
[1] http://www.spinics.net/lists/linux-ext4/msg22737.html
Cc: Jan Kara <jack@suse.cz>
Cc: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext3')
| -rw-r--r-- | fs/ext3/balloc.c | 7 |
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) ext3_fsblk_t max_blks = le32_to_cpu(es->s_blocks_count); int ret = 0; - start = range->start >> sb->s_blocksize_bits; + start = (range->start >> sb->s_blocksize_bits) + + le32_to_cpu(es->s_first_data_block); len = range->len >> sb->s_blocksize_bits; minlen = range->minlen >> sb->s_blocksize_bits; trimmed = 0; @@ -2099,10 +2100,6 @@ int ext3_trim_fs(struct super_block *sb, struct fstrim_range *range) return -EINVAL; if (start >= max_blks) goto out; - if (start < le32_to_cpu(es->s_first_data_block)) { - len -= le32_to_cpu(es->s_first_data_block) - start; - start = le32_to_cpu(es->s_first_data_block); - } if (start + len > max_blks) len = max_blks - start; |
