From owner-p4-projects@FreeBSD.ORG  Wed Aug  6 21:55:19 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8F8471065673; Wed,  6 Aug 2008 21:55:19 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 538FC106564A
	for <perforce@freebsd.org>; Wed,  6 Aug 2008 21:55:19 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 401B98FC0C
	for <perforce@freebsd.org>; Wed,  6 Aug 2008 21:55:19 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m76LtJA4009396
	for <perforce@freebsd.org>; Wed, 6 Aug 2008 21:55:19 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m76LtJvF009394
	for perforce@freebsd.org; Wed, 6 Aug 2008 21:55:19 GMT
	(envelope-from thompsa@freebsd.org)
Date: Wed, 6 Aug 2008 21:55:19 GMT
Message-Id: <200808062155.m76LtJvF009394@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 146803 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Aug 2008 21:55:19 -0000

http://perforce.freebsd.org/chv.cgi?CH=146803

Change 146803 by thompsa@thompsa_burger on 2008/08/06 21:55:04

	Add compat checks for VFS and callout changes.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#21 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#17 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#21 (text+ko) ====

@@ -91,7 +91,9 @@
 
 static fo_rdwr_t usb2_read_f;
 static fo_rdwr_t usb2_write_f;
+#if __FreeBSD_version > 800009
 static fo_truncate_t usb2_truncate_f;
+#endif
 static fo_ioctl_t usb2_ioctl_f;
 static fo_poll_t usb2_poll_f;
 static fo_kqfilter_t usb2_kqfilter_f;
@@ -122,7 +124,9 @@
 static struct fileops usb2_ops_f = {
 	.fo_read = usb2_read_f,
 	.fo_write = usb2_write_f,
+#if __FreeBSD_version > 800009
 	.fo_truncate = usb2_truncate_f,
+#endif
 	.fo_ioctl = usb2_ioctl_f,
 	.fo_poll = usb2_poll_f,
 	.fo_kqfilter = usb2_kqfilter_f,
@@ -1600,11 +1604,13 @@
 	return (vnops.fo_stat(fp, sb, cred, td));
 }
 
+#if __FreeBSD_version > 800009
 static int
 usb2_truncate_f(struct file *fp, off_t length, struct ucred *cred, struct thread *td)
 {
 	return (vnops.fo_truncate(fp, length, cred, td));
 }
+#endif
 
 /* ARGSUSED */
 static int

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#17 (text+ko) ====

@@ -2606,7 +2606,11 @@
 	}
 	co = &(xfer->timeout_handle);
 
+#if __FreeBSD_version >= 800000
 	mtx = (void *)(co->co.c_lock);
+#else
+	mtx = co->co.c_mtx;
+#endif
 	mtx_lock(mtx);
 
 	if (usb2_callout_pending(co)) {