git: 0f49ecffb744 - main - cam: revert second half of 75b5caa08ef

[Edward Tomasz Napierala]

The branch main has been updated by trasz:

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

commit 0f49ecffb744762309b7dd7cf3b8f867d4fdc89d
Author:     Edward Tomasz Napierala <trasz at FreeBSD.org>
AuthorDate: 2021-09-01 09:34:27 +0000
Commit:     Edward Tomasz Napierala <trasz at FreeBSD.org>
CommitDate: 2021-09-01 09:35:27 +0000

    cam: revert second half of 75b5caa08ef
    
    This turns debugging printf() into a KASSERT().
    
    Reviewed By:    imp
    Sponsored by:   NetApp, Inc.
    Sponsored by:   Klara, Inc.
    Differential Revision:  https://reviews.freebsd.org/D31523
---
 sys/cam/scsi/scsi_xpt.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c
index c4c43ee87101..6bcf95506963 100644
--- a/sys/cam/scsi/scsi_xpt.c
+++ b/sys/cam/scsi/scsi_xpt.c
@@ -2620,18 +2620,10 @@ scsi_action(union ccb *start_ccb)
 {
 
 	if (start_ccb->ccb_h.func_code != XPT_SCSI_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) {