Date: Wed, 17 Aug 2011 17:14:15 +0000 From: oleksandr@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r225205 - in soc2011/oleksandr/oleksandr-head/head/sys: cam kern sys Message-ID: <20110817171415.124C31065674@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: oleksandr Date: Wed Aug 17 17:14:14 2011 New Revision: 225205 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=225205 Log: Change some field namew Modified: soc2011/oleksandr/oleksandr-head/head/sys/cam/cam_periph.c soc2011/oleksandr/oleksandr-head/head/sys/kern/subr_devstat.c soc2011/oleksandr/oleksandr-head/head/sys/sys/devicestat.h Modified: soc2011/oleksandr/oleksandr-head/head/sys/cam/cam_periph.c ============================================================================== --- soc2011/oleksandr/oleksandr-head/head/sys/cam/cam_periph.c Wed Aug 17 17:07:03 2011 (r225204) +++ soc2011/oleksandr/oleksandr-head/head/sys/cam/cam_periph.c Wed Aug 17 17:14:14 2011 (r225205) @@ -1744,13 +1744,13 @@ &error_code, &sense_key, &asc, &ascq); switch(sense_key) { case SSD_KEY_RECOVERED_ERROR: - error_flag_sense = DEVSTAT_ERROR_RECOVERED; + error_flag_sense = DEVSTAT_ERROR_RECOVERABLE; break; case SSD_KEY_NOT_READY: error_flag_sense = DEVSTAT_ERROR_NOT_READY; break; case SSD_KEY_MEDIUM_ERROR: - error_flag_sense = DEVSTAT_ERROR_MEDIUM_ERROR; + error_flag_sense = DEVSTAT_ERROR_MEDIA_ERROR; break; case SSD_KEY_HARDWARE_ERROR: error_flag_sense = DEVSTAT_ERROR_HARDWARE; Modified: soc2011/oleksandr/oleksandr-head/head/sys/kern/subr_devstat.c ============================================================================== --- soc2011/oleksandr/oleksandr-head/head/sys/kern/subr_devstat.c Wed Aug 17 17:07:03 2011 (r225204) +++ soc2011/oleksandr/oleksandr-head/head/sys/kern/subr_devstat.c Wed Aug 17 17:14:14 2011 (r225205) @@ -385,12 +385,12 @@ ds->dev_error.read_error++; if ((error_flag | DEVSTAT_ERROR_OTHER_ERROR) == error_flag) ds->dev_error.other_error++; - if ((error_flag | DEVSTAT_ERROR_RECOVERED) == error_flag) - ds->dev_error.recovered++; + if ((error_flag | DEVSTAT_ERROR_RECOVERABLE) == error_flag) + ds->dev_error.recoverable++; if ((error_flag | DEVSTAT_ERROR_NOT_READY) == error_flag) ds->dev_error.not_ready++; - if ((error_flag | DEVSTAT_ERROR_MEDIUM_ERROR) == error_flag) - ds->dev_error.medium_error++; + if ((error_flag | DEVSTAT_ERROR_MEDIA_ERROR) == error_flag) + ds->dev_error.media_error++; if ((error_flag | DEVSTAT_ERROR_HARDWARE) == error_flag) ds->dev_error.hardware++; if ((error_flag | DEVSTAT_ERROR_ILLEGAL_REQ) == error_flag) Modified: soc2011/oleksandr/oleksandr-head/head/sys/sys/devicestat.h ============================================================================== --- soc2011/oleksandr/oleksandr-head/head/sys/sys/devicestat.h Wed Aug 17 17:07:03 2011 (r225204) +++ soc2011/oleksandr/oleksandr-head/head/sys/sys/devicestat.h Wed Aug 17 17:14:14 2011 (r225205) @@ -103,9 +103,9 @@ DEVSTAT_ERROR_READ_ERROR = 0x004, DEVSTAT_ERROR_WRITE_ERROR = 0x008, DEVSTAT_ERROR_OTHER_ERROR = 0x010, - DEVSTAT_ERROR_RECOVERED = 0x020, + DEVSTAT_ERROR_RECOVERABLE = 0x020, DEVSTAT_ERROR_NOT_READY = 0x040, - DEVSTAT_ERROR_MEDIUM_ERROR = 0x080, + DEVSTAT_ERROR_MEDIA_ERROR = 0x080, DEVSTAT_ERROR_HARDWARE = 0x100, DEVSTAT_ERROR_ILLEGAL_REQ = 0x200 } devstat_error_flags; @@ -151,9 +151,9 @@ int read_error; int write_error; int other_error; - int recovered; + int recoverable; int not_ready; - int medium_error; + int media_error; int hardware; int illegal_req; } devstat_device_error;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110817171415.124C31065674>