From nobody Wed Mar 09 20:52:55 2022 X-Original-To: dev-commits-src-branches@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 C69851A14915; Wed, 9 Mar 2022 20:52:56 +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 4KDPXm1GP0z3QXY; Wed, 9 Mar 2022 20:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646859176; 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=Kr/wp0+3/z/vwyQskhKpexAxZknlzbp8cay5M+nImlA=; b=KNCz31HjP9pTULKAWblAicWEYYJBtoeAdKrKNSdOmesn22MaegO3+2Ue16lAOvbRcbYgnS 7t0IkUZfQCb+g6kACRRqYBAj/wK6Ky11rvSwEiEDxQasMHiFZuMWM1R41qXRztscvt8OJZ rA6j8HLRY77x3ju2Z/OjQKTPMUN42apy2xoUktY3Bg5LQdQiORIXpKBk14iQmMddFBP2eY kKM24UABb82gzAvimO8VLb/vTDTAM+fZ+JToEqgBOBUaAjlvc4BuEVRtcAVrxjad6mTTzK 3OS/9hhp06vmnvLsjL/XTJBVnFpjsOSe7aH9FVfdOJe23+zmnJyJYXvExToRoA== 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 D033417CCA; Wed, 9 Mar 2022 20:52:55 +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 229Kqtsv062226; Wed, 9 Mar 2022 20:52:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 229Kqt3F062225; Wed, 9 Mar 2022 20:52:55 GMT (envelope-from git) Date: Wed, 9 Mar 2022 20:52:55 GMT Message-Id: <202203092052.229Kqt3F062225@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: cfe041a6d120 - stable/13 - bio: make _bio_cflags match bio_cflags List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: cfe041a6d1208458bfae4a1c499895790b31d7a2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646859176; 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=Kr/wp0+3/z/vwyQskhKpexAxZknlzbp8cay5M+nImlA=; b=R6sgY8xyL2SOyqKHbsFgldvozfgbuZNRFXaWztPJAEWqaIUwisjuckBalLMPQFZdyjBVQk +CWCHM1sYVzyPHFjyuBZcCXUVKPck0KjHLCRg1bOSCMGFAxFjVLyjZYux8Po708K/oeGaB JrZZyVe+uem+K6i3XxjsmU+Mtm6aqWjq2OrG9Ic9fQaW2sZGJ58vpzFBuuF8zArwuLtgfv DvMmlnR6fzfhlWa3DVyvSmCn7tuYP+rIJT0R11gDX+Zxn9JsAIWZDZuUuYWz/3iGtnAfGh O4IqFEETH/QQCQDBj9BHPf5GrztFpsWHSI96/nPamVubfyXWy/7wP+aP3rK5kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646859176; a=rsa-sha256; cv=none; b=jAv6cqz7oRtOMeyChfcO8kPTy4SpyAIKGrO458qaodin2rxrItekTM0FiWDU4g4WWPKZ6N wkW8ztpRsGQkHbOqKFb3cm2ZO6jGrwkIxuJFsqe8Bik1AUVwmRaAW/p41EA2mrUQaAqNRm 0G2RT42Pr+TY7yAS8oj90hWhJGi7tcXz1P+FnRp+Y0SF5g8fOXFQD7mAfEY19xTUHF5BSH O5YEGwocPTjke3u8zASAMVg32535l7AI4EnjuKIFEUBmgqIVrSI1XP+AUPAQaRGpEm67Uz y+9Raw3B1BaWMyNhFj95N5PFj9va6/7Fkhw0zPP4bsqizvbGEgTzStgjh3P7ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cfe041a6d1208458bfae4a1c499895790b31d7a2 commit cfe041a6d1208458bfae4a1c499895790b31d7a2 Author: Warner Losh AuthorDate: 2022-02-23 21:28:16 +0000 Commit: Warner Losh CommitDate: 2022-03-09 20:52:23 +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 (cherry picked from commit 077ab5bd43aaeb955d84c501ddddc7533f0a06b9) --- 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 88eeea427da3..f70083b1d56f 100644 --- a/sys/sys/bio.h +++ b/sys/sys/bio.h @@ -125,7 +125,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 */