From 78f6cceae1388dc15dab7cc520c38b63d99a63d7 Mon Sep 17 00:00:00 2001 From: dpgilbert <dpgilbert@4ea69e1a-61f1-4043-bf83-b5c94c648137> Date: Sat, 26 Feb 2022 01:02:56 +0000 Subject: [PATCH] NEWS: update for changes in previous commit; run untab of scsi source git-svn-id: https://svn.code.sf.net/p/smartmontools/code/trunk@5334 4ea69e1a-61f1-4043-bf83-b5c94c648137 --- smartmontools/ChangeLog | 4 ++++ smartmontools/NEWS | 6 +++++- smartmontools/scsiprint.cpp | 12 ++++++------ smartmontools/scsiprint.h | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/smartmontools/ChangeLog b/smartmontools/ChangeLog index 955f89880..ce9dcdfcc 100644 --- a/smartmontools/ChangeLog +++ b/smartmontools/ChangeLog @@ -1,5 +1,9 @@ $Id$ +2022-02-25 Douglas Gilbert <dgilbert@interlog.com> + + NEWS: update for changes in previous commit + 2022-02-25 Douglas Gilbert <dgilbert@interlog.com> smartctl.cpp, scsiprint.cpp: extend --log=defects option so it diff --git a/smartmontools/NEWS b/smartmontools/NEWS index 390185f03..8ab3f5ed0 100644 --- a/smartmontools/NEWS +++ b/smartmontools/NEWS @@ -11,11 +11,15 @@ Summary: smartmontools release 7.3 - smartctl '-j': Many additions to the JSON output for SCSI/SAS devices. - smartctl '-j': JSON output always includes timestamp, regardless of '-i'. - smartctl '-i' and '--identify': ATA ACS-5 enhancements. +- smartctl '-l defects': additionally works for SCSI Pending Defects log + subpage. +- smartctl '-l envrep': Prints SCSI Environmental Reporting log subpage. - smartctl '-l scterc[,R,W],p': Gets/sets the persistent power-on values. - smartctl '-l scterc,reset': Restores to manufacturer's default values. -- smartctl '-l scttemp': Prints SCSI Environmental Reporting log subpage. - smartctl '-l tapedevstat': Prints SCSI Tape Device Statistics log page. - smartctl '-l tapealert': Prints SCSI Tape Alert log page. +- smartctl '-l zdevstat': Prints SCSI Zoned Block Device Statistics log + subpage. - smartctl '-H': No longer checks and clears the SCSI Tape Alert log page unless the option is given twice. - smartctl '-H': No longer sets bit 2 of exit status if ATA attributes are diff --git a/smartmontools/scsiprint.cpp b/smartmontools/scsiprint.cpp index da10f2e11..f711d6685 100644 --- a/smartmontools/scsiprint.cpp +++ b/smartmontools/scsiprint.cpp @@ -3400,21 +3400,21 @@ scsiPrintMain(scsi_device * device, const scsi_print_options & options) scsiGetSupportedLogPages(device); checkedSupportedLogPages = true; } - if (options.smart_error_log) { + if (options.smart_error_log) { scsiPrintErrorCounterLog(device); any_output = true; - } + } if (gPendDefectsLPage) { scsiPrintPendingDefectsLPage(device); any_output = true; - } - if (options.smart_error_log) { + } + if (options.smart_error_log) { if (1 == scsiFetchControlGLTSD(device, modese_len, 1)) { pout("\n[GLTSD (Global Logging Target Save Disable) set. " "Enable Save with '-S on']\n"); any_output = true; - } - } + } + } } if (options.smart_selftest_log) { if (! checkedSupportedLogPages) { diff --git a/smartmontools/scsiprint.h b/smartmontools/scsiprint.h index 771d5a320..beb3322ed 100644 --- a/smartmontools/scsiprint.h +++ b/smartmontools/scsiprint.h @@ -58,7 +58,7 @@ struct scsi_print_options bool set_standby_now = false; // set drive to standby bool set_active = false; // set drive to active - int health_opt_count = 0; // TapeAlert log page only read if this value > 1 + int health_opt_count = 0; // TapeAlert log page only read if this value > 1 }; int scsiPrintMain(scsi_device * device, const scsi_print_options & options); -- GitLab