svn commit: r325027 - head/sys/cam/ata

Warner Losh imp at FreeBSD.org
Thu Oct 26 22:53:59 UTC 2017


Author: imp
Date: Thu Oct 26 22:53:55 2017
New Revision: 325027
URL: https://svnweb.freebsd.org/changeset/base/325027

Log:
  We should be call adaerror() instead of cam_periph_error() always.
  
  Sponsored by: Netflix

Modified:
  head/sys/cam/ata/ata_da.c

Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c	Thu Oct 26 22:53:49 2017	(r325026)
+++ head/sys/cam/ata/ata_da.c	Thu Oct 26 22:53:55 2017	(r325027)
@@ -1080,8 +1080,8 @@ adadump(void *arg, void *virtual, vm_offset_t physical
 		}
 		xpt_polled_action(&ccb);
 
-		error = cam_periph_error(&ccb,
-		    0, SF_NO_RECOVERY | SF_NO_RETRY, NULL);
+		error = adaerror(&ccb,
+		    0, SF_NO_RECOVERY | SF_NO_RETRY);
 		if ((ccb.ccb_h.status & CAM_DEV_QFRZN) != 0)
 			cam_release_devq(ccb.ccb_h.path, /*relsim_flags*/0,
 			    /*reduction*/0, /*timeout*/0, /*getcount_only*/0);
@@ -1116,8 +1116,8 @@ adadump(void *arg, void *virtual, vm_offset_t physical
 			ata_28bit_cmd(&ccb.ataio, ATA_FLUSHCACHE, 0, 0, 0);
 		xpt_polled_action(&ccb);
 
-		error = cam_periph_error(&ccb,
-		    0, SF_NO_RECOVERY | SF_NO_RETRY, NULL);
+		error = adaerror(&ccb,
+		    0, SF_NO_RECOVERY | SF_NO_RETRY);
 		if ((ccb.ccb_h.status & CAM_DEV_QFRZN) != 0)
 			cam_release_devq(ccb.ccb_h.path, /*relsim_flags*/0,
 			    /*reduction*/0, /*timeout*/0, /*getcount_only*/0);


More information about the svn-src-all mailing list