Date: Wed, 30 Apr 2025 17:21:33 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 25607ef4852a - stable/14 - mpi3mr: Fix confusion over | and & Message-ID: <202504301721.53UHLXHZ093425@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=25607ef4852ac23cd699cad624500f7d55cdebd1 commit 25607ef4852ac23cd699cad624500f7d55cdebd1 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2023-12-11 02:44:47 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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); } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202504301721.53UHLXHZ093425>