From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Fri, 1 Feb 2019 17:08:52 +0000 (-0800)
Subject: xfs: abort xattr scrub if fatal signals are pending
X-Git-Tag: v5.1-rc1~137^2~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3258cb208caba74258ffdd8bd59972bbda9bfee1;p=thirdparty%2Fkernel%2Flinux.git

xfs: abort xattr scrub if fatal signals are pending

The extended attribute scrubber should abort the "read all attrs" loop
if there's a fatal signal pending on the process.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
---

diff --git a/fs/xfs/scrub/attr.c b/fs/xfs/scrub/attr.c
index 81d5e90547a16..9960bc5b5d765 100644
--- a/fs/xfs/scrub/attr.c
+++ b/fs/xfs/scrub/attr.c
@@ -82,6 +82,11 @@ xchk_xattr_listent(
 
 	sx = container_of(context, struct xchk_xattr, context);
 
+	if (xchk_should_terminate(sx->sc, &error)) {
+		context->seen_enough = 1;
+		return;
+	}
+
 	if (flags & XFS_ATTR_INCOMPLETE) {
 		/* Incomplete attr key, just mark the inode for preening. */
 		xchk_ino_set_preen(sx->sc, context->dp->i_ino);