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

MFC r198394:

Browse Source 
Make "Retrying Command" to be printed before actual retrying.
It should make debug/error log a bit more readable.
This commit is contained in:
Alexander Motin 2009-11-17 20:20:56 +00:00
parent 47a0c6b476
commit 844c81cb6d
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sys/cam/cam_periph.c
View File

@ -1767,16 +1767,27 @@ cam_periph_error(union ccb *ccb, cam_flags camflags,
break;
}
/*
* If we have and error and are booting verbosely, whine
* *unless* this was a non-retryable selection timeout.
*/
if (error != 0 && bootverbose &&
!(status == CAM_SEL_TIMEOUT && (camflags & CAM_RETRY_SELTO) == 0)) {
if (error != ERESTART) {
if (action_string == NULL)
action_string = "Unretryable Error";
xpt_print(ccb->ccb_h.path, "error %d\n", error);
xpt_print(ccb->ccb_h.path, "%s\n", action_string);
} else
xpt_print(ccb->ccb_h.path, "Retrying Command\n");
}
/* Attempt a retry */
if (error == ERESTART || error == 0) {
if (error == ERESTART || error == 0) {
if (frozen != 0)
ccb->ccb_h.status &= ~CAM_DEV_QFRZN;
if (error == ERESTART) {
action_string = "Retrying Command";
if (error == ERESTART)
xpt_action(ccb);
}
if (frozen != 0)
cam_release_devq(ccb->ccb_h.path,
relsim_flags,
@ -1785,21 +1796,5 @@ cam_periph_error(union ccb *ccb, cam_flags camflags,
/*getcount_only*/0);
}
/*
* If we have and error and are booting verbosely, whine
* *unless* this was a non-retryable selection timeout.
*/
if (error != 0 && bootverbose &&
!(status == CAM_SEL_TIMEOUT && (camflags & CAM_RETRY_SELTO) == 0)) {
if (action_string == NULL)
action_string = "Unretryable Error";
if (error != ERESTART) {
xpt_print(ccb->ccb_h.path, "error %d\n", error);
}
xpt_print(ccb->ccb_h.path, "%s\n", action_string);
}
return (error);
}