Commit a208b3f1 authored by David Sterba's avatar David Sterba
Browse files

btrfs: don't warn if discard range is not aligned to sector 



There's a warning in btrfs_issue_discard() when the range is not aligned
to 512 bytes, originally added in 4d89d377 ("btrfs:
btrfs_issue_discard ensure offset/length are aligned to sector
boundaries"). We can't do sub-sector writes anyway so the adjustment is
the only thing that we can do and the warning is unnecessary.

CC: stable@vger.kernel.org # 4.19+
Reported-by: default avatar <syzbot+4a4f1eba14eb5c3417d1@syzkaller.appspotmail.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent f398e70d

fs/btrfs/extent-tree.c

+2 −1
Original line number Diff line number Diff line
@@ -1260,7 +1260,8 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len, 
	u64 bytes_left, end;

	u64 aligned_start = ALIGN(start, 1 << SECTOR_SHIFT);



	if (WARN_ON(start != aligned_start)) {

	/* Adjust the range to be aligned to 512B sectors if necessary. */

	if (start != aligned_start) {

		len -= aligned_start - start;

		len = round_down(len, 1 << SECTOR_SHIFT);

		start = aligned_start;