PERFORCE change 36239 for review
Marcel Moolenaar
marcel at FreeBSD.org
Fri Aug 15 19:55:10 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=36239
Change 36239 by marcel at marcel_nfs on 2003/08/15 19:54:13
IFC @36237
Affected files ...
.. //depot/projects/ia64/bin/ps/extern.h#10 integrate
.. //depot/projects/ia64/bin/ps/keyword.c#13 integrate
.. //depot/projects/ia64/bin/ps/print.c#13 integrate
.. //depot/projects/ia64/contrib/telnet/telnetd/telnetd.c#2 integrate
.. //depot/projects/ia64/etc/defaults/rc.conf#38 integrate
.. //depot/projects/ia64/etc/rc.d/routing#3 integrate
.. //depot/projects/ia64/gnu/usr.bin/binutils/as/amd64-freebsd/Makefile#2 integrate
.. //depot/projects/ia64/gnu/usr.bin/binutils/as/i386-freebsd/Makefile#2 integrate
.. //depot/projects/ia64/lib/libpthread/test/Makefile#3 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#60 integrate
.. //depot/projects/ia64/sbin/Makefile#29 integrate
.. //depot/projects/ia64/sbin/ffsinfo/Makefile#4 integrate
.. //depot/projects/ia64/sbin/ffsinfo/ffsinfo.8#7 integrate
.. //depot/projects/ia64/sbin/ffsinfo/ffsinfo.c#3 integrate
.. //depot/projects/ia64/sbin/growfs/debug.c#5 integrate
.. //depot/projects/ia64/sbin/growfs/debug.h#2 integrate
.. //depot/projects/ia64/sbin/natd/natd.8#9 integrate
.. //depot/projects/ia64/sbin/natd/natd.c#7 integrate
.. //depot/projects/ia64/sbin/rtsol/Makefile#3 integrate
.. //depot/projects/ia64/share/man/man3/queue.3#4 integrate
.. //depot/projects/ia64/share/man/man4/aha.4#3 integrate
.. //depot/projects/ia64/share/man/man4/amr.4#4 integrate
.. //depot/projects/ia64/share/man/man4/an.4#5 integrate
.. //depot/projects/ia64/share/man/man4/ath.4#6 integrate
.. //depot/projects/ia64/share/man/man4/awi.4#4 integrate
.. //depot/projects/ia64/share/man/man4/ieee80211.4#3 integrate
.. //depot/projects/ia64/share/man/man4/mlx.4#4 integrate
.. //depot/projects/ia64/share/man/man4/wi.4#28 integrate
.. //depot/projects/ia64/share/man/man5/rc.conf.5#44 integrate
.. //depot/projects/ia64/share/misc/iso3166#6 integrate
.. //depot/projects/ia64/share/zoneinfo/zone.tab#8 integrate
.. //depot/projects/ia64/sys/conf/files.i386#43 integrate
.. //depot/projects/ia64/sys/conf/files.ia64#44 integrate
.. //depot/projects/ia64/sys/conf/files.pc98#35 integrate
.. //depot/projects/ia64/sys/conf/majors#24 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi.c#36 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi_acad.c#7 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#12 integrate
.. //depot/projects/ia64/sys/dev/ath/if_ath.c#6 integrate
.. //depot/projects/ia64/sys/dev/ath/if_ath_pci.c#3 integrate
.. //depot/projects/ia64/sys/dev/dgb/dgb.c#10 integrate
.. //depot/projects/ia64/sys/dev/pccard/pccarddevs#34 integrate
.. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#34 integrate
.. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#33 integrate
.. //depot/projects/ia64/sys/dev/puc/pucdata.c#17 integrate
.. //depot/projects/ia64/sys/dev/safe/safe.c#2 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/csa.c#4 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/dsp.c#12 integrate
.. //depot/projects/ia64/sys/dev/usb/uvisor.c#8 integrate
.. //depot/projects/ia64/sys/dev/vinum/vinumio.c#19 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#27 integrate
.. //depot/projects/ia64/sys/fs/procfs/procfs_map.c#5 integrate
.. //depot/projects/ia64/sys/geom/geom_dev.c#40 integrate
.. //depot/projects/ia64/sys/geom/geom_io.c#28 integrate
.. //depot/projects/ia64/sys/i386/conf/NOTES#44 integrate
.. //depot/projects/ia64/sys/i386/i386/identcpu.c#24 integrate
.. //depot/projects/ia64/sys/i386/i386/initcpu.c#12 integrate
.. //depot/projects/ia64/sys/i386/i386/mp_clock.c#7 integrate
.. //depot/projects/ia64/sys/i386/i386/perfmon.c#8 integrate
.. //depot/projects/ia64/sys/i386/i386/pmap.c#56 integrate
.. //depot/projects/ia64/sys/i386/i386/support.s#10 integrate
.. //depot/projects/ia64/sys/i386/i386/trap.c#35 integrate
.. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_ipc.h#2 integrate
.. //depot/projects/ia64/sys/i386/include/apic.h#7 integrate
.. //depot/projects/ia64/sys/i386/include/clock.h#6 integrate
.. //depot/projects/ia64/sys/i386/include/specialreg.h#6 integrate
.. //depot/projects/ia64/sys/i386/isa/clock.c#20 integrate
.. //depot/projects/ia64/sys/i386/isa/pcaudio.c#8 delete
.. //depot/projects/ia64/sys/ia64/ia64/elf_machdep.c#11 integrate
.. //depot/projects/ia64/sys/ia64/ia64/ptrace_machdep.c#1 branch
.. //depot/projects/ia64/sys/ia64/include/ia64_cpu.h#7 integrate
.. //depot/projects/ia64/sys/ia64/include/ptrace.h#3 integrate
.. //depot/projects/ia64/sys/kern/kern_fork.c#44 integrate
.. //depot/projects/ia64/sys/kern/kern_synch.c#43 integrate
.. //depot/projects/ia64/sys/kern/kern_thr.c#12 integrate
.. //depot/projects/ia64/sys/kern/kern_thread.c#65 integrate
.. //depot/projects/ia64/sys/kern/sched_4bsd.c#14 integrate
.. //depot/projects/ia64/sys/kern/subr_kobj.c#4 integrate
.. //depot/projects/ia64/sys/kern/sys_pipe.c#39 integrate
.. //depot/projects/ia64/sys/kern/sys_process.c#24 integrate
.. //depot/projects/ia64/sys/libkern/arc4random.c#4 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211.c#5 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_input.c#4 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_node.c#5 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_node.h#4 integrate
.. //depot/projects/ia64/sys/netinet/tcp_input.c#43 integrate
.. //depot/projects/ia64/sys/netinet/tcp_output.c#17 integrate
.. //depot/projects/ia64/sys/netinet/tcp_syncache.c#23 integrate
.. //depot/projects/ia64/sys/netipsec/ipsec_input.c#5 integrate
.. //depot/projects/ia64/sys/nfsclient/bootp_subr.c#16 integrate
.. //depot/projects/ia64/sys/nfsclient/nfs_diskless.c#4 integrate
.. //depot/projects/ia64/sys/nfsclient/nfs_vfsops.c#22 integrate
.. //depot/projects/ia64/sys/nfsclient/nfsdiskless.h#4 integrate
.. //depot/projects/ia64/sys/pc98/conf/NOTES#10 integrate
.. //depot/projects/ia64/sys/pc98/pc98/pcaudio.c#7 delete
.. //depot/projects/ia64/sys/pci/if_rl.c#41 integrate
.. //depot/projects/ia64/sys/pci/if_rlreg.h#13 integrate
.. //depot/projects/ia64/sys/powerpc/powerpc/swtch.S#3 integrate
.. //depot/projects/ia64/sys/powerpc/powerpc/vm_machdep.c#22 integrate
.. //depot/projects/ia64/sys/sys/pipe.h#8 integrate
.. //depot/projects/ia64/sys/sys/proc.h#74 integrate
.. //depot/projects/ia64/sys/sys/ptrace.h#4 integrate
.. //depot/projects/ia64/sys/sys/queue.h#7 integrate
.. //depot/projects/ia64/sys/sys/soundcard.h#6 integrate
.. //depot/projects/ia64/sys/ufs/ffs/ffs_balloc.c#10 integrate
.. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#37 integrate
.. //depot/projects/ia64/sys/ufs/ufs/inode.h#8 integrate
.. //depot/projects/ia64/sys/ufs/ufs/ufs_inode.c#12 integrate
.. //depot/projects/ia64/sys/vm/swap_pager.c#39 integrate
.. //depot/projects/ia64/sys/vm/vm_extern.h#14 integrate
.. //depot/projects/ia64/sys/vm/vm_map.c#62 integrate
.. //depot/projects/ia64/sys/vm/vm_pageout.c#44 integrate
.. //depot/projects/ia64/tools/tools/ministat/Makefile#1 branch
.. //depot/projects/ia64/tools/tools/ministat/README#1 branch
.. //depot/projects/ia64/tools/tools/ministat/chameleon#1 branch
.. //depot/projects/ia64/tools/tools/ministat/iguana#1 branch
.. //depot/projects/ia64/tools/tools/ministat/ministat.c#1 branch
.. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.birthday#10 integrate
.. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#36 integrate
.. //depot/projects/ia64/usr.bin/tail/forward.c#7 integrate
.. //depot/projects/ia64/usr.sbin/lpr/lpd/lpd.c#8 integrate
.. //depot/projects/ia64/usr.sbin/lpr/lpd/printjob.c#9 integrate
.. //depot/projects/ia64/usr.sbin/lpr/lpd/recvjob.c#5 integrate
.. //depot/projects/ia64/usr.sbin/nghook/Makefile#2 integrate
.. //depot/projects/ia64/usr.sbin/nghook/main.c#2 integrate
.. //depot/projects/ia64/usr.sbin/nghook/nghook.8#3 integrate
.. //depot/projects/ia64/usr.sbin/rtadvd/Makefile#3 integrate
.. //depot/projects/ia64/usr.sbin/rtadvd/config.c#11 integrate
.. //depot/projects/ia64/usr.sbin/rtadvd/config.h#3 integrate
.. //depot/projects/ia64/usr.sbin/rtadvd/dump.c#5 integrate
.. //depot/projects/ia64/usr.sbin/rtadvd/rtadvd.8#4 integrate
.. //depot/projects/ia64/usr.sbin/rtadvd/rtadvd.c#7 integrate
.. //depot/projects/ia64/usr.sbin/rtadvd/rtadvd.conf#2 integrate
.. //depot/projects/ia64/usr.sbin/rtadvd/rtadvd.conf.5#4 integrate
.. //depot/projects/ia64/usr.sbin/rtadvd/rtadvd.h#5 integrate
.. //depot/projects/ia64/usr.sbin/rtsold/Makefile#5 integrate
.. //depot/projects/ia64/usr.sbin/rtsold/rtsol.c#4 integrate
.. //depot/projects/ia64/usr.sbin/rtsold/rtsold.c#5 integrate
Differences ...
==== //depot/projects/ia64/bin/ps/extern.h#10 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)extern.h 8.3 (Berkeley) 4/2/94
- * $FreeBSD: src/bin/ps/extern.h,v 1.30 2003/01/19 00:22:34 jmallett Exp $
+ * $FreeBSD: src/bin/ps/extern.h,v 1.31 2003/08/13 07:35:07 harti Exp $
*/
struct kinfo;
@@ -63,6 +63,7 @@
void maxrss(KINFO *, VARENT *);
void lockname(KINFO *, VARENT *);
void mwchan(KINFO *, VARENT *);
+void nwchan(KINFO *, VARENT *);
void pagein(KINFO *, VARENT *);
void parsefmt(const char *, int);
void pcpu(KINFO *, VARENT *);
==== //depot/projects/ia64/bin/ps/keyword.c#13 (text+ko) ====
@@ -37,7 +37,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.63 2003/04/12 10:39:56 tjr Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.64 2003/08/13 07:35:07 harti Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -127,6 +127,7 @@
LONG, "ld", 0},
{"nvcsw", "NVCSW", NULL, USER, rvar, NULL, 5, ROFF(ru_nvcsw),
LONG, "ld", 0},
+ {"nwchan", "NWCHAN", NULL, LJUST, nwchan, NULL, 8, 0, CHAR, NULL, 0},
{"oublk", "OUBLK", NULL, USER, rvar, NULL, 4, ROFF(ru_oublock),
LONG, "ld", 0},
{"oublock", "", "oublk", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
==== //depot/projects/ia64/bin/ps/print.c#13 (text+ko) ====
@@ -38,7 +38,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.82 2003/04/15 18:49:20 charnier Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.83 2003/08/13 07:35:07 harti Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -457,6 +457,19 @@
}
void
+nwchan(KINFO *k, VARENT *ve)
+{
+ VAR *v;
+
+ v = ve->var;
+ if (k->ki_p->ki_wchan) {
+ (void)printf("%0*lx", v->width,
+ (long)k->ki_p->ki_wchan);
+ } else
+ (void)printf("%-*s", v->width, "-");
+}
+
+void
mwchan(KINFO *k, VARENT *ve)
{
VAR *v;
==== //depot/projects/ia64/contrib/telnet/telnetd/telnetd.c#2 (text+ko) ====
@@ -37,7 +37,7 @@
#endif
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/telnetd.c,v 1.23 2003/05/11 18:17:00 markm Exp $");
+__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/telnetd.c,v 1.25 2003/08/13 11:02:37 harti Exp $");
#include "telnetd.h"
#include "pathnames.h"
@@ -348,6 +348,9 @@
err(1, "socket");
(void) setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
(char *)&on, sizeof(on));
+ if (debug > 1)
+ (void) setsockopt(s, SOL_SOCKET, SO_DEBUG,
+ (char *)&on, sizeof(on));
if (bind(s, res->ai_addr, res->ai_addrlen) < 0)
err(1, "bind");
if (listen(s, 1) < 0)
@@ -356,6 +359,8 @@
ns = accept(s, res->ai_addr, &foo);
if (ns < 0)
err(1, "accept");
+ (void) setsockopt(ns, SOL_SOCKET, SO_DEBUG,
+ (char *)&on, sizeof(on));
(void) dup2(ns, 0);
(void) close(ns);
(void) close(s);
==== //depot/projects/ia64/etc/defaults/rc.conf#38 (text+ko) ====
@@ -13,7 +13,7 @@
#
# All arguments must be in double or single quotes.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.183 2003/08/08 17:43:58 ume Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.184 2003/08/14 15:27:32 harti Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -219,6 +219,7 @@
### Network routing options: ###
defaultrouter="NO" # Set to default gateway (or NO).
static_routes="" # Set to static route list (or leave empty).
+natm_static_routes="" # Set to static route list for NATM (or leave empty).
gateway_enable="NO" # Set to YES if this host will be a gateway.
router_enable="NO" # Set to YES to enable a routing daemon.
router="/sbin/routed" # Name of routing daemon to use if enabled.
==== //depot/projects/ia64/etc/rc.d/routing#3 (text+ko) ====
@@ -2,7 +2,7 @@
#
# Configure routing and miscellaneous network tunables
#
-# $FreeBSD: src/etc/rc.d/routing,v 1.138 2003/06/29 17:59:09 mtm Exp $
+# $FreeBSD: src/etc/rc.d/routing,v 1.139 2003/08/14 15:27:32 harti Exp $
#
# PROVIDE: routing
@@ -48,6 +48,14 @@
route add ${route_args}
done
fi
+ # Now ATM static routes
+ #
+ if [ -n "${natm_static_routes}" ]; then
+ for i in ${natm_static_routes}; do
+ eval route_args=\$route_${i}
+ atmconfig natm add ${route_args}
+ done
+ fi
}
options_start()
==== //depot/projects/ia64/gnu/usr.bin/binutils/as/amd64-freebsd/Makefile#2 (text+ko) ====
@@ -1,8 +1,7 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/as/amd64-freebsd/Makefile,v 1.1 2003/04/26 03:28:20 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/as/amd64-freebsd/Makefile,v 1.2 2003/08/14 14:43:28 ru Exp $
.include "${.CURDIR}/../Makefile.inc0"
-NOMAN= true
SRCS+= obj-elf.c tc-i386.c
.include <bsd.prog.mk>
==== //depot/projects/ia64/gnu/usr.bin/binutils/as/i386-freebsd/Makefile#2 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/as/i386-freebsd/Makefile,v 1.9 2001/10/15 01:43:22 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/as/i386-freebsd/Makefile,v 1.10 2003/08/14 14:43:29 ru Exp $
.include "${.CURDIR}/../Makefile.inc0"
+.if ${TARGET_ARCH} != "i386"
NOMAN= true
-.if ${TARGET_ARCH} != "i386"
BINDIR= /usr/libexec/cross/i386-freebsd
.endif
SRCS+= obj-elf.c tc-i386.c
==== //depot/projects/ia64/lib/libpthread/test/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/lib/libpthread/test/Makefile,v 1.11 2002/12/08 22:43:31 deischen Exp $
+# $FreeBSD: src/lib/libpthread/test/Makefile,v 1.12 2003/08/13 03:59:18 marcel Exp $
#
# Automated test suite for libpthread (pthreads).
#
@@ -29,6 +29,7 @@
LIBS := -lkse
# Flags passed to verify. "-v" or "-u" may be useful.
+VERIFY = perl verify
VFLAGS :=
all : default
@@ -82,21 +83,21 @@
@cp $(bin)_a $(bin)
.endfor
@echo "Test static library:"
- @./verify $(VFLAGS) $(CTESTS) $(PTESTS)
+ @$(VERIFY) $(VFLAGS) $(CTESTS) $(PTESTS)
check_p : tests_p
.for bin in $(CTESTS) $(BTESTS)
@cp $(bin)_p $(bin)
.endfor
@echo "Test profile library:"
- @./verify $(VFLAGS) $(CTESTS) $(PTESTS)
+ @$(VERIFY) $(VFLAGS) $(CTESTS) $(PTESTS)
check_s : tests_s
.for bin in $(CTESTS) $(BTESTS)
@cp $(bin)_s $(bin)
.endfor
@echo "Test shared library:"
- @./verify $(VFLAGS) $(CTESTS) $(PTESTS)
+ @$(VERIFY) $(VFLAGS) $(CTESTS) $(PTESTS)
check : check_a check_p check_s
==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#60 (text+ko) ====
@@ -31,7 +31,7 @@
<sect1 id="support">
<sect1info>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.164 2003/08/12 00:14:49 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.166 2003/08/15 22:50:25 bmah Exp $</pubdate>
</sect1info>
<title>Supported Devices</title>
@@ -127,19 +127,15 @@
</listitem>
</itemizedlist>
</para>
+
+ <para arch="i386">Adaptec 1510, 152X, 1535, and 154X-series ISA
+ SCSI controllers and compatibles (&man.aha.4; driver)</para>
+
+ <para arch="i386">Adaptec 164X-series MCA SCSI controllers
+ (&man.aha.4; driver)</para>
+
<para arch="i386,pc98,alpha,sparc64">Adaptec SCSI Controllers
<itemizedlist>
- <listitem arch="i386">
- <para>Adaptec 1535 ISA SCSI controllers</para>
- </listitem>
- <listitem arch="i386">
- <para>Adaptec 154x series ISA SCSI controllers
- (&man.aha.4; driver)</para>
- </listitem>
- <listitem arch="i386">
- <para>Adaptec 164x series MCA SCSI controllers (&man.aha.4;
- driver)</para>
- </listitem>
<listitem arch="i386">
<para>Adaptec 174x series EISA SCSI controller in standard
and enhanced mode (&man.aha.4; and &man.ahb.4; driver)</para>
@@ -166,14 +162,6 @@
SCSI controllers (&man.ahc.4; driver)</para>
</listitem>
<listitem arch="i386">
- <para>Adaptec 1510 series ISA SCSI controllers (not for
- bootable devices)</para>
- </listitem>
- <listitem arch="i386">
- <para>Adaptec 152x series ISA SCSI controllers (&man.aha.4;
- driver)</para>
- </listitem>
- <listitem arch="i386">
<para>Adaptec AIC-6260 and AIC-6360 based boards, which
includes the AHA-152x and SoundBlaster SCSI cards
(&man.aic.4; driver)</para>
@@ -212,43 +200,7 @@
<para arch="i386">Adaptec 2400A ATA-100 RAID controller
(&man.asr.4; driver)</para>
- <para arch="i386">Adaptec FSA family RAID controllers (&man.aac.4; driver)
- <itemizedlist>
- <listitem>
- <para>Adaptec AAC-2622</para>
- </listitem>
- <listitem>
- <para>Adaptec AAC-364</para>
- </listitem>
- <listitem>
- <para>Adaptec SCSI RAID 2120S</para>
- </listitem>
- <listitem>
- <para>Adaptec SCSI RAID 2200S</para>
- </listitem>
- <listitem>
- <para>Adaptec SCSI RAID 5400S</para>
- </listitem>
- <listitem>
- <para>Dell PERC 2/QC</para>
- </listitem>
- <listitem>
- <para>Dell PERC 2/Si</para>
- </listitem>
- <listitem>
- <para>Dell PERC 3/Di</para>
- </listitem>
- <listitem>
- <para>Dell PERC 3/QC</para>
- </listitem>
- <listitem>
- <para>Dell PERC 3/Si</para>
- </listitem>
- <listitem>
- <para>HP NetRAID-4M</para>
- </listitem>
- </itemizedlist>
- </para>
+ <para arch="i386">Adaptec FSA family RAID controllers (&man.aac.4; driver)</para>
<para arch="pc98">NEC PC-9801-55, 92 and their compatible C-Bus SCSI interfaces (ct driver)
<itemizedlist>
@@ -503,66 +455,6 @@
<para arch="i386,alpha">AMI MegaRAID Express and Enterprise family RAID controllers
(&man.amr.4; driver)
- <itemizedlist>
- <listitem>
- <para>MegaRAID Series 418</para>
- </listitem>
- <listitem>
- <para>MegaRAID Enterprise 1200 (Series 428)</para>
- </listitem>
- <listitem>
- <para>MegaRAID Enterprise 1300 (Series 434)</para>
- </listitem>
- <listitem>
- <para>MegaRAID Enterprise 1400 (Series 438)</para>
- </listitem>
- <listitem>
- <para>MegaRAID Enterprise 1500 (Series 467)</para>
- </listitem>
- <listitem>
- <para>MegaRAID Enterprise 1600 (Series 471)</para>
- </listitem>
- <listitem>
- <para>MegaRAID Elite 1500 (Series 467)</para>
- </listitem>
- <listitem>
- <para>MegaRAID Elite 1600 (Series 493)</para>
- </listitem>
- <listitem>
- <para>MegaRAID Express 100 (Series 466WS)</para>
- </listitem>
- <listitem>
- <para>MegaRAID Express 200 (Series 466)</para>
- </listitem>
- <listitem>
- <para>MegaRAID Express 300 (Series 490)</para>
- </listitem>
- <listitem>
- <para>MegaRAID Express 500 (Series 475)</para>
- </listitem>
- <listitem>
- <para>Dell PERC</para>
- </listitem>
- <listitem>
- <para>Dell PERC 2/SC</para>
- </listitem>
- <listitem>
- <para>Dell PERC 2/DC</para>
- </listitem>
- <listitem>
- <para>Dell PERC 3/DCL</para>
- </listitem>
- <listitem>
- <para>HP NetRaid-1si</para>
- </listitem>
- <listitem>
- <para>HP NetRaid-3si</para>
- </listitem>
- <listitem>
- <para>HP Embedded NetRaid</para>
- </listitem>
- </itemizedlist>
-
<note>
<para arch="i386">Booting from these controllers is supported. EISA
adapters are not supported.</para>
@@ -574,35 +466,6 @@
<para arch="i386,alpha">Mylex DAC960 and DAC1100 RAID controllers with 2.x, 3.x, 4.x
and 5.x firmware (&man.mlx.4; driver)
- <itemizedlist>
- <listitem>
- <para>DAC960P</para>
- </listitem>
- <listitem>
- <para>DAC960PD</para>
- </listitem>
- <listitem>
- <para>DAC960PDU</para>
- </listitem>
- <listitem>
- <para>DAC960PL</para>
- </listitem>
- <listitem>
- <para>DAC960PJ</para>
- </listitem>
- <listitem>
- <para>DAC960PG</para>
- </listitem>
- <listitem>
- <para>AcceleRAID 150</para>
- </listitem>
- <listitem>
- <para>AcceleRAID 250</para>
- </listitem>
- <listitem>
- <para>eXtremeRAID 1100</para>
- </listitem>
- </itemizedlist>
<note>
<para arch="i386">Booting from these controllers is supported. EISA adapters
==== //depot/projects/ia64/sbin/Makefile#29 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.5 (Berkeley) 3/31/94
-# $FreeBSD: src/sbin/Makefile,v 1.124 2003/07/24 01:42:49 peter Exp $
+# $FreeBSD: src/sbin/Makefile,v 1.125 2003/08/14 18:55:57 rwatson Exp $
# XXX MISSING: icheck ncheck
@@ -19,6 +19,7 @@
dump \
dumpfs \
dumpon \
+ ffsinfo \
fsck \
fsck_ffs \
fsck_msdosfs \
==== //depot/projects/ia64/sbin/ffsinfo/Makefile#4 (text+ko) ====
@@ -1,7 +1,7 @@
# @(#)Makefile 8.8 (Berkeley) 6/21/2000
#
# $TSHeader: src/sbin/ffsinfo/Makefile,v 1.3 2000/12/05 19:45:10 tomsoft Exp $
-# $FreeBSD: src/sbin/ffsinfo/Makefile,v 1.5 2003/06/11 23:24:31 obrien Exp $
+# $FreeBSD: src/sbin/ffsinfo/Makefile,v 1.6 2003/08/14 18:55:31 rwatson Exp $
#
MAINTAINER= tomsoft at FreeBSD.ORG, chm at FreeBSD.ORG
@@ -15,5 +15,7 @@
WARNS?= 0
CFLAGS+=-DFS_DEBUG -I${GROWFS}
+DPADD= ${LIBUFS}
+LDADD= -lufs
.include <bsd.prog.mk>
==== //depot/projects/ia64/sbin/ffsinfo/ffsinfo.8#7 (text+ko) ====
@@ -35,7 +35,7 @@
.\" SUCH DAMAGE.
.\"
.\" $TSHeader: src/sbin/ffsinfo/ffsinfo.8,v 1.3 2000/12/12 19:30:55 tomsoft Exp $
-.\" $FreeBSD: src/sbin/ffsinfo/ffsinfo.8,v 1.12 2002/08/21 18:10:14 trhodes Exp $
+.\" $FreeBSD: src/sbin/ffsinfo/ffsinfo.8,v 1.13 2003/08/14 18:55:31 rwatson Exp $
.\"
.Dd September 8, 2000
.Dt FSINFO 8
@@ -45,7 +45,6 @@
.Nd "dump all meta information of an existing ufs file system"
.Sh SYNOPSIS
.Nm
-.Op Fl L
.Op Fl g Ar cylinder_group
.Op Fl i Ar inode
.Op Fl l Ar level
@@ -65,9 +64,6 @@
.Pp
The following options are available:
.Bl -tag -width indent
-.It Fl L
-Specifying this option skips the tests of the disklabel.
-This is done automatically, if the specified filename to dump is a plain file.
.It Fl g Ar cylinder_group
This restricts the dump to information about this cylinder group only.
Here
@@ -104,8 +100,6 @@
fragment allocation bitmap
.It Ar 0x040
cluster maps and summary
-.It Ar 0x080
-rotational layout tables
.It Ar 0x100
inode information
.It Ar 0x200
@@ -126,13 +120,7 @@
.Pa /dev/vinum/testvol
with all available information.
.Sh BUGS
-Currently
-.Nm
-can only dump unmounted file systems.
-Do not try dumping a mounted file system, your system may panic and you will
-not be able to use the file system any longer.
-.Pp
-Also snapshots are handled like plain files.
+Snapshots are handled like plain files.
They should get their own level to provide for independent control of the
amount of what gets dumped.
It probably also makes sense to some extend to dump the snapshot as a
==== //depot/projects/ia64/sbin/ffsinfo/ffsinfo.c#3 (text+ko) ====
@@ -48,19 +48,25 @@
#ifndef lint
static const char rcsid[] =
- "$FreeBSD: src/sbin/ffsinfo/ffsinfo.c,v 1.5 2002/08/21 18:10:14 trhodes Exp $";
+ "$FreeBSD: src/sbin/ffsinfo/ffsinfo.c,v 1.6 2003/08/14 18:55:31 rwatson Exp $";
#endif /* not lint */
/* ********************************************************** INCLUDES ***** */
#include <sys/param.h>
#include <sys/disklabel.h>
+#include <sys/mount.h>
#include <sys/stat.h>
-#include <stdio.h>
-#include <paths.h>
+#include <ufs/ufs/ufsmount.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>
+
#include <ctype.h>
#include <err.h>
#include <fcntl.h>
+#include <libufs.h>
+#include <paths.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -72,20 +78,18 @@
int _dbg_lvl_ = (DL_INFO); /* DL_TRC */
#endif /* FS_DEBUG */
+struct uufsd disk;
+
+#define sblock disk.d_fs
+#define acg disk.d_cg
+
static union {
- struct fs fs;
- char pad[SBSIZE];
-} fsun1, fsun2;
-#define sblock fsun1.fs
-#define osblock fsun2.fs
+ struct fs fs;
+ char pad[SBLOCKSIZE];
+} fsun;
-static union {
- struct cg cg;
- char pad[MAXBSIZE];
-} cgun1;
-#define acg cgun1.cg
+#define osblock fsun.fs
-static char ablk[MAXBSIZE];
static char i1blk[MAXBSIZE];
static char i2blk[MAXBSIZE];
static char i3blk[MAXBSIZE];
@@ -93,36 +97,14 @@
static struct csum *fscs;
/* ******************************************************** PROTOTYPES ***** */
-static void rdfs(daddr_t, size_t, void *, int);
static void usage(void);
-static struct disklabel *get_disklabel(int);
-static struct dinode *ginode(ino_t, int);
-static void dump_whole_inode(ino_t, int, int);
+static void dump_whole_ufs1_inode(ino_t, int);
+static void dump_whole_ufs2_inode(ino_t, int);
-/* ************************************************************** rdfs ***** */
-/*
- * Here we read some block(s) from disk.
- */
-void
-rdfs(daddr_t bno, size_t size, void *bf, int fsi)
-{
- DBG_FUNC("rdfs")
- ssize_t n;
-
- DBG_ENTER;
-
- if (lseek(fsi, (off_t)bno * DEV_BSIZE, 0) < 0) {
- err(33, "rdfs: seek error: %ld", (long)bno);
- }
- n = read(fsi, bf, size);
- if (n != (ssize_t)size) {
- err(34, "rdfs: read error: %ld", (long)bno);
- }
+#define DUMP_WHOLE_INODE(A,B) \
+ ( disk.d_ufs == 1 \
+ ? dump_whole_ufs1_inode((A),(B)) : dump_whole_ufs2_inode((A),(B)) )
- DBG_LEAVE;
- return;
-}
-
/* ************************************************************** main ***** */
/*
* ffsinfo(8) is a tool to dump all metadata of a file system. It helps to find
@@ -140,13 +122,10 @@
main(int argc, char **argv)
{
DBG_FUNC("main")
- char *device, *special, *cp;
+ char *device, *special;
char ch;
size_t len;
struct stat st;
- struct disklabel *lp;
- struct partition *pp;
- int fsi;
struct csum *dbg_csp;
int dbg_csc;
char dbg_line[80];
@@ -155,7 +134,6 @@
int cg_start, cg_stop;
ino_t in;
char *out_file;
- int Lflag=0;
DBG_ENTER;
@@ -167,11 +145,8 @@
errx(1, "strdup failed");
}
- while ((ch=getopt(argc, argv, "Lg:i:l:o:")) != -1) {
+ while ((ch=getopt(argc, argv, "g:i:l:o:")) != -1) {
switch(ch) {
- case 'L':
- Lflag=1;
- break;
case 'g':
cfg_cg=atol(optarg);
if(cfg_cg < -1) {
@@ -248,58 +223,9 @@
device = special;
}
- /*
- * Open our device for reading.
- */
- fsi = open(device, O_RDONLY);
- if (fsi < 0) {
- err(1, "%s", device);
- }
-
- stat(device, &st);
-
- if(S_ISREG(st.st_mode)) { /* label check not supported for files */
- Lflag=1;
- }
-
- if(!Lflag) {
- /*
- * Try to read a label and gess the slice if not specified.
- * This code should guess the right thing and avaid to bother
- * the user user with the task of specifying the option -v on
- * vinum volumes.
- */
- cp=device+strlen(device)-1;
- lp = get_disklabel(fsi);
- if(lp->d_type == DTYPE_VINUM) {
- pp = &lp->d_partitions[0];
- } else if (isdigit(*cp)) {
- pp = &lp->d_partitions[2];
- } else if (*cp>='a' && *cp<='h') {
- pp = &lp->d_partitions[*cp - 'a'];
- } else {
- errx(1, "unknown device");
- }
-
- /*
- * Check if that partition looks suited for dumping.
- */
- if (pp->p_size < 1) {
- errx(1, "partition is unavailable");
- }
- if (pp->p_fstype != FS_BSDFFS) {
- errx(1, "partition not 4.2BSD");
- }
- }
+ if (ufs_disk_fillout(&disk, device) == -1)
+ err(1, "ufs_disk_fillout(%s) failed: %s", device, disk.d_error);
- /*
- * Read the current superblock.
- */
- rdfs((daddr_t)(SBOFF/DEV_BSIZE), (size_t)SBSIZE, (void *)&sblock, fsi);
- if (sblock.fs_magic != FS_MAGIC) {
- errx(1, "superblock not recognized");
- }
-
DBG_OPEN(out_file); /* already here we need a superblock */
if(cfg_lv & 0x001) {
@@ -335,10 +261,14 @@
* Get the cylinder summary into the memory ...
*/
for (i = 0; i < sblock.fs_cssize; i += sblock.fs_bsize) {
- rdfs(fsbtodb(&sblock, sblock.fs_csaddr +
- numfrags(&sblock, i)), (size_t)(sblock.fs_cssize-i<
- sblock.fs_bsize ? sblock.fs_cssize - i :
- sblock.fs_bsize), (void *)(((char *)fscs)+i), fsi);
+ if (bread(&disk,
+ fsbtodb(&sblock, sblock.fs_csaddr + numfrags(&sblock, i)),
+ (void *)(((char *)fscs)+i),
+ (size_t)(sblock.fs_cssize-i < sblock.fs_bsize
+ ? sblock.fs_cssize - i
+ : sblock.fs_bsize)) == -1) {
+ err(1, "bread: %s", disk.d_error);
+ }
}
dbg_csp=fscs;
@@ -363,16 +293,20 @@
/*
* ... dump the superblock copies ...
*/
- rdfs(fsbtodb(&sblock, cgsblock(&sblock, cylno)),
- (size_t)SBSIZE, (void *)&osblock, fsi);
+ if (bread(&disk, fsbtodb(&sblock, cgsblock(&sblock, cylno)),
+ (void *)&osblock, SBLOCKSIZE) == -1) {
+ err(1, "bread: %s", disk.d_error);
+ }
DBG_DUMP_FS(&osblock,
dbg_line);
}
/*
* ... read the cylinder group and dump whatever was requested.
*/
- rdfs(fsbtodb(&sblock, cgtod(&sblock, cylno)),
- (size_t)sblock.fs_cgsize, (void *)&acg, fsi);
+ if (bread(&disk, fsbtodb(&sblock, cgtod(&sblock, cylno)),
+ (void *)&acg, (size_t)sblock.fs_cgsize) == -1) {
+ err(1, "bread: %s", disk.d_error);
+ }
if(cfg_lv & 0x008) {
DBG_DUMP_CG(&sblock,
dbg_line,
@@ -396,45 +330,50 @@
dbg_line,
&acg);
}
- if(cfg_lv & 0x080) {
+#ifdef NOT_CURRENTLY
+ /*
+ * See the comment in sbin/growfs/debug.c for why this
+ * is currently disabled, and what needs to be done to
+ * re-enable it.
+ */
+ if(disk.d_ufs == 1 && cfg_lv & 0x080) {
DBG_DUMP_SPTBL(&sblock,
dbg_line,
&acg);
}
+#endif
}
/*
* Dump the requested inode(s).
*/
if(cfg_in != -2) {
- dump_whole_inode((ino_t)cfg_in, fsi, cfg_lv);
+ DUMP_WHOLE_INODE((ino_t)cfg_in, cfg_lv);
} else {
- for(in=cg_start*sblock.fs_ipg; in<(ino_t)cg_stop*sblock.fs_ipg;
+ for(in=cg_start*sblock.fs_ipg; in<(ino_t)cg_stop*sblock.fs_ipg;
in++) {
- dump_whole_inode(in, fsi, cfg_lv);
+ DUMP_WHOLE_INODE(in, cfg_lv);
}
}
DBG_CLOSE;
- close(fsi);
-
DBG_LEAVE;
return 0;
}
-/* ************************************************** dump_whole_inode ***** */
+/* ********************************************** dump_whole_ufs1_inode ***** */
/*
* Here we dump a list of all blocks allocated by this inode. We follow
* all indirect blocks.
*/
void
-dump_whole_inode(ino_t inode, int fsi, int level)
+dump_whole_ufs1_inode(ino_t inode, int level)
{
- DBG_FUNC("dump_whole_inode")
- struct dinode *ino;
- int rb;
+ DBG_FUNC("dump_whole_ufs1_inode")
+ struct ufs1_dinode *ino;
+ int rb, mode;
unsigned int ind2ctr, ind3ctr;
- ufs_daddr_t *ind2ptr, *ind3ptr;
+ ufs1_daddr_t *ind2ptr, *ind3ptr;
char comment[80];
DBG_ENTER;
@@ -442,7 +381,8 @@
/*
* Read the inode from disk/cache.
*/
- ino=ginode(inode, fsi);
+ if (getino(&disk, (void **)&ino, inode, &mode) == -1)
+ err(1, "getino: %s", disk.d_error);
if(ino->di_nlink==0) {
DBG_LEAVE;
@@ -472,49 +412,57 @@
/*
* Dump single indirect block.
*/
- rdfs(fsbtodb(&sblock, ino->di_ib[0]), (size_t)sblock.fs_bsize,
- (void *)&i1blk, fsi);
+ if (bread(&disk, fsbtodb(&sblock, ino->di_ib[0]), (void *)&i1blk,
+ (size_t)sblock.fs_bsize) == -1) {
+ err(1, "bread: %s", disk.d_error);
+ }
snprintf(comment, sizeof(comment), "Inode 0x%08x: indirect 0",
inode);
DBG_DUMP_IBLK(&sblock,
comment,
i1blk,
(size_t)rb);
- rb-=howmany(sblock.fs_bsize, sizeof(ufs_daddr_t));
+ rb-=howmany(sblock.fs_bsize, sizeof(ufs1_daddr_t));
}
if(rb>0) {
/*
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list