ext4: enable FITRIM ioctl on bigalloc file system (aaf7d73e) · Commits · 戴 / test

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. Reviewed-by:

Carlos Maiolino <cmaiolino@redhat.com> Signed-off-by:

Lukas Czerner <lczerner@redhat.com> Signed-off-by:

"Theodore Ts'o" <tytso@mit.edu>

fs/ext4/ioctl.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -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;

fs/ext4/mballoc.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message