PERFORCE change 119775 for review
Matt Jacob
mjacob at FreeBSD.org
Sun May 13 17:37:34 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=119775
Change 119775 by mjacob at mjexp-obrien on 2007/05/13 17:37:20
IFC
Affected files ...
.. //depot/projects/mjexp/bin/mv/mv.1#2 integrate
.. //depot/projects/mjexp/contrib/amd/amq/amq.8#2 integrate
.. //depot/projects/mjexp/etc/defaults/periodic.conf#3 integrate
.. //depot/projects/mjexp/etc/periodic/daily/480.status-ntpd#1 branch
.. //depot/projects/mjexp/lib/libc/net/ether_addr.c#2 integrate
.. //depot/projects/mjexp/libexec/rtld-elf/rtld.1#3 integrate
.. //depot/projects/mjexp/sbin/dumpfs/dumpfs.8#2 integrate
.. //depot/projects/mjexp/share/man/man4/altq.4#7 integrate
.. //depot/projects/mjexp/share/man/man4/axe.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/md.4#3 integrate
.. //depot/projects/mjexp/share/man/man4/snd_atiixp.4#3 integrate
.. //depot/projects/mjexp/share/man/man4/snd_via8233.4#3 integrate
.. //depot/projects/mjexp/share/man/man5/periodic.conf.5#2 integrate
.. //depot/projects/mjexp/share/man/man9/VFS_SYNC.9#2 integrate
.. //depot/projects/mjexp/share/man/man9/VOP_FSYNC.9#2 integrate
.. //depot/projects/mjexp/sys/conf/Makefile.amd64#2 integrate
.. //depot/projects/mjexp/sys/conf/Makefile.arm#2 integrate
.. //depot/projects/mjexp/sys/conf/Makefile.i386#2 integrate
.. //depot/projects/mjexp/sys/conf/Makefile.ia64#2 integrate
.. //depot/projects/mjexp/sys/conf/Makefile.pc98#2 integrate
.. //depot/projects/mjexp/sys/conf/Makefile.powerpc#2 integrate
.. //depot/projects/mjexp/sys/conf/Makefile.sparc64#2 integrate
.. //depot/projects/mjexp/sys/conf/Makefile.sun4v#2 integrate
.. //depot/projects/mjexp/sys/dev/usb/if_axe.c#5 integrate
.. //depot/projects/mjexp/sys/dev/usb/if_cue.c#2 integrate
.. //depot/projects/mjexp/sys/dev/usb/if_cuereg.h#2 integrate
.. //depot/projects/mjexp/sys/dev/usb/if_kue.c#3 integrate
.. //depot/projects/mjexp/sys/dev/usb/if_kuereg.h#2 integrate
.. //depot/projects/mjexp/sys/dev/usb/if_rue.c#2 integrate
.. //depot/projects/mjexp/sys/dev/usb/if_ruereg.h#2 integrate
.. //depot/projects/mjexp/sys/dev/usb/if_udav.c#3 integrate
.. //depot/projects/mjexp/sys/dev/usb/uhid.c#2 integrate
.. //depot/projects/mjexp/sys/dev/usb/ukbd.c#5 integrate
.. //depot/projects/mjexp/sys/dev/usb/ums.c#3 integrate
.. //depot/projects/mjexp/sys/dev/usb/usb.c#3 integrate
.. //depot/projects/mjexp/sys/dev/usb/usb_mem.c#2 integrate
.. //depot/projects/mjexp/sys/kern/kern_mib.c#3 integrate
.. //depot/projects/mjexp/sys/net/ethernet.h#6 integrate
.. //depot/projects/mjexp/sys/pc98/conf/GENERIC#7 integrate
.. //depot/projects/mjexp/sys/sys/param.h#16 integrate
.. //depot/projects/mjexp/usr.bin/ldd/ldd.1#2 integrate
.. //depot/projects/mjexp/usr.bin/tip/tip/acu.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/boot0cfg/boot0cfg.8#2 integrate
.. //depot/projects/mjexp/usr.sbin/config/Makefile#2 integrate
.. //depot/projects/mjexp/usr.sbin/config/config.8#3 integrate
.. //depot/projects/mjexp/usr.sbin/config/config.h#3 integrate
.. //depot/projects/mjexp/usr.sbin/config/config.y#3 integrate
.. //depot/projects/mjexp/usr.sbin/config/configvers.h#3 integrate
.. //depot/projects/mjexp/usr.sbin/config/kernconf.tmpl#1 branch
.. //depot/projects/mjexp/usr.sbin/config/lang.l#2 integrate
.. //depot/projects/mjexp/usr.sbin/config/main.c#3 integrate
.. //depot/projects/mjexp/usr.sbin/iostat/iostat.c#3 integrate
.. //depot/projects/mjexp/usr.sbin/pccard/pccardc/pccardc.8#2 integrate
Differences ...
==== //depot/projects/mjexp/bin/mv/mv.1#2 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mv.1 8.1 (Berkeley) 5/31/93
-.\" $FreeBSD: src/bin/mv/mv.1,v 1.28 2005/01/16 16:41:58 ru Exp $
+.\" $FreeBSD: src/bin/mv/mv.1,v 1.29 2007/05/12 22:18:27 pav Exp $
.\"
.Dd July 9, 2002
.Dt MV 1
@@ -113,9 +113,9 @@
to be verbose, showing files after they are moved.
.El
.Pp
-It is an error for either the
+It is an error for the
.Ar source
-operand or the destination path to specify a directory unless both do.
+operand to specify a directory if the target exists and is not a directory.
.Pp
If the destination path does not have a mode which permits writing,
.Nm
==== //depot/projects/mjexp/contrib/amd/amq/amq.8#2 (text+ko) ====
@@ -39,7 +39,7 @@
.\" %W% (Berkeley) %G%
.\"
.\" $Id: amq.8,v 1.3.2.8 2004/01/06 03:15:16 ezk Exp $
-.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.12 2005/06/16 20:21:02 ru Exp $
+.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.13 2007/05/12 10:25:31 pav Exp $
.\"
.Dd March 16, 1991
.Dt AMQ 8
@@ -133,7 +133,7 @@
Ask the automounter to use the logging options specified in
.Ar log_options
from now on.
-.It Fl D Ar log_options
+.It Fl D Ar debug_options
Ask the automounter to use the debugging options specified in
.Ar debug_options
from now on.
==== //depot/projects/mjexp/etc/defaults/periodic.conf#3 (text+ko) ====
@@ -13,7 +13,7 @@
# For a more detailed explanation of all the periodic.conf variables, please
# refer to the periodic.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/periodic.conf,v 1.42 2007/04/06 02:33:06 pjd Exp $
+# $FreeBSD: src/etc/defaults/periodic.conf,v 1.43 2007/05/13 09:33:35 maxim Exp $
#
# What files override these defaults ?
@@ -130,6 +130,9 @@
daily_status_named_enable="YES"
daily_status_named_usedns="YES" # DNS lookups are ok
+# 480.status-ntpd
+daily_status_ntpd_enable="NO" # Check NTP status
+
# 500.queuerun
daily_queuerun_enable="YES" # Run mail queue
daily_submit_queuerun="YES" # Also submit queue
==== //depot/projects/mjexp/lib/libc/net/ether_addr.c#2 (text+ko) ====
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 1995
- * Bill Paul <wpaul at ctr.columbia.edu>. All rights reserved.
+ * Copyright (c) 1995 Bill Paul <wpaul at ctr.columbia.edu>.
+ * All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -37,103 +37,90 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/ether_addr.c,v 1.15 2002/04/08 07:51:10 ru Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/ether_addr.c,v 1.16 2007/05/13 12:04:06 rwatson Exp $");
-#include <stdio.h>
-#include <paths.h>
#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
#include <sys/param.h>
#include <sys/socket.h>
+
#include <net/ethernet.h>
+
#ifdef YP
#include <rpc/rpc.h>
#include <rpcsvc/yp_prot.h>
#include <rpcsvc/ypclnt.h>
#endif
+#include <paths.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
#ifndef _PATH_ETHERS
-#define _PATH_ETHERS "/etc/ethers"
+#define _PATH_ETHERS "/etc/ethers"
#endif
/*
- * Parse a string of text containing an ethernet address and hostname
- * and separate it into its component parts.
+ * Parse a string of text containing an ethernet address and hostname and
+ * separate it into its component parts.
*/
int
-ether_line(l, e, hostname)
- const char *l;
- struct ether_addr *e;
- char *hostname;
+ether_line(const char *l, struct ether_addr *e, char *hostname)
{
int i, o[6];
- i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2],
- &o[3], &o[4], &o[5],
- hostname);
+ i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2], &o[3],
+ &o[4], &o[5], hostname);
if (i != 7)
return (i);
-
for (i=0; i<6; i++)
e->octet[i] = o[i];
return (0);
}
/*
- * Convert an ASCII representation of an ethernet address to
- * binary form.
+ * Convert an ASCII representation of an ethernet address to binary form.
*/
-struct
-ether_addr *ether_aton(a)
- const char *a;
+struct ether_addr *
+ether_aton(const char *a)
{
int i;
static struct ether_addr o;
unsigned int o0, o1, o2, o3, o4, o5;
i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5);
-
if (i != 6)
return (NULL);
-
o.octet[0]=o0;
o.octet[1]=o1;
o.octet[2]=o2;
o.octet[3]=o3;
o.octet[4]=o4;
o.octet[5]=o5;
-
return ((struct ether_addr *)&o);
}
/*
- * Convert a binary representation of an ethernet address to
- * an ASCII string.
+ * Convert a binary representation of an ethernet address to an ASCII string.
*/
-char
-*ether_ntoa(n)
- const struct ether_addr *n;
+char *
+ether_ntoa(const struct ether_addr *n)
{
int i;
static char a[18];
- i = sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x",
- n->octet[0], n->octet[1], n->octet[2],
- n->octet[3], n->octet[4], n->octet[5]);
+ i = sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x", n->octet[0],
+ n->octet[1], n->octet[2], n->octet[3], n->octet[4], n->octet[5]);
if (i < 17)
return (NULL);
return ((char *)&a);
}
/*
- * Map an ethernet address to a hostname. Use either /etc/ethers or
- * NIS/YP.
+ * Map an ethernet address to a hostname. Use either /etc/ethers or NIS/YP.
*/
int
-ether_ntohost(hostname, e)
- char *hostname;
- const struct ether_addr *e;
+ether_ntohost(char *hostname, const struct ether_addr *e)
{
FILE *fp;
char buf[BUFSIZ + 2];
@@ -145,9 +132,9 @@
char *ether_a;
char *yp_domain;
#endif
+
if ((fp = fopen(_PATH_ETHERS, "r")) == NULL)
return (1);
-
while (fgets(buf,BUFSIZ,fp)) {
if (buf[0] == '#')
continue;
@@ -157,7 +144,7 @@
continue;
ether_a = ether_ntoa(e);
if (yp_match(yp_domain, "ethers.byaddr", ether_a,
- strlen(ether_a), &result, &resultlen)) {
+ strlen(ether_a), &result, &resultlen)) {
continue;
}
strncpy(buf, result, resultlen);
@@ -167,8 +154,8 @@
#endif
if (!ether_line(buf, &local_ether, local_host)) {
if (!bcmp((char *)&local_ether.octet[0],
- (char *)&e->octet[0], 6)) {
- /* We have a match */
+ (char *)&e->octet[0], 6)) {
+ /* We have a match. */
strcpy(hostname, local_host);
fclose(fp);
return(0);
@@ -180,13 +167,10 @@
}
/*
- * Map a hostname to an ethernet address using /etc/ethers or
- * NIS/YP.
+ * Map a hostname to an ethernet address using /etc/ethers or NIS/YP.
*/
int
-ether_hostton(hostname, e)
- const char *hostname;
- struct ether_addr *e;
+ether_hostton(const char *hostname, struct ether_addr *e)
{
FILE *fp;
char buf[BUFSIZ + 2];
@@ -197,9 +181,9 @@
int resultlen;
char *yp_domain;
#endif
+
if ((fp = fopen(_PATH_ETHERS, "r")) == NULL)
return (1);
-
while (fgets(buf,BUFSIZ,fp)) {
if (buf[0] == '#')
continue;
@@ -208,7 +192,7 @@
if (yp_get_default_domain(&yp_domain))
continue;
if (yp_match(yp_domain, "ethers.byname", hostname,
- strlen(hostname), &result, &resultlen)) {
+ strlen(hostname), &result, &resultlen)) {
continue;
}
strncpy(buf, result, resultlen);
@@ -218,9 +202,9 @@
#endif
if (!ether_line(buf, &local_ether, local_host)) {
if (!strcmp(hostname, local_host)) {
- /* We have a match */
+ /* We have a match. */
bcopy((char *)&local_ether.octet[0],
- (char *)&e->octet[0], 6);
+ (char *)&e->octet[0], 6);
fclose(fp);
return(0);
}
==== //depot/projects/mjexp/libexec/rtld-elf/rtld.1#3 (text+ko) ====
@@ -26,7 +26,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/libexec/rtld-elf/rtld.1,v 1.43 2007/01/23 22:38:39 jhb Exp $
+.\" $FreeBSD: src/libexec/rtld-elf/rtld.1,v 1.45 2007/05/12 12:26:25 pav Exp $
.\"
.Dd March 27, 2006
.Dt RTLD 1
@@ -158,6 +158,12 @@
option and allows
.Xr ldd 1
to be operated as a filter more conveniently.
+If the dependency name starts with string
+.Pa lib ,
+.Ev LD_TRACE_LOADED_OBJECTS_FMT1
+is used, otherwise
+.Ev LD_TRACE_LOADED_OBJECTS_FMT2
+is used.
The following conversions can be used:
.Bl -tag -width 4n
.It Li %a
@@ -169,8 +175,6 @@
.Ev LD_TRACE_LOADED_OBJECTS_PROGNAME
.It Li %o
The library name.
-.It Li %m
-The library's major version number.
.It Li %p
The full pathname as determined by
.Nm rtld Ns 's
==== //depot/projects/mjexp/sbin/dumpfs/dumpfs.8#2 (text+ko) ====
@@ -26,7 +26,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)dumpfs.8 8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/sbin/dumpfs/dumpfs.8,v 1.15 2005/02/10 09:19:28 ru Exp $
+.\" $FreeBSD: src/sbin/dumpfs/dumpfs.8,v 1.16 2007/05/12 22:35:22 pav Exp $
.\"
.Dd January 19, 2003
.Dt DUMPFS 8
@@ -53,9 +53,10 @@
.Pp
If
.Fl m
-is specified, the file system is marshalled in terms of a
+is specified, a
.Xr newfs 8
-command to generate the file system.
+command is printed that can be used to generate a new file system
+with equivalent settings.
.Sh SEE ALSO
.Xr disktab 5 ,
.Xr fs 5 ,
==== //depot/projects/mjexp/share/man/man4/altq.4#7 (text+ko) ====
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/altq.4,v 1.29 2007/05/09 05:18:04 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/altq.4,v 1.30 2007/05/12 05:59:15 brueffer Exp $
.\"
-.Dd May 9, 2007
+.Dd May 12, 2007
.Dt ALTQ 4
.Os
.Sh NAME
@@ -119,6 +119,7 @@
.Xr ath 4 ,
.Xr aue 4 ,
.Xr awi 4 ,
+.Xt axe 4 ,
.Xr bce 4 ,
.Xr bfe 4 ,
.Xr bge 4 ,
==== //depot/projects/mjexp/share/man/man4/axe.4#2 (text+ko) ====
@@ -28,9 +28,9 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/axe.4,v 1.12 2005/10/07 02:32:15 trhodes Exp $
+.\" $FreeBSD: src/share/man/man4/axe.4,v 1.13 2007/05/12 05:59:15 brueffer Exp $
.\"
-.Dd July 16, 2005
+.Dd May 12, 2007
.Dt AXE 4
.Os
.Sh NAME
@@ -154,6 +154,7 @@
The driver failed to allocate an mbuf for the receiver ring.
.El
.Sh SEE ALSO
+.Xr altq 4 ,
.Xr arp 4 ,
.Xr miibus 4 ,
.Xr netintro 4 ,
==== //depot/projects/mjexp/share/man/man4/md.4#3 (text+ko) ====
@@ -5,7 +5,7 @@
.\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
.\" ----------------------------------------------------------------------------
.\"
-.\" $FreeBSD: src/share/man/man4/md.4,v 1.12 2006/11/24 18:53:45 imp Exp $
+.\" $FreeBSD: src/share/man/man4/md.4,v 1.13 2007/05/12 15:33:18 pav Exp $
.\"
.Dd November 24, 2006
.Dt MD 4
@@ -50,7 +50,14 @@
This allows for mounting ISO images without the tedious
detour over actual physical media.
.It Cm swap
-Backing store is allocated from swap space.
+Backing store is allocated from buffer memory.
+Pages get pushed out to the swap when the system is under memory
+pressure, otherwise they stay in the operating memory.
+Using
+.Cm swap
+backing is generally preferable over
+.Cm malloc
+backing.
.El
.Pp
For more information, please see
==== //depot/projects/mjexp/share/man/man4/snd_atiixp.4#3 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/snd_atiixp.4,v 1.4 2006/11/29 17:07:02 joel Exp $
+.\" $FreeBSD: src/share/man/man4/snd_atiixp.4,v 1.5 2007/05/12 06:33:52 brueffer Exp $
.\"
.Dd November 29, 2006
.Dt SND_ATIIXP 4
@@ -66,6 +66,7 @@
Polling is disabled by default.
Do not enable it unless you are facing weird interrupt problems or if the
device cannot generate interrupts at all.
+.El
.Sh HARDWARE
The
.Nm
==== //depot/projects/mjexp/share/man/man4/snd_via8233.4#3 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/snd_via8233.4,v 1.6 2006/11/29 17:07:02 joel Exp $
+.\" $FreeBSD: src/share/man/man4/snd_via8233.4,v 1.7 2007/05/12 06:41:41 brueffer Exp $
.\"
.Dd November 29, 2006
.Dt SND_VIA8233 4
@@ -66,6 +66,7 @@
Polling is disabled by default.
Do not enable it unless you are facing weird interrupt problems or if the
device cannot generate interrupts at all.
+.El
.Sh HARDWARE
The
.Nm
==== //depot/projects/mjexp/share/man/man5/periodic.conf.5#2 (text+ko) ====
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man5/periodic.conf.5,v 1.64 2006/09/04 10:20:53 trhodes Exp $
+.\" $FreeBSD: src/share/man/man5/periodic.conf.5,v 1.65 2007/05/13 09:33:35 maxim Exp $
.\"
-.Dd September 3, 2006
+.Dd May 12, 2007
.Dt PERIODIC.CONF 5
.Os
.Sh NAME
@@ -592,6 +592,11 @@
Set to
.Dq Li YES
if you want to enable reverse DNS lookups.
+.It Va daily_status_ntpd
+.Pq Vt bool
+Set to
+.Dq Li YES
+if you want to enable NTP status check.
.It Va daily_queuerun_enable
.Pq Vt bool
Set to
==== //depot/projects/mjexp/share/man/man9/VFS_SYNC.9#2 (text+ko) ====
@@ -26,7 +26,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/VFS_SYNC.9,v 1.15 2005/06/15 13:31:23 ru Exp $
+.\" $FreeBSD: src/share/man/man9/VFS_SYNC.9,v 1.16 2007/05/12 13:10:55 pav Exp $
.\"
.Dd January 7, 2005
.Os
@@ -39,7 +39,7 @@
.In sys/mount.h
.In sys/vnode.h
.Ft int
-.Fn VFS_SYNC "struct mount *mp" "int waitfor" "struct ucred *cred" "struct thread *td"
+.Fn VFS_SYNC "struct mount *mp" "int waitfor" "struct thread *td"
.Sh DESCRIPTION
The
.Fn VFS_SYNC
@@ -61,8 +61,6 @@
.It Dv MNT_LAZY
push data not written by file system syncer
.El
-.It Fa cred
-The caller's credentials.
.It Fa td
The calling thread.
.El
==== //depot/projects/mjexp/share/man/man9/VOP_FSYNC.9#2 (text+ko) ====
@@ -26,7 +26,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/VOP_FSYNC.9,v 1.15 2005/06/28 20:15:18 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/VOP_FSYNC.9,v 1.16 2007/05/12 13:10:55 pav Exp $
.\"
.Dd July 24, 1996
.Os
@@ -38,7 +38,7 @@
.In sys/param.h
.In sys/vnode.h
.Ft int
-.Fn VOP_FSYNC "struct vnode *vp" "struct ucred *cred" "int waitfor" "struct thread *td"
+.Fn VOP_FSYNC "struct vnode *vp" "int waitfor" "struct thread *td"
.Sh DESCRIPTION
This call flushes any dirty file system buffers for the file.
It is used to implement the
@@ -51,8 +51,6 @@
.Bl -tag -width waitfor
.It Fa vp
The vnode of the file.
-.It Fa cred
-The caller's credentials.
.It Fa waitfor
Whether the function should wait for I/O to complete.
Possible values are:
@@ -84,7 +82,7 @@
.Sh PSEUDOCODE
.Bd -literal
int
-vop_fsync(struct vnode *vp, struct ucred *cred, int waitfor, struct thread *td)
+vop_fsync(struct vnode *vp, int waitfor, struct thread *td)
{
struct buf *bp;
struct buf *nbp;
==== //depot/projects/mjexp/sys/conf/Makefile.amd64#2 (text+ko) ====
@@ -2,7 +2,7 @@
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
# from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49
-# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.22 2005/11/28 17:51:30 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.23 2007/05/13 02:36:40 wkoszek Exp $
#
# Makefile for FreeBSD
#
@@ -18,7 +18,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600004
+%VERSREQ= 600006
STD8X16FONT?= iso
==== //depot/projects/mjexp/sys/conf/Makefile.arm#2 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.arm -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.arm,v 1.31 2006/07/24 22:09:47 cognet Exp $
+# $FreeBSD: src/sys/conf/Makefile.arm,v 1.32 2007/05/13 02:36:40 wkoszek Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600004
+%VERSREQ= 600006
# Temporary stuff while we're still embryonic
NO_MODULES=
==== //depot/projects/mjexp/sys/conf/Makefile.i386#2 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.i386,v 1.271 2006/01/29 03:32:19 nyan Exp $
+# $FreeBSD: src/sys/conf/Makefile.i386,v 1.272 2007/05/13 02:36:40 wkoszek Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600004
+%VERSREQ= 600006
STD8X16FONT?= iso
==== //depot/projects/mjexp/sys/conf/Makefile.ia64#2 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.ia64 -- with config changes.
# Copyright 1990 W. Jolitz
# from: src/sys/conf/Makefile.alpha,v 1.76
-# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.67 2005/11/28 17:51:31 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.68 2007/05/13 02:36:40 wkoszek Exp $
#
# Makefile for FreeBSD
#
@@ -19,7 +19,7 @@
GCC3= you bet
# Which version of config(8) is required.
-%VERSREQ= 600004
+%VERSREQ= 600006
STD8X16FONT?= iso
==== //depot/projects/mjexp/sys/conf/Makefile.pc98#2 (text+ko) ====
@@ -3,7 +3,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.173 2006/01/29 03:32:19 nyan Exp $
+# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.174 2007/05/13 02:36:41 wkoszek Exp $
#
# Makefile for FreeBSD
#
@@ -19,7 +19,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600004
+%VERSREQ= 600006
.if !defined(S)
.if exists(./@/.)
==== //depot/projects/mjexp/sys/conf/Makefile.powerpc#2 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.powerpc -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.283 2005/11/28 17:51:31 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.284 2007/05/13 02:36:41 wkoszek Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600004
+%VERSREQ= 600006
STD8X16FONT?= iso
==== //depot/projects/mjexp/sys/conf/Makefile.sparc64#2 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.sparc64 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.38 2005/11/28 17:51:31 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.39 2007/05/13 02:36:41 wkoszek Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600004
+%VERSREQ= 600006
STD8X16FONT?= iso
==== //depot/projects/mjexp/sys/conf/Makefile.sun4v#2 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.sparc64 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.sun4v,v 1.1 2006/10/05 06:14:24 kmacy Exp $
+# $FreeBSD: src/sys/conf/Makefile.sun4v,v 1.2 2007/05/13 02:36:41 wkoszek Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600004
+%VERSREQ= 600006
STD8X16FONT?= iso
==== //depot/projects/mjexp/sys/dev/usb/if_axe.c#5 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.43 2007/05/01 11:17:29 brueffer Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.44 2007/05/12 05:56:10 brueffer Exp $");
/*
* ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the
@@ -501,7 +501,9 @@
ifp->if_start = axe_start;
ifp->if_watchdog = axe_watchdog;
ifp->if_init = axe_init;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_READY(&ifp->if_snd);
sc->axe_qdat.ifp = ifp;
sc->axe_qdat.if_rxstart = axe_rxstart;
@@ -750,7 +752,7 @@
if (!sc->axe_link && mii->mii_media_status & IFM_ACTIVE &&
IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) {
sc->axe_link++;
- if (ifp->if_snd.ifq_head != NULL)
+ if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
axe_start(ifp);
}
@@ -815,14 +817,14 @@
return;
}
- IF_DEQUEUE(&ifp->if_snd, m_head);
+ IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head);
if (m_head == NULL) {
AXE_UNLOCK(sc);
return;
}
if (axe_encap(sc, m_head, 0)) {
- IF_PREPEND(&ifp->if_snd, m_head);
+ IFQ_DRV_PREPEND(&ifp->if_snd, m_head);
ifp->if_drv_flags |= IFF_DRV_OACTIVE;
AXE_UNLOCK(sc);
return;
@@ -1045,7 +1047,7 @@
AXE_UNLOCK(sc);
- if (ifp->if_snd.ifq_head != NULL)
+ if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
axe_start(ifp);
return;
==== //depot/projects/mjexp/sys/dev/usb/if_cue.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.63 2006/09/07 00:06:41 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.64 2007/05/12 05:53:52 brueffer Exp $");
/*
* CATC USB-EL1210A USB to ethernet driver. Used in the CATC Netmate
@@ -70,9 +70,6 @@
#include <sys/bus.h>
#include <machine/bus.h>
-#if __FreeBSD_version < 500000
-#include <machine/clock.h>
-#endif
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
@@ -357,11 +354,7 @@
/* now program new ones */
IF_ADDR_LOCK(ifp);
-#if __FreeBSD_version >= 500000
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link)
-#else
- LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link)
-#endif
{
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
@@ -375,11 +368,7 @@
* so we can receive broadcast frames.
*/
if (ifp->if_flags & IFF_BROADCAST) {
-#if __FreeBSD_version >= 500000
h = cue_mchash(ifp->if_broadcastaddr);
-#else
- h = cue_mchash(etherbroadcastaddr);
-#endif
sc->cue_mctab[h >> 3] |= 1 << (h & 0x7);
}
@@ -487,10 +476,8 @@
}
}
-#if __FreeBSD_version >= 500000
mtx_init(&sc->cue_mtx, device_get_nameunit(self), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
-#endif
CUE_LOCK(sc);
#ifdef notdef
@@ -506,9 +493,7 @@
if (ifp == NULL) {
printf("cue%d: can not if_alloc()\n", sc->cue_unit);
CUE_UNLOCK(sc);
-#if __FreeBSD_version >= 500000
mtx_destroy(&sc->cue_mtx);
-#endif
USB_ATTACH_ERROR_RETURN;
}
ifp->if_softc = sc;
@@ -529,11 +514,7 @@
/*
* Call MI attach routine.
*/
-#if __FreeBSD_version >= 500000
ether_ifattach(ifp, eaddr);
-#else
- ether_ifattach(ifp, ETHER_BPF_SUPPORTED);
-#endif
callout_handle_init(&sc->cue_stat_ch);
usb_register_netisr();
sc->cue_dying = 0;
@@ -554,12 +535,8 @@
sc->cue_dying = 1;
untimeout(cue_tick, sc, sc->cue_stat_ch);
-#if __FreeBSD_version >= 500000
ether_ifdetach(ifp);
if_free(ifp);
-#else
- ether_ifdetach(ifp, ETHER_BPF_SUPPORTED);
-#endif
if (sc->cue_ep[CUE_ENDPT_TX] != NULL)
usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_TX]);
@@ -569,9 +546,7 @@
usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_INTR]);
CUE_UNLOCK(sc);
-#if __FreeBSD_version >= 500000
mtx_destroy(&sc->cue_mtx);
-#endif
return(0);
}
==== //depot/projects/mjexp/sys/dev/usb/if_cuereg.h#2 (text+ko) ====
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/usb/if_cuereg.h,v 1.18 2005/06/10 16:49:15 brooks Exp $
+ * $FreeBSD: src/sys/dev/usb/if_cuereg.h,v 1.19 2007/05/12 05:53:52 brueffer Exp $
*/
/*
@@ -154,9 +154,7 @@
u_int16_t cue_rxfilt;
struct ue_cdata cue_cdata;
struct callout_handle cue_stat_ch;
-#if __FreeBSD_version >= 500000
struct mtx cue_mtx;
-#endif
char cue_dying;
struct timeval cue_rx_notice;
struct usb_qdat cue_qdat;
==== //depot/projects/mjexp/sys/dev/usb/if_kue.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.71 2006/10/07 18:03:39 flz Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.73 2007/05/12 05:56:58 brueffer Exp $");
/*
* Kawasaki LSI KL5KUSB101B USB to ethernet adapter driver.
@@ -85,9 +85,6 @@
#include <sys/bus.h>
#include <machine/bus.h>
-#if __FreeBSD_version < 500000
-#include <machine/clock.h>
-#endif
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
@@ -329,11 +326,7 @@
sc->kue_rxfilt &= ~KUE_RXFILT_ALLMULTI;
IF_ADDR_LOCK(ifp);
-#if __FreeBSD_version >= 500000
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link)
-#else
- LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link)
-#endif
{
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list