Commit a7967f05 authored Mar 21, 2012 by Lukas Czerner Committed by Theodore Ts'o Mar 21, 2012

ext4: always set then trimmed blocks count into len



Currently if the range to trim is too small, for example on 1K fs
the request to trim the first block, then the 'range->len' is not set
reporting wrong number of discarded block to the caller.

Fix this by always setting the 'range->len' before we return. Note that
when there is a failure (-EINVAL) caller can not depend on 'range->len'
being set properly.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

parent 21e7fd22

fs/ext4/mballoc.c

+1 −1

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

Admin message