From nobody Mon Nov 7 22:33:03 2022 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 4N5mG7717Lz4gZdM; Mon, 7 Nov 2022 22:33:03 +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 4N5mG75SVPz4DxD; Mon, 7 Nov 2022 22:33:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667860383; 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=bUCgm3RTJazuAiNuiLOs9WCuCthFHVi9S/5JczzWfnc=; b=glHhhskPWP0IACtTl5rxofIqGLVbGYDbnpEeS0GVniVem1gUiO9vwR2lNtWL++SHRWrZvR 0n23aX5LtK7Nt/Bi2BF4zDCUCrLAzcceoEBmhHl/H6HePmcIDh29hwfdNhgFkGk2E5PzQ+ ngAd+H+qD9hQZMfWanUQb4QwI9cm7jcw2f3Nw3qgoH5uj0afDuRRazuXjeOPzNn+MIh5w4 IChvAud21zckkbcX6vyI+FVHBCtiQ0TDXsLTkXTGDVxv+OOMGd6XdlIlBmsL7dCpk5SwPZ 1XZzlk+3qFudoCuzIIG51oC5KpSSueaEPK8SpjH7BFlvgpr/AqfI3FMRrWv3Lw== 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 4N5mG74X92zJMJ; Mon, 7 Nov 2022 22:33:03 +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 2A7MX3TM051663; Mon, 7 Nov 2022 22:33:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A7MX39i051662; Mon, 7 Nov 2022 22:33:03 GMT (envelope-from git) Date: Mon, 7 Nov 2022 22:33:03 GMT Message-Id: <202211072233.2A7MX39i051662@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: f515a279f720 - main - Clean up error output for extended attributes in fsck_ffs(8). 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: f515a279f7200fb69763fedd716b1a5e32e2cae9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667860383; 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=bUCgm3RTJazuAiNuiLOs9WCuCthFHVi9S/5JczzWfnc=; b=PN/0iBJIi4nxdqEItFVFMaiHIeSiFM/rwGye0FJIkJGh+PXrl64D+L3ZTIzh7Ye6S/5MYp 50/ed2bPBnW4o6CR/GTVzEjrY2oN9ukKtlMhaFFEY0hbZy6Tfd0Tmq9iv27upoLgs06KfP L5wPRDboVG1hlOLQqmsEQSbYwZcrYgEv8xOrPtGMCGoQxDm5WINNwKT4JNOQUhTh2/uO3A ARbr3hDBTPU20yFN6wy2ne5JXRVTkLzWmvcqAt07uUzXZL9wIwhVoctjzZfpkWRa1V8inu 8WG8yPRvGGx+iRe0zKobkV55pRELcvB5vJ+/hJjQwUotSqIxLm/bxFIItEIAag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667860383; a=rsa-sha256; cv=none; b=IS0grnKJV8NLZ22g8R4GtZyhcFGXSfo2XT9uuGg8DcXGoM+gIjpbGAFm+M+a+S/fQE7t4V hYGCnBafQSe9gVO7UfOmIOa833VTJAjHg54LUk6cQYmb9shy8kWL/1VAtE3QssJ73vbjXI k7Zz85P2MhLTVeqfdgGVgGYKD/vxDnNre3Wl1JTn4hW2HEc4Cs+DgNYwRXugwQnoeV2Yd1 TFub+fnciABQVOErTNuFl8lkMSmJYj8ij2y1I1Jzsno7G5amh9tTQiIH5HOVM0KCyQXp3A qUZbcilvt7/FmR3JAGml9BIF2Xl5HlNKuPD0pPN2dqQY3RmpFH3XHUdZGSF7/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=f515a279f7200fb69763fedd716b1a5e32e2cae9 commit f515a279f7200fb69763fedd716b1a5e32e2cae9 Author: Kirk McKusick AuthorDate: 2022-11-07 22:31:59 +0000 Commit: Kirk McKusick CommitDate: 2022-11-07 22:32:42 +0000 Clean up error output for extended attributes in fsck_ffs(8). MFC after: 1 week 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]);