From: Darrick J. Wong <djwong@kernel.org>
Date: Mon, 24 Feb 2025 18:21:43 +0000 (-0800)
Subject: xfs_scrub: don't complain if bulkstat fails
X-Git-Tag: v6.14.0~150
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3653b83e9076a15eb4e1340f566924292e5be233;p=thirdparty%2Fxfsprogs-dev.git

xfs_scrub: don't complain if bulkstat fails

If bulkstat fails, we fall back to loading the bulkstat array one
element at a time.  There's no reason to log errors.

Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/scrub/inodes.c b/scrub/inodes.c
index 4e4408f9..4d3ec07b 100644
--- a/scrub/inodes.c
+++ b/scrub/inodes.c
@@ -51,7 +51,6 @@
 static void
 bulkstat_for_inumbers(
 	struct scrub_ctx		*ctx,
-	struct descr			*dsc,
 	const struct xfs_inumbers	*inumbers,
 	struct xfs_bulkstat_req		*breq)
 {
@@ -66,13 +65,7 @@ bulkstat_for_inumbers(
 
 	/* First we try regular bulkstat, for speed. */
 	breq->hdr.ino = inumbers->xi_startino;
-	error = -xfrog_bulkstat(&ctx->mnt, breq);
-	if (error) {
-		char	errbuf[DESCR_BUFSZ];
-
-		str_info(ctx, descr_render(dsc), "%s",
-			 strerror_r(error, errbuf, DESCR_BUFSZ));
-	}
+	xfrog_bulkstat(&ctx->mnt, breq);
 
 	/*
 	 * Bulkstat might return inodes beyond xi_startino + CHUNKSIZE.  Reduce
@@ -239,7 +232,7 @@ scan_ag_bulkstat(
 	descr_set(&dsc_inumbers, &agno);
 	handle_from_fshandle(&handle, ctx->fshandle, ctx->fshandle_len);
 retry:
-	bulkstat_for_inumbers(ctx, &dsc_inumbers, inumbers, breq);
+	bulkstat_for_inumbers(ctx, inumbers, breq);
 
 	/* Iterate all the inodes. */
 	for (i = 0; !si->aborted && i < breq->hdr.ocount; i++, bs++) {