From nobody Wed Feb 23 21:40:04 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 754B519EC31E; Wed, 23 Feb 2022 21:40:05 +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 4K3qFd1Zc0z4WWF; Wed, 23 Feb 2022 21:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645652405; 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=4RfTdTQDkaeOTiOn9KXwEMUQ6tx0xCv97xOFQfCYe6U=; b=G2/Vw8Kp4ZCc6Y7ZeU/wKLYp4qvStIpPTXJ6q3lbcYgi4TehXsmpnh9sj9aNUudaWzxNYe GWtdQjvGGBl8yLJV5Ya54l7+r4eHic5HNUWaCUmbAVWeLKt1QhTB6YrnecSVahUmMaUI1z WXbzxYrOjh9J1DioJU5JHjhjp229ro1aDoBEAmwD0mUgZOwiPk3W+a47Y373hY5xrUGMyH bA5GEUQkTN5WeMImnKAqaTc9mlOMGnQTAnsU7RCq8wxuS/JZ4AEZ/bDQCyQUy5i/Fl3KYC ys0nZ8RrcG8yEOKXLAw5ye+aqkoSshsQMpjmwk/1QnxBTz4aFQ0ylXckWdgAFQ== 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 12C6F1F939; Wed, 23 Feb 2022 21:40:05 +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 21NLe4b9001510; Wed, 23 Feb 2022 21:40:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21NLe4Uf001507; Wed, 23 Feb 2022 21:40:04 GMT (envelope-from git) Date: Wed, 23 Feb 2022 21:40:04 GMT Message-Id: <202202232140.21NLe4Uf001507@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 077ab5bd43aa - main - bio: make _bio_cflags match bio_cflags 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 077ab5bd43aaeb955d84c501ddddc7533f0a06b9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645652405; 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=4RfTdTQDkaeOTiOn9KXwEMUQ6tx0xCv97xOFQfCYe6U=; b=SuRU/eJY49RfiRpLxiJlQLWhGFRwjYuqCdVGTohJf8u2H2lqFiuG1xvKGzx8gzW6iMm/B2 a03+GKz7tI5E7rkYYtM1JgwYJPFKYATltxqwyTaUABjwSW+qzZ0NXnkoO+QiCFRzFpw1sy Xa6v2E0NttuQDWuiMM4s7HYzrONH30uaI3AtwgLw1hbcgn2I2/S0OMuJTPio74+Dt63O8D j5FSTlZLHceYqXRZrr2bO0luaPD2q05/3siaI4+wfg99rWqSb9zE1uYKJKjWPFYinQd/SS r5OJecQcNWPiNhO28aevVAL7c3AnxryjCV88FDoCi3HOdS4RRpA1XvkcM9DLqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645652405; a=rsa-sha256; cv=none; b=maV3vHFJQE2NeK53ACwnRPOZNrbdQpnFcC7uFPY7P1Lz36xfYDbuhBbwPrQQzajlJNuQiJ LmQlmZO+taCB41L4eFMMv0eTvQ/xo0UBmBSnBkgFupdI77uDso2zSpGhMrAEUayhZ55C9L nh4x8nA5K+JxGkpYFHhyw40sTZMFKAnLGbiZX/vtC3azr9jva5u3Sn8WCW7AKov/N/p5PS Hj1q+9L46hvtDIiJc3o9j+yWGH4w47L9oiTfKNR3xkwYYJaBM2/tQr5Kyfrb1ewOD88gOr FiM5rfGbwmdO/3zBuKNtqmysaUtrpd0jFlMKtTkQS4VdWS1HwATYeQd+d5zS6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=077ab5bd43aaeb955d84c501ddddc7533f0a06b9 commit 077ab5bd43aaeb955d84c501ddddc7533f0a06b9 Author: Warner Losh AuthorDate: 2022-02-23 21:28:16 +0000 Commit: Warner Losh CommitDate: 2022-02-23 21:35:52 +0000 bio: make _bio_cflags match bio_cflags While none of the in-tree geoms that modify the bio_cflags use the top half of the word, were they to do this in the future, we'd hit false positives for DIAGNOSTIC kernels. Make both uint16_t. MFC After: 1 week Sponsored by: Netflix --- sys/sys/bio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/bio.h b/sys/sys/bio.h index 90430b1e7099..e23c2f845e6c 100644 --- a/sys/sys/bio.h +++ b/sys/sys/bio.h @@ -126,7 +126,7 @@ struct bio { #ifdef DIAGNOSTIC void *_bio_caller1; void *_bio_caller2; - uint8_t _bio_cflags; + uint16_t _bio_cflags; #endif #if defined(BUF_TRACKING) || defined(FULL_BUF_TRACKING) struct buf *bio_track_bp; /* Parent buf for tracking */