Re: [PATCH] ext4: enable FITRIM ioctl on bigalloc file system
From: Lukáš Czerner <hidden>
Date: 2012-08-21 09:48:33
On Tue, 3 Jul 2012, Lukas Czerner wrote:
Date: Tue, 3 Jul 2012 21:10:42 +0200 From: Lukas Czerner <redacted> To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu, Lukas Czerner <redacted> Subject: [PATCH] ext4: enable FITRIM ioctl on bigalloc file system With a minor tweaks regarding minimum extent size to discard and discarded bytes reporting the FITRIM can be enabled on bigalloc file system and it works without any problem. This patch fixes minlen handling and discarded bytes reporting to take into consideration bigalloc enabled file systems and finally removes the restriction and allow FITRIM to be used on file system with bigalloc feature enabled.
any comments on this ? Thanks! -Lukas
quoted hunk ↗ jump to hunk
Signed-off-by: Lukas Czerner <redacted> --- fs/ext4/ioctl.c | 7 ------- fs/ext4/mballoc.c | 5 +++-- 2 files changed, 3 insertions(+), 9 deletions(-)diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index e34deac..9d6e0bc 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c@@ -420,13 +420,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 1cd6994..c4bd0a6 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c@@ -4984,7 +4984,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))@@ -5044,6 +5045,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; }