From nobody Wed Apr 30 17:21:33 2025 X-Original-To: dev-commits-src-all@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 4ZnkW22fK6z5tj1j; Wed, 30 Apr 2025 17:21:34 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZnkW16Gnxz3Lvh; Wed, 30 Apr 2025 17:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746033693; 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=lDg6x+9amn6fjPqGoeu/HEraEU7kOhMlzZysm5GyRLk=; b=MZl+qc7nxyS8DB8sIOQy94qabiXNmIbg+3Sv2zHk+C/Bc5MYHvlFxacZEGTIaJZ/2ufI2H AYyyekFwaEdlCqnS17s8QNko5+Neys4TD0JzIYq2H6LHVS1Gs98/HirQ40tyyuydTOMJ6i Dalqw5WhGVKq6wFPTkDQRIEXYmc3W8TF3Bnv3b0QjZUtOL1LI+HDErpb3za87whhL+4Uy7 zFTK+83q1MnfttZPgazeGSCmC/m/hvYPCv0nsQ4E43M1KCx6BIAsOXOuNrSTYEg2FWgRor wQA3+Al2eb/CNXHlCH9VBzMElxm6QIouzaFijJ4nL8ILQoRDfYAVxuglCkkM0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746033693; a=rsa-sha256; cv=none; b=t6sp8qFRC8y5KGb4gz4s4Ljyf0L2W4nQ/0uMnmiuA7iwn63eFJxF4boxbH8iOLTkFbiNgQ DWRrblL/o4oDf6Y7FuvNZNZYPn+/k/7hlw2Ux4DUPqvB64eG6LVZn+XN0SDBlIQvsqCcuJ fO5wng6ib53RWgw0YMAJuoTh4/YPUTAREmvTS0Mx0faKr1ThR2yrHPSzdqBIezJayXxpGE h6JL0uXCBzjPRHbNIRNLgdd4sb1u7ZNCtbmt/9jYL9RBSn6HZj36sPAUNQOWJhAArqzjTk mlKyeqQTQi09jxF3dJ8VdQrMJ8yv6x0y1vqaWPTwbSlOlBL0nHGETxmKeuTLhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746033693; 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=lDg6x+9amn6fjPqGoeu/HEraEU7kOhMlzZysm5GyRLk=; b=ZN4tCDNn8GtwBQ26gGBNiJIygQw62BymJvYbhHULzLh7/JU2OEJo8PtcXVaoh4wqiZJtCx tpOU8AT+6sL7vt4n/rR5YK89vYtLJg0eNaRm7BF/if3WZr/JM9iIgYtJDCudj9FpzM+0xg y8fSJpujlIX5OOiscgqCnZ741Z4+X06soEJ+kHHb3r1lTgpWBCQYmUwjeueTCy7I/5seDT 5eZetqpQxN2fCrBy/KBBvQrjcc/XKKnxI5F3JfPGkLUREfSuDinEOW+yvwnAcaMwNltJOj 9WMyj1yReZYYbY7uqEXQ1HA35E4I4FOpM6pIJ+/b0ApuuuTSw5VPjHloy6+AzA== 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 4ZnkW15cWlzRF; Wed, 30 Apr 2025 17:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53UHLXAH093428; Wed, 30 Apr 2025 17:21:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53UHLXHZ093425; Wed, 30 Apr 2025 17:21:33 GMT (envelope-from git) Date: Wed, 30 Apr 2025 17:21:33 GMT Message-Id: <202504301721.53UHLXHZ093425@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: 25607ef4852a - stable/14 - mpi3mr: Fix confusion over | and & List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 25607ef4852ac23cd699cad624500f7d55cdebd1 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=25607ef4852ac23cd699cad624500f7d55cdebd1 commit 25607ef4852ac23cd699cad624500f7d55cdebd1 Author: Warner Losh AuthorDate: 2023-12-11 02:44:47 +0000 Commit: Warner Losh CommitDate: 2025-04-30 17:05:50 +0000 mpi3mr: Fix confusion over | and & Use sc->mpi3mr_debug & MPI3MR_IOT over the | version to test if a bit is set. CID: 1529718 Sponsored by: Netflix (cherry picked from commit 34f0a01b6bd4ff0e61a7066729515148400e0982) --- sys/dev/mpi3mr/mpi3mr_cam.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c index 7cc7c76cc202..ed47d69832ba 100644 --- a/sys/dev/mpi3mr/mpi3mr_cam.c +++ b/sys/dev/mpi3mr/mpi3mr_cam.c @@ -1188,7 +1188,7 @@ mpi3mr_enqueue_request(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cm) mpi3mr_dprint(sc, MPI3MR_IOT, "VD: Setting divert flag for tg_id(%d), persist_id(%d)\n", tg->id, targ->per_id); - if (sc->mpi3mr_debug | MPI3MR_IOT) + if (sc->mpi3mr_debug & MPI3MR_IOT) mpi3mr_print_cdb(ccb); mpi3mr_set_io_divert_for_all_vd_in_tg(sc, tg, 1); @@ -1210,7 +1210,7 @@ mpi3mr_enqueue_request(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cm) mpi3mr_dprint(sc, MPI3MR_IOT, "PD: Setting divert flag for persist_id(%d)\n", targ->per_id); - if (sc->mpi3mr_debug | MPI3MR_IOT) + if (sc->mpi3mr_debug & MPI3MR_IOT) mpi3mr_print_cdb(ccb); } }