Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 20:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfs: abort fstrim if kernel is suspending

Browse Source 
A recent ext4 patch posting from Jan Kara reminded me of a
discussion a year ago about fstrim in progress preventing kernels
from suspending. The fix is simple, we should do the same for XFS.

This removes the -ERESTARTSYS error return from this code, replacing
it with either the last error seen or the number of blocks
successfully trimmed up to the point where we detected the stop
condition.

References: https://bugzilla.kernel.org/show_bug.cgi?id=216322
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
Dave Chinner 2023-10-04 09:25:04 +11:00 committed by Dave Chinner
parent 89cfa89960
commit e78a40b851
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/xfs/xfs_discard.c
View File

@ -283,6 +283,12 @@ out_del_cursor:
return error;
}
static bool
xfs_trim_should_stop(void)
{
return fatal_signal_pending(current) || freezing(current);
}
/*
* Iterate the free list gathering extents and discarding them. We need a cursor
* for the repeated iteration of gather/discard loop, so use the longest extent
@ -336,10 +342,9 @@ xfs_trim_extents(
if (error)
break;
if (fatal_signal_pending(current)) {
error = -ERESTARTSYS;
if (xfs_trim_should_stop())
break;
}
} while (tcur.ar_blockcount != 0);
return error;
@ -408,12 +413,12 @@ xfs_ioc_trim(
for_each_perag_range(mp, agno, xfs_daddr_to_agno(mp, end), pag) {
error = xfs_trim_extents(pag, start, end, minlen,
&blocks_trimmed);
if (error) {
if (error)
last_error = error;
if (error == -ERESTARTSYS) {
xfs_perag_rele(pag);
break;
}
if (xfs_trim_should_stop()) {
xfs_perag_rele(pag);
break;
}
}