1 files changed, 6 insertions, 2 deletions

diff --git a/fs/xfs/scrub/attr.c b/fs/xfs/scrub/attr.c
index 099a28308815..70f025284c42 100644
--- a/fs/xfs/scrub/attr.c
+++ b/fs/xfs/scrub/attr.c
@@ -73,7 +73,7 @@ xchk_xattr_listent(
         sx = container_of(context, struct xchk_xattr, context);
 
         if (xchk_should_terminate(sx->sc, &error)) {
-                context->seen_enough = 1;
+                context->seen_enough = error;
                 return;
         }
 
@@ -115,7 +115,7 @@ xchk_xattr_listent(
                                              args.blkno);
 fail_xref:
         if (sx->sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT)
-                context->seen_enough = 1;
+                context->seen_enough = XFS_ITER_ABORT;
         return;
 }
 
@@ -454,6 +454,10 @@ xchk_xattr(
         error = xfs_attr_list_int_ilocked(&sx.context);
         if (!xchk_fblock_process_error(sc, XFS_ATTR_FORK, 0, &error))
                 goto out;
+
+        /* Did our listent function try to return any errors? */
+        if (sx.context.seen_enough < 0)
+                error = sx.context.seen_enough;
 out:
         return error;
 }