From nobody Fri Apr 01 03:43:51 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 E32711A56C23; Fri, 1 Apr 2022 03:43:52 +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 4KV5cm2b7jz4rnm; Fri, 1 Apr 2022 03:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648784632; 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=ic7W9ZwecEaZULu1OjRd271T3LhGt3ybeBhNWB+i4sA=; b=nwEcwUBwICDggNcflrwMmQ2ZMVvMcbKHyDqKC+cKVXRSh+2DLcWgLbUaU1g4QMgf83scKa yp8FB0Ubux9Osg2XtrLxhFniAX74Z6XOpNqNGwfJ+P9RN/nSjWmX5d12qNuHDG7ZGdVOjx GgFnFuH8RO2ukJZt4P3ATr+8GY0bjsrexaqyIZYODB/s+WZxHDIsIo97ovkKNYZ8Js3/G/ wI6fnPSakpMtePuHUkZKajkgDDuwUxwfrfk1/I33b9HxDTrCgD/eRQzbuTxFJl1wFv5mQz oihOllDB+9kOeJtmVgxZZPNn/I+u+WqZZdlqrqaOobh5ScbCcKhJhexjWoECGA== 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 962D34E00; Fri, 1 Apr 2022 03:43:51 +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 2313hpFQ042886; Fri, 1 Apr 2022 03:43:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2313hphl042885; Fri, 1 Apr 2022 03:43:51 GMT (envelope-from git) Date: Fri, 1 Apr 2022 03:43:51 GMT Message-Id: <202204010343.2313hphl042885@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: 823b7f6ae0fc - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 823b7f6ae0fcf82067ae87da8890e17b958f9ab8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648784632; 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=ic7W9ZwecEaZULu1OjRd271T3LhGt3ybeBhNWB+i4sA=; b=Hhrkx/M0eVuclal6C3FNAcwaZFtSM6Ma6aMFMwxoY+2w+1amOMjvKnqE12IZgjOim1omoF l1QtO2z+QwMLlPOBtVptzz4JBR7JAcpSDgmSydECGSIfUptMZBC8aKCZw5tU6/hd/mAKJu I5r0pccsdYBYx8XLUIsyvBfFhNTAN/NXWn8xWqHGXKIo+da0cgdiHyPkIG/QGYk5Lpuz75 LmLtQh2IdxNR1zVhkcQwMlJRePly3Pr29gaz8nd7wcqtEbr1D5pmaflX14OuIWn/HPyoXC QdYHEW5HAEVVGP4i5wJQgADh1GInVkDHeuzWjXn04/35fPC+45fadkYiSVycRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648784632; a=rsa-sha256; cv=none; b=Kc06UrZG71nZSbXoA9iYfsbKzMnpsZcT8YxGkKWfB809ZxRo7DBRxzTtKQU4Yahmijr+bR etNVoeu5TeFa6us19TZernYvmXUkXdtZqOk+YWfbd8MfwEuS/S8ki5q26qsLWszDpFZUOd nseZwT8EU91oT9t6ZGB7YbFTl6YBQ60ZrJO/jRaHa38X18cKWCv4ZndjAN7Kket+QYmLkp eZyQjRLmr2QFEgIDbefw+qHr2GcM+kVTXhx+zoFoo2m7Y+F2I8+IkHL/xCgI2PvBvvSBum apZl466oyyFj2SDwyEgo3s3ess2YbVKErQWylzQObZfq+bfdApHCK1yokQE8dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=823b7f6ae0fcf82067ae87da8890e17b958f9ab8 commit 823b7f6ae0fcf82067ae87da8890e17b958f9ab8 Author: Warner Losh AuthorDate: 2022-02-23 21:28:16 +0000 Commit: Warner Losh CommitDate: 2022-04-01 03:43:35 +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 640d86ef134b..a828d24f9949 100644 --- a/sys/sys/bio.h +++ b/sys/sys/bio.h @@ -121,7 +121,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 */