Author: mav
Date: Tue Nov 17 20:20:56 2009
New Revision: 199428
URL: http://svn.freebsd.org/changeset/base/199428
Log:
MFC r198394:
Make "Retrying Command" to be printed before actual retrying.
It should make debug/error log a bit more readable.
Modified:
stable/8/sys/cam/cam_periph.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/cam/cam_periph.c
==============================================================================
--- stable/8/sys/cam/cam_periph.c Tue Nov 17 20:19:20 2009
(r199427)
+++ stable/8/sys/cam/cam_periph.c Tue Nov 17 20:20:56 2009
(r199428)
@@ -1767,16 +1767,27 @@ cam_periph_error(union ccb *ccb, cam_fla
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_fla
/*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);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
