Date: Wed, 6 Aug 2008 21:55:19 GMT From: Andrew Thompson <thompsa@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 146803 for review Message-ID: <200808062155.m76LtJvF009394@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808062155.m76LtJvF009394>