Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 635901bd authored by Lukas Czerner's avatar Lukas Czerner Committed by Greg Kroah-Hartman
Browse files

ext4: change s_last_trim_minblks type to unsigned long 



[ Upstream commit 2327fb2e23416cfb2795ccca2f77d4d65925be99 ]

There is no good reason for the s_last_trim_minblks to be atomic. There is
no data integrity needed and there is no real danger in setting and
reading it in a racy manner. Change it to be unsigned long, the same type
as s_clusters_per_group which is the maximum that's allowed.

Signed-off-by: default avatarLukas Czerner <lczerner@redhat.com>
Suggested-by: default avatarAndreas Dilger <adilger@dilger.ca>
Reviewed-by: default avatarAndreas Dilger <adilger@dilger.ca>
Link: https://lore.kernel.org/r/20211103145122.17338-1-lczerner@redhat.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Stable-dep-of: 45e4ab320c9b ("ext4: move setting of trimmed bit into ext4_try_to_trim_range()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2d874151

fs/ext4/ext4.h

+1 −1
Original line number Diff line number Diff line
@@ -1529,7 +1529,7 @@ struct ext4_sb_info { 
	struct task_struct *s_mmp_tsk;



	/* record the last minlen when FITRIM is called. */

	atomic_t s_last_trim_minblks;

	unsigned long s_last_trim_minblks;



	/* Reference to checksum algorithm driver via cryptoapi */

	struct crypto_shash *s_chksum_driver;

fs/ext4/mballoc.c

+2 −2
Original line number Diff line number Diff line
@@ -5279,7 +5279,7 @@ ext4_trim_all_free(struct super_block *sb, ext4_group_t group, 
	ext4_lock_group(sb, group);



	if (!EXT4_MB_GRP_WAS_TRIMMED(e4b.bd_info) ||

	    minblocks < atomic_read(&EXT4_SB(sb)->s_last_trim_minblks)) {

	    minblocks < EXT4_SB(sb)->s_last_trim_minblks) {

		ret = ext4_try_to_trim_range(sb, &e4b, start, max, minblocks);

		if (ret >= 0)

			EXT4_MB_GRP_SET_TRIMMED(e4b.bd_info);
@@ -5388,7 +5388,7 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range) 
	}



	if (!ret)

		atomic_set(&EXT4_SB(sb)->s_last_trim_minblks, minlen);

		EXT4_SB(sb)->s_last_trim_minblks = minlen;



out:

	range->len = EXT4_C2B(EXT4_SB(sb), trimmed) << sb->s_blocksize_bits;