From: "Darrick J. Wong" <djwong@kernel.org>
To: djwong@kernel.org, cem@kernel.org
Cc: Christoph Hellwig <hch@lst.de>,
cmaiolino@redhat.com, linux-xfs@vger.kernel.org,
hch@infradead.org
Subject: [PATCH 4/5] xfs_scrub: don't fail while reporting media scan errors
Date: Mon, 15 Apr 2024 17:59:36 -0700 [thread overview]
Message-ID: <171322881860.210882.17298350569545046088.stgit@frogsfrogsfrogs> (raw)
In-Reply-To: <171322881805.210882.5445286603045179895.stgit@frogsfrogsfrogs>
From: Darrick J. Wong <djwong@kernel.org>
If we can't open a file to report that it has media errors, just log
that fact and move on. In this case we want to keep going with phase 6
so we report as many errors as possible.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
scrub/phase6.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/scrub/phase6.c b/scrub/phase6.c
index 393d9eaa83d8..193d3b4e9083 100644
--- a/scrub/phase6.c
+++ b/scrub/phase6.c
@@ -21,6 +21,7 @@
#include "read_verify.h"
#include "spacemap.h"
#include "vfs.h"
+#include "common.h"
/*
* Phase 6: Verify data file integrity.
@@ -291,13 +292,14 @@ report_inode_loss(
/* Try to open the inode. */
fd = scrub_open_handle(handle);
if (fd < 0) {
- error = errno;
- if (error == ESTALE)
- return error;
+ /* Handle is stale, try again. */
+ if (errno == ESTALE)
+ return ESTALE;
- str_info(ctx, descr,
-_("Disappeared during read error reporting."));
- return error;
+ str_error(ctx, descr,
+ _("Could not open to report read errors: %s."),
+ strerror(errno));
+ return 0;
}
/* Go find the badness. */
@@ -353,10 +355,18 @@ report_dirent_loss(
fd = openat(dir_fd, dirent->d_name,
O_RDONLY | O_NOATIME | O_NOFOLLOW | O_NOCTTY);
if (fd < 0) {
+ char descr[PATH_MAX + 1];
+
if (errno == ENOENT)
return 0;
- str_errno(ctx, path);
- return errno;
+
+ snprintf(descr, PATH_MAX, "%s/%s", path, dirent->d_name);
+ descr[PATH_MAX] = 0;
+
+ str_error(ctx, descr,
+ _("Could not open to report read errors: %s."),
+ strerror(errno));
+ return 0;
}
/* Go find the badness. */
next prev parent reply other threads:[~2024-04-16 0:59 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-16 0:51 [PATCHBOMB v3] xfsprogs: everything headed towards 6.9 Darrick J. Wong
2024-04-16 0:57 ` [PATCHSET 1/4] xfsprogs: bug fixes for 6.8 Darrick J. Wong
2024-04-16 0:58 ` [PATCH 1/5] xfs_repair: double-check with shortform attr verifiers Darrick J. Wong
2024-04-16 0:59 ` [PATCH 2/5] xfs_db: improve number extraction in getbitval Darrick J. Wong
2024-04-16 4:53 ` Christoph Hellwig
2024-04-16 0:59 ` [PATCH 3/5] xfs_scrub: fix threadcount estimates for phase 6 Darrick J. Wong
2024-04-16 4:53 ` Christoph Hellwig
2024-04-16 0:59 ` Darrick J. Wong [this message]
2024-04-16 0:59 ` [PATCH 5/5] xfs_io: add linux madvise advice codes Darrick J. Wong
2024-04-17 7:34 ` [PATCHSET 1/4] xfsprogs: bug fixes for 6.8 Carlos Maiolino
2024-04-17 15:30 ` Darrick J. Wong
2024-04-16 0:58 ` [PATCHSET 2/4] libxfs: sync with 6.9 Darrick J. Wong
2024-04-16 1:00 ` [PATCH 088/111] libxfs: teach buftargs to maintain their own buffer hashtable Darrick J. Wong
2024-04-16 1:00 ` [PATCH 089/111] libxfs: add xfile support Darrick J. Wong
2024-04-16 1:00 ` [PATCH 090/111] libxfs: partition memfd files to avoid using too many fds Darrick J. Wong
2024-04-16 4:55 ` Christoph Hellwig
2024-04-16 15:49 ` Darrick J. Wong
2024-04-16 16:29 ` Christoph Hellwig
2024-04-16 16:57 ` Darrick J. Wong
2024-04-16 18:47 ` Christoph Hellwig
2024-04-16 18:55 ` Darrick J. Wong
2024-04-24 17:20 ` [PATCH v3.1 " Darrick J. Wong
2024-04-16 1:00 ` [PATCH 091/111] xfs: teach buftargs to maintain their own buffer hashtable Darrick J. Wong
2024-04-16 1:01 ` [PATCH 092/111] libxfs: support in-memory buffer cache targets Darrick J. Wong
2024-04-16 0:58 ` [PATCHSET v30.3 3/4] xfsprogs: bmap log intent cleanups Darrick J. Wong
2024-04-16 1:01 ` [PATCH 1/4] libxfs: remove kmem_alloc, kmem_zalloc, and kmem_free Darrick J. Wong
2024-04-16 4:55 ` Christoph Hellwig
2024-04-16 1:01 ` [PATCH 2/4] libxfs: add a bi_entry helper Darrick J. Wong
2024-04-16 4:55 ` Christoph Hellwig
2024-04-16 1:01 ` [PATCH 3/4] libxfs: reuse xfs_bmap_update_cancel_item Darrick J. Wong
2024-04-16 4:55 ` Christoph Hellwig
2024-04-16 1:02 ` [PATCH 4/4] libxfs: add a xattr_entry helper Darrick J. Wong
2024-04-16 4:56 ` Christoph Hellwig
2024-04-16 0:58 ` [PATCHSET v30.3 4/4] xfs_repair: minor fixes Darrick J. Wong
2024-04-16 1:02 ` [PATCH 1/1] xfs_repair: check num before bplist[num] Darrick J. Wong
2024-04-16 4:56 ` Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2024-04-17 21:16 [PATCHSET 06/11] xfsprogs: bug fixes for 6.8 Darrick J. Wong
2024-04-17 21:40 ` [PATCH 4/5] xfs_scrub: don't fail while reporting media scan errors Darrick J. Wong
2024-03-26 2:55 [PATCHSET 04/18] xfsprogs: bug fixes for 6.8 Darrick J. Wong
2024-03-26 3:21 ` [PATCH 4/5] xfs_scrub: don't fail while reporting media scan errors Darrick J. Wong
2024-03-26 5:15 ` Christoph Hellwig
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=171322881860.210882.17298350569545046088.stgit@frogsfrogsfrogs \
--to=djwong@kernel.org \
--cc=cem@kernel.org \
--cc=cmaiolino@redhat.com \
--cc=hch@infradead.org \
--cc=hch@lst.de \
--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 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 read-only IMAP folder(s) and NNTP newsgroup(s).