diff --git a/[refs] b/[refs] index 911acd63ad21..c4b23567d3c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21e7fd22a5a0ca83befe12c58cced21975dab213 +refs/heads/master: a7967f055a9438941268d725b268141c57e32a05 diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c index c8b6a8808166..99ab428bcfa0 100644 --- a/trunk/fs/ext4/mballoc.c +++ b/trunk/fs/ext4/mballoc.c @@ -5035,11 +5035,11 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range) */ first_cluster = 0; } - range->len = trimmed * sb->s_blocksize; if (!ret) atomic_set(&EXT4_SB(sb)->s_last_trim_minblks, minlen); out: + range->len = trimmed * sb->s_blocksize; return ret; }