linux-xfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: sandeen@sandeen.net
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 6/5] xfs_repair: print better information when metadata updates fail
Date: Wed, 30 Oct 2019 10:52:56 -0700	[thread overview]
Message-ID: <20191030175256.GP15222@magnolia> (raw)
In-Reply-To: <157176999124.1458930.5678023201951458107.stgit@magnolia>

From: Darrick J. Wong <darrick.wong@oracle.com>

If a metadata update fails during phase 6, we should print an error
message that can be traced back to a specific line of code.  Also,
res_failed spits out a general message about "xfs_trans_reserve failed",
which is probably not where the failure happened.  Fix two incorrect
call sites.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 repair/phase6.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/repair/phase6.c b/repair/phase6.c
index 28e633de..91d208a6 100644
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -1354,7 +1354,8 @@ longform_dir2_rebuild(
 
 	error = dir_binval(tp, ip, XFS_DATA_FORK);
 	if (error)
-		res_failed(error);
+		do_error(_("error %d invalidating directory %llu blocks\n"),
+				error, (unsigned long long)ip->i_ino);
 
 	if ((error = -libxfs_bmap_last_offset(ip, &lastblock, XFS_DATA_FORK)))
 		do_error(_("xfs_bmap_last_offset failed -- error - %d\n"),
@@ -2972,7 +2973,10 @@ process_dir_inode(
 					XFS_ILOG_CORE | XFS_ILOG_DDATA);
 				error = -libxfs_trans_commit(tp);
 				if (error)
-					res_failed(error);
+					do_error(
+_("error %d fixing shortform directory %llu\n"),
+						error,
+						(unsigned long long)ip->i_ino);
 			} else  {
 				libxfs_trans_cancel(tp);
 			}

  parent reply	other threads:[~2019-10-30 17:53 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-22 18:46 [PATCH 0/5] xfsprogs: random fixes Darrick J. Wong
2019-10-22 18:46 ` [PATCH 1/5] xfs_spaceman: always report sick metadata, checked or not Darrick J. Wong
2019-11-01 18:17   ` Eric Sandeen
2019-11-01 18:40     ` Darrick J. Wong
2019-11-01 18:44       ` Darrick J. Wong
2019-10-22 18:46 ` [PATCH 2/5] xfs_db: btheight should check geometry more carefully Darrick J. Wong
2019-11-01 18:21   ` Eric Sandeen
2019-10-22 18:46 ` [PATCH 3/5] xfs_scrub: report repair activities on stdout, not stderr Darrick J. Wong
2019-11-01 18:26   ` Eric Sandeen
2019-11-01 18:42     ` Darrick J. Wong
2019-10-22 18:46 ` [PATCH 4/5] xfs_scrub: don't allow error or negative error injection interval Darrick J. Wong
2019-11-01 18:31   ` Eric Sandeen
2019-10-22 18:47 ` [PATCH 5/5] libfrog: fix workqueue_add error out Darrick J. Wong
2019-11-01 18:33   ` Eric Sandeen
2019-10-30 17:52 ` Darrick J. Wong [this message]
2019-11-01 18:42   ` [PATCH 6/5] xfs_repair: print better information when metadata updates fail Eric Sandeen
2019-10-30 17:53 ` [PATCH 7/5] libxfs: fix typo in message about write verifier Darrick J. Wong
2019-11-01 18:44   ` Eric Sandeen
2019-11-01 18:52 ` [PATCH 8/5] mkfs: fix incorrect error message Darrick J. Wong
2019-11-01 19:28   ` Eric Sandeen

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=20191030175256.GP15222@magnolia \
    --to=darrick.wong@oracle.com \
    --cc=linux-xfs@vger.kernel.org \
    --cc=sandeen@sandeen.net \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).