d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove verbose CTL messages.

Browse Source 
Reporting SCSI errors to console is often useless, pollutes logs and may
affect performance.  For debugging there is kern.cam.ctl.debug sysctl

MFC after:	1 week
This commit is contained in:
Alexander Motin 2015-08-09 09:54:29 +00:00
parent a61bd9573f
commit 4ddb055594
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/cam/ctl/ctl.c
View File

@ -1188,8 +1188,6 @@ ctl_init(void)
ctl_pool_free(other_pool);
return (error);
}
if (bootverbose)
printf("ctl: CAM Target Layer loaded\n");
/*
* Initialize the ioctl front end.
@ -1272,9 +1270,6 @@ ctl_shutdown(void)
free(control_softc, M_DEVBUF);
control_softc = NULL;
if (bootverbose)
printf("ctl: CAM Target Layer unloaded\n");
}
static int
@ -13651,7 +13646,7 @@ ctl_process_done(union ctl_io *io)
case CTL_IO_SCSI:
break;
case CTL_IO_TASK:
if (bootverbose || (ctl_debug & CTL_DEBUG_INFO))
if (ctl_debug & CTL_DEBUG_INFO)
ctl_io_error_print(io, NULL);
if (io->io_hdr.flags & CTL_FLAG_FROM_OTHER_SC)
ctl_free_io(io);
@ -13758,27 +13753,10 @@ bailout:
/*
* If enabled, print command error status.
* We don't print UAs unless debugging was enabled explicitly.
*/
do {
if ((io->io_hdr.status & CTL_STATUS_MASK) == CTL_SUCCESS)
break;
if (!bootverbose && (ctl_debug & CTL_DEBUG_INFO) == 0)
break;
if ((ctl_debug & CTL_DEBUG_INFO) == 0 &&
((io->io_hdr.status & CTL_STATUS_MASK) == CTL_SCSI_ERROR) &&
(io->scsiio.scsi_status == SCSI_STATUS_CHECK_COND)) {
int error_code, sense_key, asc, ascq;
scsi_extract_sense_len(&io->scsiio.sense_data,
io->scsiio.sense_len, &error_code, &sense_key,
&asc, &ascq, /*show_errors*/ 0);
if (sense_key == SSD_KEY_UNIT_ATTENTION)
break;
}
if ((io->io_hdr.status & CTL_STATUS_MASK) != CTL_SUCCESS &&
(ctl_debug & CTL_DEBUG_INFO) != 0)
ctl_io_error_print(io, NULL);
} while (0);
/*
* Tell the FETD or the other shelf controller we're done with this