From nobody Sun Dec 04 06:53:57 2022 X-Original-To: dev-commits-src-all@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 4NPy8612pxz4jZ5w; Sun, 4 Dec 2022 06:53: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 4NPy860PCGz3CQm; Sun, 4 Dec 2022 06:53:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670136838; 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=6E4Q7PHPcjtjndTZiQmyYJfAO0XRuigd0fU+BhHIQng=; b=T8cjiItBtZgOVu5KuEd8IuJqkiNxHYE0XkzkH8pvta6tPLz64A9cfUGEND7LxWAwWJtWx6 33QrLsgS8kzonv/pV4asUELjE3CijWggBrU9+GjBHj5UQOrX/IN0WHKyoufKseM7Ua5uZJ Px1tRbQSP6nf+YT5QltUhG7iY0k3BJb1ccbHOSG3C5U53H7xpKd8EacTgLSY+pHsO1VEe6 DppGAcvv/83lQ4MaMTKEjfp+JNAux0Ye50v8Q3q21X7QlGnf07i3NoinUfWjBt5Nhh5sRQ 6060IhTKoiupYRPZob9yDC8xVPYdSWMJlSU81Q2UrKEus32bydRriFUDn9RnLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670136838; 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=6E4Q7PHPcjtjndTZiQmyYJfAO0XRuigd0fU+BhHIQng=; b=qgHlkATXH/4YLX7i110741Z9Wg7eN/WcHjp6j+9IA6jYO6K564MGhJ/xRsn9smwWs9+G9F jiHiTqt//IkEQXUFho5uRcxKa4jwksZtnRwlt5dL+TQlniGAdYnY/t2M51lKrR8a6nWUEO z0kKR+Li+dMEfd5YT23VzwKWPnvM5tQaUYCbecU/l5FgXFmFP1ttzNUz1F8w8fDrpQUcNV 9tkfQUIUYyK+7O03chSekPY8SQIIjSzC1PsX885qDbbf3gDlNq0ZWuzcLyt7HjjanXpmeY NyVkmfotZ1henkpuVN2QGIOZXQax+I0f6jS5aY7iR69ZiLnEJmcDoWmtwxA3lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670136838; a=rsa-sha256; cv=none; b=Jpzq89jQTgFoIH9gKCddeVeZVnQFxUyH/8BxI5+14eQmlcgDQD6duTkx1+JaCGz4QXs3I1 yJrs1c2pQ/HqWs38nMUqPxypUiIK6W3AVV4VO1C5Aq5PitsgjC+Zwa+aMXIqjH3ioFmGEf RXKSsCMoNwF33YMsVr25KWhmUopmnbDn78tBr5fzo9d9OKDNiRDMH/bxgoTXJNhETb0lLx NMBZyqdjqxYk48NdbebovnwE+FFGsvoRAfa+Aske4DTygI0g1zO3sMjpbkjw4I2963ndqA a5no/KZr5DR1wSaX273Rb13FPZqvoAVaLsBtAcMFVESGbIUZJ/wyhbNkn0465Q== 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 4NPy856ZjSz1P6q; Sun, 4 Dec 2022 06:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B46rvVv072295; Sun, 4 Dec 2022 06:53:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B46rvfF072294; Sun, 4 Dec 2022 06:53:57 GMT (envelope-from git) Date: Sun, 4 Dec 2022 06:53:57 GMT Message-Id: <202212040653.2B46rvfF072294@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 43378dc6f882 - stable/13 - Clean up error output for extended attributes in fsck_ffs(8). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 43378dc6f8820e1479f1e206493b9f16d2dbc60a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=43378dc6f8820e1479f1e206493b9f16d2dbc60a commit 43378dc6f8820e1479f1e206493b9f16d2dbc60a Author: Kirk McKusick AuthorDate: 2022-11-07 22:31:59 +0000 Commit: Kirk McKusick CommitDate: 2022-12-04 06:18:13 +0000 Clean up error output for extended attributes in fsck_ffs(8). (cherry picked from commit f515a279f7200fb69763fedd716b1a5e32e2cae9) Sponsored by: The FreeBSD Foundation --- sbin/fsck_ffs/ea.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c index 54353005bdc0..f46d883e12ad 100644 --- a/sbin/fsck_ffs/ea.c +++ b/sbin/fsck_ffs/ea.c @@ -61,10 +61,9 @@ eascan(struct inodesc *idesc, struct ufs2_dinode *dp) return (0); #else struct bufarea *bp; - u_int dsize, n; + u_int n; u_char *cp; long blksiz; - char dbuf[DIRBLKSIZ]; printf("Inode %ju extsize %ju\n", (intmax_t)idesc->id_number, (uintmax_t)dp->di_extsize); @@ -74,8 +73,10 @@ eascan(struct inodesc *idesc, struct ufs2_dinode *dp) blksiz = sblock.fs_fsize; else blksiz = sblock.fs_bsize; - printf("blksiz = %ju\n", (intmax_t)blksiz); bp = getdatablk(dp->di_extb[0], blksiz, BT_EXTATTR); + if (bp->b_errs) + return (STOP); + printf("blksiz = %ju\n", (intmax_t)blksiz); cp = (u_char *)bp->b_un.b_buf; for (n = 0; n < blksiz; n++) { printf("%02x", cp[n]);