From owner-svn-src-projects@FreeBSD.ORG  Tue Aug 23 13:36:35 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 403601065672;
	Tue, 23 Aug 2011 13:36:35 +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 309A38FC14;
	Tue, 23 Aug 2011 13:36:35 +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 p7NDaZfh004809;
	Tue, 23 Aug 2011 13:36:35 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7NDaZYi004807;
	Tue, 23 Aug 2011 13:36:35 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201108231336.p7NDaZYi004807@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 23 Aug 2011 13:36:35 +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: r225112 - 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 &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Aug 2011 13:36:35 -0000

Author: mav
Date: Tue Aug 23 13:36:34 2011
New Revision: 225112
URL: http://svn.freebsd.org/changeset/base/225112

Log:
  Element descriptor is optional for SES devices. Respecting that, report
  empty string for SAF-TE devices where there is no descriptor, instead of
  returning confusing EINVAL error.

Modified:
  projects/zfsd/head/sys/cam/scsi/scsi_enc.c

Modified: projects/zfsd/head/sys/cam/scsi/scsi_enc.c
==============================================================================
--- projects/zfsd/head/sys/cam/scsi/scsi_enc.c	Tue Aug 23 13:36:09 2011	(r225111)
+++ projects/zfsd/head/sys/cam/scsi/scsi_enc.c	Tue Aug 23 13:36:34 2011	(r225112)
@@ -475,10 +475,6 @@ enc_ioctl(struct cdev *dev, u_long cmd, 
 		break;
 
 	case ENCIOC_GETELMDESC:
-		if (enc->enc_vec.get_elm_desc == NULL) {
-			error = EINVAL;
-			break;
-		}
 		error = copyin(addr, &elmd, sizeof(elmd));
 		if (error)
 			break;
@@ -486,9 +482,12 @@ enc_ioctl(struct cdev *dev, u_long cmd, 
 			error = EINVAL;
 			break;
 		}
-		error = enc->enc_vec.get_elm_desc(enc, &elmd);
-		if (error)
-			break;
+		if (enc->enc_vec.get_elm_desc != NULL) {
+			error = enc->enc_vec.get_elm_desc(enc, &elmd);
+			if (error)
+				break;
+		} else
+			elmd.elm_desc_len = 0;
 		error = copyout(&elmd, addr, sizeof(elmd));
 		break;