Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 8 Aug 2021 13:34:15 GMT
From:      Edward Tomasz Napierala <trasz@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: b0cf8194c236 - main - cam: revert half of 75b5caa08ef
Message-ID:  <202108081334.178DYFiR012784@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by trasz:

URL: https://cgit.FreeBSD.org/src/commit/?id=b0cf8194c2369b6a31960c52e0e47ac8c3b455d2

commit b0cf8194c2369b6a31960c52e0e47ac8c3b455d2
Author:     Edward Tomasz Napierala <trasz@FreeBSD.org>
AuthorDate: 2021-08-08 13:24:07 +0000
Commit:     Edward Tomasz Napierala <trasz@FreeBSD.org>
CommitDate: 2021-08-08 13:24:19 +0000

    cam: revert half of 75b5caa08ef
    
    This turns debugging printf() into a KASSERT().
    It's for ATA for now; SCSI will came later.
    
    Reviewed By:    imp
    Sponsored by:   NetApp, Inc.
    Sponsored by:   Klara, Inc.
    Differential Revision:  https://reviews.freebsd.org/D31380
---
 sys/cam/ata/ata_xpt.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c
index 946763342160..ee0fe65e2ada 100644
--- a/sys/cam/ata/ata_xpt.c
+++ b/sys/cam/ata/ata_xpt.c
@@ -1799,18 +1799,10 @@ ata_action(union ccb *start_ccb)
 {
 
 	if (start_ccb->ccb_h.func_code != XPT_ATA_IO) {
-#ifdef notyet
 		KASSERT((start_ccb->ccb_h.alloc_flags & CAM_CCB_FROM_UMA) == 0,
 		    ("%s: ccb %p, func_code %#x should not be allocated "
 		    "from UMA zone\n",
 		    __func__, start_ccb, start_ccb->ccb_h.func_code));
-#else
-		if ((start_ccb->ccb_h.alloc_flags & CAM_CCB_FROM_UMA) != 0) {
-			printf("%s: ccb %p, func_code %#x should not be allocated "
-			    "from UMA zone\n",
-			    __func__, start_ccb, start_ccb->ccb_h.func_code);
-		}
-#endif
 	}
 
 	switch (start_ccb->ccb_h.func_code) {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108081334.178DYFiR012784>