From nobody Fri Jun 24 02:55:47 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 0EAF6867B86; Fri, 24 Jun 2022 02:55:48 +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 4LThZW737Wz3vSj; Fri, 24 Jun 2022 02:55:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656039348; 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=QAQL3DwCOV9OIw5+wQhldlm8oO4xg2KpNjqk5EB/uR0=; b=XPdRuwgunIRjxi1mNqW7J4srlizObmd8YPC1zdclH4Na0IVmhReiKwFm7CREZT0XPXsnU+ FH8QEZAdyzmRi+uIjEaQ0OTzevaZC4jvyfI2hIvYdnF1IiUsgl5ck2/PWHCCS177vDnvzd AwiC5lM15nyU8i9wJD83huyA5X/yOgHTO6TDiHbHLDzgI4HJV4eaJdPZxGTewAwuVTX2r5 ma1VqyrVS3jTtoQUofkDvFriCgG6OIBpa3tDwA4w6oPHKivhVt9vfOkPXJ7h/e4dRWu8R5 bccBgrzkahq58G5v+R2ThiCpgnR1gfg6VPEJum5sapSfujwAKQd6X1JDYhHWnA== 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 CDFAF277AF; Fri, 24 Jun 2022 02:55:47 +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 25O2tluc021243; Fri, 24 Jun 2022 02:55:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25O2tlWn021242; Fri, 24 Jun 2022 02:55:47 GMT (envelope-from git) Date: Fri, 24 Jun 2022 02:55:47 GMT Message-Id: <202206240255.25O2tlWn021242@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: ce6296caa370 - main - Fix build break in 50dc4c7. 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: ce6296caa37086d52ab413744ed1d6a61caa2197 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656039348; 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=QAQL3DwCOV9OIw5+wQhldlm8oO4xg2KpNjqk5EB/uR0=; b=oKFvmrbe40rr6/Xhh6b3jWIwzu42xYwtSdUDDSRSrWUSHFCDcYUICYjFOOJvlzknV3pNlq J0kpHis7Hdkha75WhxJlDCsduABVZ4K/ldfTw/khAjKLLLqP6MeYtSfqNGg2KNL8VUL4x3 p0dg8tQViaZDqUI2i1vVzw0ii4Qrk7DTfuGH56m5wLpXR2sks03f5lWeybYe2ktBZdk1fk G6/HtwzZ4+AdPX4+EULcVCQyi6iEA5Z19noNpg0IQQCxim9SWx1ZCL0U1djNfDyZMhOy4Y 1QLuMxOpPvqyl26Wmh5aN4zI+NjoexjN7V9er5eX4IHhAEhcMhoqWDaKF7Hwhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656039348; a=rsa-sha256; cv=none; b=eX/tG/EFIKEoRraD+wZILwMN04GZTs8xk7U6c/q1jcs1AKGCfF7Pho2EQxe72QkateMjcb E1fK9lRy4IXzYZz5QtiqlJTPJlEKos8u2hBlWhLUI0i3ufWORM/eG32eT1rkh8nucFZZQ/ mL/4LEIzpbEyNu5SMvhhYQfJFdhU3Vlhq4O3ShLLDXhFBb5krhskb9oaauS3aNZZ7Zgfj7 9muycZ6POp6jmjCX8U/5nbiM9bpLC7X/sMkteXjv+MkWuHF9syZ6W6xiOpJFKqsKqpDQ4/ 2IbNJlfq0DyaNdnhOyY2Bi8ArXXeq4puLshVhgh2TQwEaRwY8QnbQLIg2PLbaA== 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=ce6296caa37086d52ab413744ed1d6a61caa2197 commit ce6296caa37086d52ab413744ed1d6a61caa2197 Author: Kirk McKusick AuthorDate: 2022-06-24 02:54:18 +0000 Commit: Kirk McKusick CommitDate: 2022-06-24 02:54:18 +0000 Fix build break in 50dc4c7. No functional change intended. MFC after: 1 month (with 076002f24d35) --- sys/ufs/ffs/ffs_subr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index b1e52f5964d9..f4c854172fb3 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -309,6 +309,7 @@ readsuper(void *devfd, struct fs **fsp, off_t sblockloc, int isaltsblk, * Verify the filesystem values. */ #define ILOG2(num) (fls(num) - 1) +#undef CHK #define CHK(lhs, op, rhs, fmt) \ if (lhs op rhs) { \ printf("UFS%d superblock failed: %s (" #fmt ") %s %s (" \