Author: mav
Date: Fri Jul 4 15:09:56 2014
New Revision: 268255
URL: http://svnweb.freebsd.org/changeset/base/268255
Log:
MFC r267051:
- Add support for SG_GET_SG_TABLESIZE IOCTL to report that we don't support
scatter/gather lists.
- Return error for still unsupported SG 3.x API read/write calls.
Modified:
stable/10/sys/cam/scsi/scsi_sg.c
stable/10/sys/compat/linux/linux_ioctl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/scsi/scsi_sg.c
==============================================================================
--- stable/10/sys/cam/scsi/scsi_sg.c Fri Jul 4 14:49:40 2014
(r268254)
+++ stable/10/sys/cam/scsi/scsi_sg.c Fri Jul 4 15:09:56 2014
(r268255)
@@ -627,6 +627,13 @@ sgioctl(struct cdev *dev, u_long cmd, ca
break;
}
+ case SG_GET_SG_TABLESIZE:
+ {
+ int *size = (int *)arg;
+ *size = 0;
+ break;
+ }
+
case SG_EMULATED_HOST:
case SG_SET_TRANSFORM:
case SG_GET_TRANSFORM:
@@ -638,7 +645,6 @@ sgioctl(struct cdev *dev, u_long cmd, ca
case SG_GET_ACCESS_COUNT:
case SG_SET_FORCE_LOW_DMA:
case SG_GET_LOW_DMA:
- case SG_GET_SG_TABLESIZE:
case SG_SET_FORCE_PACK_ID:
case SG_GET_PACK_ID:
case SG_SET_RESERVED_SIZE:
@@ -684,6 +690,12 @@ sgwrite(struct cdev *dev, struct uio *ui
if (error)
goto out_hdr;
+ /* XXX: We don't support SG 3.x read/write API. */
+ if (hdr->reply_len < 0) {
+ error = ENODEV;
+ goto out_hdr;
+ }
+
ccb = xpt_alloc_ccb();
if (ccb == NULL) {
error = ENOMEM;
Modified: stable/10/sys/compat/linux/linux_ioctl.c
==============================================================================
--- stable/10/sys/compat/linux/linux_ioctl.c Fri Jul 4 14:49:40 2014
(r268254)
+++ stable/10/sys/compat/linux/linux_ioctl.c Fri Jul 4 15:09:56 2014
(r268255)
@@ -2750,6 +2750,9 @@ linux_ioctl_sg(struct thread *td, struct
case LINUX_SG_GET_SCSI_ID:
args->cmd = SG_GET_SCSI_ID;
break;
+ case LINUX_SG_GET_SG_TABLESIZE:
+ args->cmd = SG_GET_SG_TABLESIZE;
+ break;
default:
return (ENODEV);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
