From nobody Sun Aug 6 06:10:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJTbQ4pvNz4mTVs; Sun, 6 Aug 2023 06:10:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJTbQ4Dlfz4crB; Sun, 6 Aug 2023 06:10:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691302258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+ws1hV432CGvrtgI80ORrwyAt0ktd6tmY8Eu3rQjr98=; b=mp6eGK/rIScJ8IbRnFVIOiv7y9p4jL4lMrEOx8qORexh1ATqUwHnhB/oUEDOuvIp6KHNsC WMyLqWTBGX5rYhufHs2/HSXgTCcNu+PIoNQ5Wbg0GwFIRTtM55pALinHkqqzm/yReuTA9i g98t6gqCo0lXPHLWLigucPtInULF8MJztYm65IdrU5sJe4SKMRxUk4K82UD/ZQuwbTcNX9 6ndOJdpQ0CCC8Y8caR26efpLR84bSk+YeaPUIfBEoMb006uW1XT/kOFtkYpWib3zlMs9X6 9i9yqt2gicY74ozFfyd/DYm0lSd7zR8newBfnrWfBjcZbjO1Ca6B/PuooFAWQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691302258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+ws1hV432CGvrtgI80ORrwyAt0ktd6tmY8Eu3rQjr98=; b=O1Ajce3fn2BIi/yuCZuqr0VTQWl6s6XgQp7z6br07bP8sTHk7cDatXmMYnBls0/Kd9ZXQJ vCAes/r0b47kPRC83ZGTU1Q3VUGwlDaT/n5AKqWeOehv7AKrBIDrzcYA2ShjvkFRQ/QqgU zj9WmgNPQkcJjPDPooZ44aZHxC32uOPhCYN7jaW/sIWgxYzf9m2bUsaLORF4XkqOn1KE0l eFFeQEJvS64dV/v0HVOGUP0Q1V5+hIxqzZ9LaB8kPJiR4xX2OyGSzxqRhuLlhDLYGiWRf8 nhe1/cDhar3w/KhZgBiYPpuVkn6A/wINUHFNcCQ4UQZG9de72AgmSYhzxIw1cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691302258; a=rsa-sha256; cv=none; b=Qo5TCTzOd8yBAiInburZmlaV9CEpFSoA2wBn8ZzKvZg5yL8JuMQfdPjY7HSotRUhjv6VzE J6GyYtxbqh7fyKWjSntfrBMfinQE5wxtd6b3QvcE9dcarffk+Ua0dYqzIJBjCrPUApIWqR XE43oc78DDCVoEbvST7nZMdO35tEIlbsdmvibZut/HUAg1RLzXZR2560W9OevwXPhK6Oqf k+zZtFt1C9ikyy0vz88+iuRGD2Qil6rbD+zQNa0kBEW0Er/geEioEHf+ihizQs6be+OSj5 qu5jpbbjGqbUzVs3aYmLiZGB7vgaveGcj6d46F1hC0PhYayS+FqGmGSeV60+yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJTbQ3J4mz10Yx; Sun, 6 Aug 2023 06:10:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3766Awme003310; Sun, 6 Aug 2023 06:10:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3766AwNn003309; Sun, 6 Aug 2023 06:10:58 GMT (envelope-from git) Date: Sun, 6 Aug 2023 06:10:58 GMT Message-Id: <202308060610.3766AwNn003309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 02b7bf07c5d2 - main - Improve dumpfs(8) error messages when a cylinder group read fails. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02b7bf07c5d2ec578fc044b60229c6e951f26087 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=02b7bf07c5d2ec578fc044b60229c6e951f26087 commit 02b7bf07c5d2ec578fc044b60229c6e951f26087 Author: Kirk McKusick AuthorDate: 2023-08-06 06:09:18 +0000 Commit: Kirk McKusick CommitDate: 2023-08-06 06:10:15 +0000 Improve dumpfs(8) error messages when a cylinder group read fails. Previously dumpfs(8) exited when a cylinder group read failed (such as a cylinder-group check-hash failure). Now an error message indicating the cylinder group number and the type of failure is printed and the output continues for the remaining cylinder groups. MFC-after: 1 week Sponsored-by: The FreeBSD Foundation --- sbin/dumpfs/dumpfs.c | 58 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c index a0767c39e6bf..739f281feb7f 100644 --- a/sbin/dumpfs/dumpfs.c +++ b/sbin/dumpfs/dumpfs.c @@ -74,6 +74,7 @@ static const char rcsid[] = #include #include #include +#include #include #define afs disk.d_fs @@ -89,7 +90,7 @@ static void dumpfreespacecg(int); static int marshal(const char *); static void pbits(void *, int); static void pblklist(void *, int, off_t, int); -static void ufserr(const char *); +static const char *ufserr(void); static void usage(void) __dead2; int @@ -132,7 +133,7 @@ main(int argc, char *argv[]) while ((name = *argv++) != NULL) { if (ufs_disk_fillout_blank(&disk, name) == -1 || sbfind(&disk, 0) == -1) { - ufserr(name); + printf("\n%s: %s\n", name, ufserr()); eval |= 1; continue; } @@ -163,7 +164,7 @@ dumpfs(const char *name, int dosb) time_t fstime, fsmtime; int64_t fssize; int32_t fsflags; - int i; + int i, ret; switch (disk.d_ufs) { case 2: @@ -188,7 +189,8 @@ dumpfs(const char *name, int dosb) afs.fs_ncg, (intmax_t)fssize, (intmax_t)afs.fs_dsize); break; default: - goto err; + printf("Unknown filesystem type %d\n", disk.d_ufs); + return (1); } printf("bsize\t%d\tshift\t%d\tmask\t0x%08x\n", afs.fs_bsize, afs.fs_bshift, afs.fs_bmask); @@ -243,7 +245,8 @@ dumpfs(const char *name, int dosb) afs.fs_old_nsect, afs.fs_old_npsect, afs.fs_old_spc); break; default: - goto err; + printf("Unknown filesystem type %d\n", disk.d_ufs); + return (1); } printf("old_cpg\t%d\tsize_cg\t%zu\tCGSIZE\t%zu\n", afs.fs_old_cpg, sizeof(struct cg), CGSIZE(&afs)); @@ -329,14 +332,15 @@ dumpfs(const char *name, int dosb) } if (dosb) return (0); + ret = 0; while ((i = cgread(&disk)) != 0) { - if (i == -1 || dumpcg()) - goto err; + if (i == -1) { + ret = 1; + printf("\ncg %d: %s\n", disk.d_lcg, ufserr()); + } else if (dumpcg()) + ret = 1; } - return (0); - -err: ufserr(name); - return (1); + return (ret); } static int @@ -402,17 +406,22 @@ dumpcg(void) static int dumpfreespace(const char *name, int fflag) { - int i; + intmax_t startblkno; + int i, ret; + ret = 0; while ((i = cgread(&disk)) != 0) { - if (i == -1) - goto err; - dumpfreespacecg(fflag); + if (i != -1) { + dumpfreespacecg(fflag); + } else { + startblkno = disk.d_lcg * afs.fs_fpg; + printf("\nBlocks %jd-%jd of cg %d skipped: %s\n", + startblkno, startblkno + afs.fs_fpg - 1, + disk.d_lcg, ufserr()); + ret = 1; + } } - return (0); -err: - ufserr(name); - return (1); + return (ret); } static void @@ -521,13 +530,14 @@ pblklist(void *vp, int max, off_t offset, int fflag) } } -static void -ufserr(const char *name) +static const char * +ufserr(void) { if (disk.d_error != NULL) - warnx("%s: %s", name, disk.d_error); - else if (errno) - warn("%s", name); + return(disk.d_error); + if (errno) + return (strerror(errno)); + return ("unknown error"); } static void