From owner-svn-src-projects@FreeBSD.ORG Sat Oct 1 15:10:33 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C29DB106566B; Sat, 1 Oct 2011 15:10:33 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9932E8FC0C; Sat, 1 Oct 2011 15:10:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p91FAXdw022905; Sat, 1 Oct 2011 15:10:33 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p91FAXVf022903; Sat, 1 Oct 2011 15:10:33 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201110011510.p91FAXVf022903@svn.freebsd.org> From: Alexander Motin Date: Sat, 1 Oct 2011 15:10:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225904 - projects/zfsd/head/sys/cam/scsi X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Oct 2011 15:10:33 -0000 Author: mav Date: Sat Oct 1 15:10:33 2011 New Revision: 225904 URL: http://svn.freebsd.org/changeset/base/225904 Log: - Do not report error if index found in next Additional Status descriptor is less then expected. Theoretically it may happen if Additional Status will be used for some new type in later spec. - Rephrase some error messages to make them a bit more informative. Modified: projects/zfsd/head/sys/cam/scsi/scsi_enc_ses.c Modified: projects/zfsd/head/sys/cam/scsi/scsi_enc_ses.c ============================================================================== --- projects/zfsd/head/sys/cam/scsi/scsi_enc_ses.c Sat Oct 1 13:54:48 2011 (r225903) +++ projects/zfsd/head/sys/cam/scsi/scsi_enc_ses.c Sat Oct 1 15:10:33 2011 (r225904) @@ -1757,7 +1757,7 @@ ses_process_elm_addlstatus(enc_softc_t * eip_hdr->element_index, SES_ELEM_INDEX_INDIVIDUAL); - if (iter.individual_element_index != expected_index + if (iter.individual_element_index > expected_index && status_type == TYPE_ADDLSTATUS_MANDATORY) { ENC_LOG(enc, "%s: provided element " "index %d skips mandatory status " @@ -2500,8 +2500,8 @@ ses_get_elm_addlstatus_sas(enc_softc_t * case ELMTYP_ARRAY_DEV: break; default: - ENC_LOG(enc, "Element %d Additional Status Invalid " - "for SAS device type 0: SES Typ 0x%x\n", nobj, + ENC_LOG(enc, "Element %d has Additional Status type 0, " + "invalid for SES element type 0x%x\n", nobj, ses_cache->ses_types[tidx].hdr->etype_elm_type); err = ENODEV; goto out; @@ -2518,8 +2518,9 @@ ses_get_elm_addlstatus_sas(enc_softc_t * case ELMTYP_ESCC: break; default: - ENC_LOG(enc, "Element %d Additional Status Invalid " - "for SAS device type 1\n", nobj); + ENC_LOG(enc, "Element %d has Additional Status type 1, " + "invalid for SES element type 0x%x\n", nobj, + ses_cache->ses_types[tidx].hdr->etype_elm_type); err = ENODEV; goto out; } @@ -2527,8 +2528,9 @@ ses_get_elm_addlstatus_sas(enc_softc_t * bufsiz, eip, nobj); break; default: - ENC_LOG(enc, "Element %d Additional Status Invalid Type %d for" - " SAS object\n", dtype, nobj); + ENC_LOG(enc, "Element %d of type 0x%x has Additional Status " + "of unknown type 0x%x\n", nobj, + ses_cache->ses_types[tidx].hdr->etype_elm_type, dtype); err = ENODEV; break; }