Commit 3c378195 authored Apr 27, 2017 by Lukas Czerner Committed by Darrick J. Wong Apr 27, 2017

xfs: Allow user to kill fstrim process



fstrim can take really long time on big, slow device or on file system
with a lots of allocation groups. Currently there is no way for the user
to cancell the operation. This patch makes it possible for the user to
kill fstrim pocess by adding the check for fatal_signal_pending() in
xfs_trim_extents().

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

parent c4cf1acd

fs/xfs/xfs_discard.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -132,6 +132,11 @@ xfs_trim_extents(
		error = xfs_btree_decrement(cur, 0, &i);
		if (error)
		goto out_del_cursor;

		if (fatal_signal_pending(current)) {
		error = -ERESTARTSYS;
		goto out_del_cursor;
		}
		}

		out_del_cursor:
		@@ -196,8 +201,11 @@ xfs_ioc_trim(
		for (agno = start_agno; agno <= end_agno; agno++) {
		error = xfs_trim_extents(mp, agno, start, end, minlen,
		&blocks_trimmed);
		if (error)
		if (error) {
		last_error = error;
		if (error == -ERESTARTSYS)
		break;
		}
		}

		if (last_error)