xfs: abort fstrim if kernel is suspending

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>

diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c
index f16b254b5eaa0f996e8db82c1aff6abc14f40b2a..d5787991bb5b46477419074e1015ba1135945c7b 100644 (file)
--- a/fs/xfs/xfs_discard.c
+++ b/fs/xfs/xfs_discard.c
@@ -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;
                }
        }