From owner-svn-src-all@FreeBSD.ORG  Thu Dec 20 19:51:33 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 7F3E7653;
 Thu, 20 Dec 2012 19:51:33 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 624638FC0C;
 Thu, 20 Dec 2012 19:51:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKJpXO7011034;
 Thu, 20 Dec 2012 19:51:33 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKJpXtt011032;
 Thu, 20 Dec 2012 19:51:33 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212201951.qBKJpXtt011032@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 20 Dec 2012 19:51:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244508 - head/sys/cam/scsi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 19:51:33 -0000

Author: mav
Date: Thu Dec 20 19:51:32 2012
New Revision: 244508
URL: http://svnweb.freebsd.org/changeset/base/244508

Log:
  Make SES driver to not fall out on some errors in Additional Status page.
  This allows CAM devices still get their physical paths even if status of
  later elements it corrupted.
  
  Sponsored by:	iXsystems, Inc.

Modified:
  head/sys/cam/scsi/scsi_enc_ses.c

Modified: head/sys/cam/scsi/scsi_enc_ses.c
==============================================================================
--- head/sys/cam/scsi/scsi_enc_ses.c	Thu Dec 20 19:47:46 2012	(r244507)
+++ head/sys/cam/scsi/scsi_enc_ses.c	Thu Dec 20 19:51:32 2012	(r244508)
@@ -1801,8 +1801,7 @@ ses_process_elm_addlstatus(enc_softc_t *
 			ENC_VLOG(enc, "Element %d Beyond End "
 			    "of Additional Element Status Descriptors\n",
 			    iter.global_element_index);
-			err = EIO;
-			goto out;
+			break;
 		}
 
 		/* Advance to the protocol data, skipping eip bytes if needed */
@@ -1831,7 +1830,7 @@ ses_process_elm_addlstatus(enc_softc_t *
 			ENC_VLOG(enc, "Element %d: Unknown Additional Element "
 			    "Protocol 0x%x\n", iter.global_element_index,
 			    ses_elm_addlstatus_proto(elmpriv->addl.hdr));
-			goto out;
+			break;
 		}
 
 		offset += proto_info_len;