Index: src/sys/dev/usb/umass.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/umass.c,v
retrieving revision 1.112.2.1
diff -u -p -r1.112.2.1 umass.c
--- src/sys/dev/usb/umass.c	20 Sep 2004 05:28:08 -0000	1.112.2.1
+++ src/sys/dev/usb/umass.c	6 Oct 2004 08:00:42 -0000
@@ -124,6 +124,7 @@
 #include <cam/cam_xpt_sim.h>
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_da.h>
+#include <cam/scsi/scsi_ufi.h>
 
 #include <cam/cam_periph.h>
 
@@ -2888,6 +2889,7 @@ umass_ufi_transform(struct umass_softc *
 		}
 		return 1;
 
+	case FORMAT_UNIT:	/* XXX */
 	case REZERO_UNIT:
 	case REQUEST_SENSE:
 	case INQUIRY:
@@ -2902,12 +2904,14 @@ umass_ufi_transform(struct umass_softc *
 	case MODE_SENSE_10:
 	case READ_12:
 	case WRITE_12:
+	case READ_FORMAT_CAPACITY:	/* XXX */
 		memcpy(*rcmd, cmd, cmdlen);
 		return 1;
 
-	/* Other UFI commands: FORMAT_UNIT, READ_FORMAT_CAPACITY,
-	 * VERIFY, WRITE_AND_VERIFY.
+	/* Other UFI commands: VERIFY, WRITE_AND_VERIFY.
 	 * These should be checked whether they somehow can be made to fit.
+	 * XXX FORMAT_UNIT, READ_FORMAT_CAPACITY passed through above
+	 * without checking.
 	 */
 
 	default: