From: Eric Sandeen <sandeen@sandeen.net>
To: linux-xfs <linux-xfs@vger.kernel.org>
Subject: [PATCH 2/2] xfs_repair: continue after xfs_bunmapi deadlock avoidance
Date: Mon, 22 Oct 2018 23:08:49 -0500 [thread overview]
Message-ID: <18102abe-0101-bd08-dc5b-2f288dc0d8d3@sandeen.net> (raw)
In-Reply-To: <9070c949-2720-75ea-01c3-74261bf62f87@sandeen.net>
After commit:
15a8bcc xfs: fix multi-AG deadlock in xfs_bunmapi
xfs_bunmapi can legitimately return before all work is done.
Sadly nobody told xfs_repair, so it fires an assert:
phase6.c:1410: longform_dir2_rebuild: Assertion `done' failed.
Fix this by calling back in until all work is done, as we do
in the kernel.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1641116
Reported-by: Tomasz Torcz <tomek@pipebreaker.pl>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---
diff --git a/repair/phase6.c b/repair/phase6.c
index e017326..b87c751 100644
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -1317,7 +1317,7 @@ longform_dir2_rebuild(
xfs_fileoff_t lastblock;
xfs_inode_t pip;
dir_hash_ent_t *p;
- int done;
+ int done = 0;
/*
* trash directory completely and rebuild from scratch using the
@@ -1352,12 +1352,25 @@ longform_dir2_rebuild(
error);
/* free all data, leaf, node and freespace blocks */
- error = -libxfs_bunmapi(tp, ip, 0, lastblock, XFS_BMAPI_METADATA, 0,
- &done);
- if (error) {
- do_warn(_("xfs_bunmapi failed -- error - %d\n"), error);
- goto out_bmap_cancel;
- }
+ while (!done) {
+ error = -libxfs_bunmapi(tp, ip, 0, lastblock, XFS_BMAPI_METADATA,
+ 0, &done);
+ if (error) {
+ do_warn(_("xfs_bunmapi failed -- error - %d\n"), error);
+ goto out_bmap_cancel;
+ }
+ error = xfs_defer_finish(&tp);
+ if (error) {
+ do_warn(("defer_finish failed -- error - %d\n"), error);
+ goto out_bmap_cancel;
+ }
+ /*
+ * Close out trans and start the next one in the chain.
+ */
+ error = xfs_trans_roll_inode(&tp, ip);
+ if (error)
+ goto out_bmap_cancel;
+ }
ASSERT(done);
next prev parent reply other threads:[~2018-10-23 12:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-23 4:03 [PATCH 0/2] xfs_repair: two fixes Eric Sandeen
2018-10-23 4:04 ` [PATCH 1/2] xfs_repair: initialize realloced bplist in longform_dir2_entry_check Eric Sandeen
2018-10-23 4:23 ` Darrick J. Wong
2018-10-23 4:08 ` Eric Sandeen [this message]
2018-10-23 4:22 ` [PATCH 2/2] xfs_repair: continue after xfs_bunmapi deadlock avoidance Darrick J. Wong
2018-10-23 13:57 ` [PATCH 2/2 V2] " Eric Sandeen
2018-10-23 15:30 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=18102abe-0101-bd08-dc5b-2f288dc0d8d3@sandeen.net \
--to=sandeen@sandeen.net \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.