From: Darrick J. Wong Date: Mon, 8 Jan 2018 18:49:02 +0000 (-0800) Subject: xfs: ignore agfl read errors when not scrubbing agfl X-Git-Tag: v4.16-rc1~143^2~80 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a0f433745ead12f485da2213fa0c473ed613a45;p=thirdparty%2Fkernel%2Flinux.git xfs: ignore agfl read errors when not scrubbing agfl In xfs_scrub_ag_read_headers, if we're not scrubbing the AGFL but hit a read error reading the AGFL, we should reset the error code so that it doesn't propagate up into the caller. Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner --- diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c index 98452ad58cffe..6ec4e1013ac08 100644 --- a/fs/xfs/scrub/common.c +++ b/fs/xfs/scrub/common.c @@ -302,7 +302,7 @@ xfs_scrub_ag_read_headers( error = xfs_alloc_read_agfl(mp, sc->tp, agno, agfl); if (error && want_ag_read_header_failure(sc, XFS_SCRUB_TYPE_AGFL)) goto out; - + error = 0; out: return error; }