Skip to content

Commit d728f4e

Browse files
author
Darrick J. Wong
committed
xfs: allow the user to cancel repairs before we start writing
All online repair functions have the same structure: walk filesystem metadata structures gathering enough data to rebuild the structure, stage a new copy, and then commit the new copy. The gathering steps do not write anything to disk, so they are peppered with xchk_should_terminate calls to avoid softlockup warnings and to provide an opportunity to abort the repair (by killing xfs_scrub). However, it's not clear in the code base when is the last chance to abort cleanly without having to undo a bunch of structure. Therefore, add one more call to xchk_should_terminate (along with a comment) providing the sysadmin with the ability to abort before it's too late and to make it clear in the source code when it's no longer convenient or safe to abort a repair. As there are only four repair functions right now, this patch exists more to establish a precedent for subsequent additions than to deliver practical functionality. Signed-off-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Dave Chinner <dchinner@redhat.com>
1 parent d65eb8a commit d728f4e

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

fs/xfs/scrub/agheader_repair.c

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ xrep_superblock(
4949
if (error)
5050
return error;
5151

52+
/* Last chance to abort before we start committing fixes. */
53+
if (xchk_should_terminate(sc, &error))
54+
return error;
55+
5256
/* Copy AG 0's superblock to this one. */
5357
xfs_buf_zero(bp, 0, BBTOB(bp->b_length));
5458
xfs_sb_to_disk(bp->b_addr, &mp->m_sb);
@@ -424,6 +428,10 @@ xrep_agf(
424428
if (error)
425429
return error;
426430

431+
/* Last chance to abort before we start committing fixes. */
432+
if (xchk_should_terminate(sc, &error))
433+
return error;
434+
427435
/* Start rewriting the header and implant the btrees we found. */
428436
xrep_agf_init_header(sc, agf_bp, &old_agf);
429437
xrep_agf_set_roots(sc, agf, fab);
@@ -748,6 +756,10 @@ xrep_agfl(
748756
if (error)
749757
goto err;
750758

759+
/* Last chance to abort before we start committing fixes. */
760+
if (xchk_should_terminate(sc, &error))
761+
goto err;
762+
751763
/*
752764
* Update AGF and AGFL. We reset the global free block counter when
753765
* we adjust the AGF flcount (which can fail) so avoid updating any
@@ -995,6 +1007,10 @@ xrep_agi(
9951007
if (error)
9961008
return error;
9971009

1010+
/* Last chance to abort before we start committing fixes. */
1011+
if (xchk_should_terminate(sc, &error))
1012+
return error;
1013+
9981014
/* Start rewriting the header and implant the btrees we found. */
9991015
xrep_agi_init_header(sc, agi_bp, &old_agi);
10001016
xrep_agi_set_roots(sc, agi, fab);

0 commit comments

Comments
 (0)