Commit 0be88e36 authored Sep 06, 2018 by Jeff Mahoney Committed by David Sterba Oct 15, 2018

btrfs: don't attempt to trim devices that don't support it



We check whether any device the file system is using supports discard in
the ioctl call, but then we attempt to trim free extents on every device
regardless of whether discard is supported.  Due to the way we mask off
EOPNOTSUPP, we can end up issuing the trim operations on each free range
on devices that don't support it, just wasting time.

Fixes: 499f377f ("btrfs: iterate over unused chunk space in FITRIM")
CC: stable@vger.kernel.org # 4.4+
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent d4e329de

fs/btrfs/extent-tree.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -10772,6 +10772,10 @@ static int btrfs_trim_free_extents(struct btrfs_device *device,

		*trimmed = 0;

		/* Discard not supported = nothing to do. */
		if (!blk_queue_discard(bdev_get_queue(device->bdev)))
		return 0;

		/* Not writeable = nothing to do. */
		if (!test_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state))
		return 0;

Admin message