svn commit: r225112 - projects/zfsd/head/sys/cam/scsi

[Alexander Motin]

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;