2 files changed, 3 insertions, 9 deletions

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 8b84fe28cca..4c8174aa685 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -404,13 +404,6 @@ resizefs_out:
                 if (!blk_queue_discard(q))
                         return -EOPNOTSUPP;
 
-                if (EXT4_HAS_RO_COMPAT_FEATURE(sb,
-                               EXT4_FEATURE_RO_COMPAT_BIGALLOC)) {
-                        ext4_msg(sb, KERN_ERR,
-                                 "FITRIM not supported with bigalloc");
-                        return -EOPNOTSUPP;
-                }
-
                 if (copy_from_user(&range, (struct fstrim_range __user *)arg,
                     sizeof(range)))
                         return -EFAULT;
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 8ec6f88b7a3..a415465f97a 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -4990,7 +4990,8 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)
 
         start = range->start >> sb->s_blocksize_bits;
         end = start + (range->len >> sb->s_blocksize_bits) - 1;
-        minlen = range->minlen >> sb->s_blocksize_bits;
+        minlen = EXT4_NUM_B2C(EXT4_SB(sb),
+                              range->minlen >> sb->s_blocksize_bits);
 
         if (unlikely(minlen > EXT4_CLUSTERS_PER_GROUP(sb)) ||
             unlikely(start >= max_blks))
@@ -5050,6 +5051,6 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)
                 atomic_set(&EXT4_SB(sb)->s_last_trim_minblks, minlen);
 
 out:
-        range->len = trimmed * sb->s_blocksize;
+        range->len = EXT4_C2B(EXT4_SB(sb), trimmed) << sb->s_blocksize_bits;
         return ret;
 }