svn commit: r223053 - in projects/largeSMP: contrib/top share/mk
sys/netinet sys/pc98/conf sys/sparc64/conf sys/ufs/ffs
usr.bin/find usr.sbin/makefs/ffs
Attilio Rao
attilio at FreeBSD.org
Mon Jun 13 18:27:09 UTC 2011
Author: attilio
Date: Mon Jun 13 18:27:09 2011
New Revision: 223053
URL: http://svn.freebsd.org/changeset/base/223053
Log:
MFC
Modified:
projects/largeSMP/sys/netinet/tcp_output.c
projects/largeSMP/sys/pc98/conf/GENERIC
projects/largeSMP/sys/sparc64/conf/GENERIC
projects/largeSMP/sys/ufs/ffs/ffs_extern.h
projects/largeSMP/usr.bin/find/function.c
projects/largeSMP/usr.sbin/makefs/ffs/ffs_bswap.c
projects/largeSMP/usr.sbin/makefs/ffs/ffs_subr.c
Directory Properties:
projects/largeSMP/ (props changed)
projects/largeSMP/cddl/contrib/opensolaris/ (props changed)
projects/largeSMP/contrib/bind9/ (props changed)
projects/largeSMP/contrib/binutils/ (props changed)
projects/largeSMP/contrib/bzip2/ (props changed)
projects/largeSMP/contrib/compiler-rt/ (props changed)
projects/largeSMP/contrib/dialog/ (props changed)
projects/largeSMP/contrib/ee/ (props changed)
projects/largeSMP/contrib/expat/ (props changed)
projects/largeSMP/contrib/file/ (props changed)
projects/largeSMP/contrib/gcc/ (props changed)
projects/largeSMP/contrib/gdb/ (props changed)
projects/largeSMP/contrib/gdtoa/ (props changed)
projects/largeSMP/contrib/gnu-sort/ (props changed)
projects/largeSMP/contrib/groff/ (props changed)
projects/largeSMP/contrib/less/ (props changed)
projects/largeSMP/contrib/libpcap/ (props changed)
projects/largeSMP/contrib/libstdc++/ (props changed)
projects/largeSMP/contrib/llvm/ (props changed)
projects/largeSMP/contrib/llvm/tools/clang/ (props changed)
projects/largeSMP/contrib/ncurses/ (props changed)
projects/largeSMP/contrib/netcat/ (props changed)
projects/largeSMP/contrib/ntp/ (props changed)
projects/largeSMP/contrib/one-true-awk/ (props changed)
projects/largeSMP/contrib/openbsm/ (props changed)
projects/largeSMP/contrib/openpam/ (props changed)
projects/largeSMP/contrib/pf/ (props changed)
projects/largeSMP/contrib/sendmail/ (props changed)
projects/largeSMP/contrib/tcpdump/ (props changed)
projects/largeSMP/contrib/tcsh/ (props changed)
projects/largeSMP/contrib/top/ (props changed)
projects/largeSMP/contrib/top/install-sh (props changed)
projects/largeSMP/contrib/tzcode/stdtime/ (props changed)
projects/largeSMP/contrib/tzcode/zic/ (props changed)
projects/largeSMP/contrib/tzdata/ (props changed)
projects/largeSMP/contrib/wpa/ (props changed)
projects/largeSMP/contrib/xz/ (props changed)
projects/largeSMP/crypto/openssh/ (props changed)
projects/largeSMP/crypto/openssl/ (props changed)
projects/largeSMP/gnu/lib/ (props changed)
projects/largeSMP/gnu/usr.bin/binutils/ (props changed)
projects/largeSMP/gnu/usr.bin/cc/cc_tools/ (props changed)
projects/largeSMP/gnu/usr.bin/gdb/ (props changed)
projects/largeSMP/lib/libc/ (props changed)
projects/largeSMP/lib/libc/stdtime/ (props changed)
projects/largeSMP/lib/libutil/ (props changed)
projects/largeSMP/lib/libz/ (props changed)
projects/largeSMP/sbin/ (props changed)
projects/largeSMP/sbin/ipfw/ (props changed)
projects/largeSMP/share/mk/bsd.arch.inc.mk (props changed)
projects/largeSMP/share/zoneinfo/ (props changed)
projects/largeSMP/sys/ (props changed)
projects/largeSMP/sys/amd64/include/xen/ (props changed)
projects/largeSMP/sys/boot/ (props changed)
projects/largeSMP/sys/boot/i386/efi/ (props changed)
projects/largeSMP/sys/boot/ia64/efi/ (props changed)
projects/largeSMP/sys/boot/ia64/ski/ (props changed)
projects/largeSMP/sys/boot/powerpc/boot1.chrp/ (props changed)
projects/largeSMP/sys/boot/powerpc/ofw/ (props changed)
projects/largeSMP/sys/cddl/contrib/opensolaris/ (props changed)
projects/largeSMP/sys/conf/ (props changed)
projects/largeSMP/sys/contrib/dev/acpica/ (props changed)
projects/largeSMP/sys/contrib/octeon-sdk/ (props changed)
projects/largeSMP/sys/contrib/pf/ (props changed)
projects/largeSMP/sys/contrib/x86emu/ (props changed)
projects/largeSMP/usr.bin/calendar/ (props changed)
projects/largeSMP/usr.bin/csup/ (props changed)
projects/largeSMP/usr.bin/procstat/ (props changed)
projects/largeSMP/usr.sbin/ndiscvt/ (props changed)
projects/largeSMP/usr.sbin/zic/ (props changed)
Modified: projects/largeSMP/sys/netinet/tcp_output.c
==============================================================================
--- projects/largeSMP/sys/netinet/tcp_output.c Mon Jun 13 16:05:41 2011 (r223052)
+++ projects/largeSMP/sys/netinet/tcp_output.c Mon Jun 13 18:27:09 2011 (r223053)
@@ -1331,7 +1331,7 @@ out:
* then remember the size of the advertised window.
* Any pending ACK has now been sent.
*/
- if (recwin > 0 && SEQ_GT(tp->rcv_nxt + recwin, tp->rcv_adv))
+ if (recwin >= 0 && SEQ_GT(tp->rcv_nxt + recwin, tp->rcv_adv))
tp->rcv_adv = tp->rcv_nxt + recwin;
tp->last_ack_sent = tp->rcv_nxt;
tp->t_flags &= ~(TF_ACKNOW | TF_DELACK);
Modified: projects/largeSMP/sys/pc98/conf/GENERIC
==============================================================================
--- projects/largeSMP/sys/pc98/conf/GENERIC Mon Jun 13 16:05:41 2011 (r223052)
+++ projects/largeSMP/sys/pc98/conf/GENERIC Mon Jun 13 18:27:09 2011 (r223053)
@@ -139,12 +139,6 @@ device sc
# Add suspend/resume support for the i8254.
#device pmtimer
-# Audio support
-#device sound # Generic sound driver
-#device snd_mss # Microsoft Sound System
-#device "snd_sb16" # Sound Blaster 16
-#device snd_sbc # Sound Blaster
-
# PCCARD (PCMCIA) support
# PCMCIA and cardbus bridge support
device cbb # cardbus (yenta) bridge
@@ -288,3 +282,10 @@ device bpf # Berkeley packet filter
#device firewire # FireWire bus code
#device sbp # SCSI over FireWire (Requires scbus and da)
#device fwe # Ethernet over FireWire (non-standard!)
+
+# Sound support
+#device sound # Generic sound driver (required)
+#device snd_mss # Microsoft Sound System
+#device "snd_sb16" # Sound Blaster 16
+#device snd_sbc # Sound Blaster
+#device snd_uaudio # USB Audio
Modified: projects/largeSMP/sys/sparc64/conf/GENERIC
==============================================================================
--- projects/largeSMP/sys/sparc64/conf/GENERIC Mon Jun 13 16:05:41 2011 (r223052)
+++ projects/largeSMP/sys/sparc64/conf/GENERIC Mon Jun 13 18:27:09 2011 (r223053)
@@ -61,13 +61,13 @@ options PRINTF_BUFR_SIZE=128 # Prevent
options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
options AUDIT # Security event auditing
options MAC # TrustedBSD MAC Framework
-options INCLUDE_CONFIG_FILE # Include this file in kernel
+options INCLUDE_CONFIG_FILE # Include this file in kernel
# Debugging for use in -current
options KDB # Enable kernel debugger support.
options DDB # Support DDB.
options GDB # Support remote GDB.
-options DEADLKRES # Enable the deadlock resolver
+options DEADLKRES # Enable the deadlock resolver
options INVARIANTS # Enable calls of extra sanity checking
options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
options WITNESS # Enable checks to detect deadlocks and cycles
@@ -266,3 +266,10 @@ device fwe # Ethernet over FireWire (n
device fwip # IP over FireWire (RFC 2734,3146)
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
+
+# Sound support
+device sound # Generic sound driver (required)
+device snd_audiocs # Crystal Semiconductor CS4231
+device snd_es137x # Ensoniq AudioPCI ES137x
+device snd_t4dwave # Acer Labs M5451
+device snd_uaudio # USB Audio
Modified: projects/largeSMP/sys/ufs/ffs/ffs_extern.h
==============================================================================
--- projects/largeSMP/sys/ufs/ffs/ffs_extern.h Mon Jun 13 16:05:41 2011 (r223052)
+++ projects/largeSMP/sys/ufs/ffs/ffs_extern.h Mon Jun 13 18:27:09 2011 (r223053)
@@ -166,6 +166,7 @@ void softdep_freework(struct workhead *)
int ffs_rdonly(struct inode *);
+#ifdef _KERNEL
TAILQ_HEAD(snaphead, inode);
struct snapdata {
@@ -175,5 +176,6 @@ struct snapdata {
daddr_t *sn_blklist;
struct lock sn_lock;
};
+#endif /* _KERNEL */
#endif /* !_UFS_FFS_EXTERN_H */
Modified: projects/largeSMP/usr.bin/find/function.c
==============================================================================
--- projects/largeSMP/usr.bin/find/function.c Mon Jun 13 16:05:41 2011 (r223052)
+++ projects/largeSMP/usr.bin/find/function.c Mon Jun 13 18:27:09 2011 (r223053)
@@ -846,7 +846,8 @@ f_fstype(PLAN *plan, FTSENT *entry)
static dev_t curdev; /* need a guaranteed illegal dev value */
static int first = 1;
struct statfs sb;
- static int val_type, val_flags;
+ static int val_flags;
+ static char fstype[sizeof(sb.f_fstypename)];
char *p, save[2] = {0,0};
if ((plan->flags & F_MTMASK) == F_MTUNKNOWN)
@@ -888,13 +889,13 @@ f_fstype(PLAN *plan, FTSENT *entry)
* always copy both of them.
*/
val_flags = sb.f_flags;
- val_type = sb.f_type;
+ strlcpy(fstype, sb.f_fstypename, sizeof(fstype));
}
switch (plan->flags & F_MTMASK) {
case F_MTFLAG:
return val_flags & plan->mt_data;
case F_MTTYPE:
- return val_type == plan->mt_data;
+ return (strncmp(fstype, plan->c_data, sizeof(fstype)) == 0);
default:
abort();
}
@@ -905,22 +906,11 @@ c_fstype(OPTION *option, char ***argvp)
{
char *fsname;
PLAN *new;
- struct xvfsconf vfc;
fsname = nextarg(option, argvp);
ftsoptions &= ~FTS_NOSTAT;
new = palloc(option);
-
- /*
- * Check first for a filesystem name.
- */
- if (getvfsbyname(fsname, &vfc) == 0) {
- new->flags |= F_MTTYPE;
- new->mt_data = vfc.vfc_typenum;
- return new;
- }
-
switch (*fsname) {
case 'l':
if (!strcmp(fsname, "local")) {
@@ -938,12 +928,8 @@ c_fstype(OPTION *option, char ***argvp)
break;
}
- /*
- * We need to make filesystem checks for filesystems
- * that exists but aren't in the kernel work.
- */
- fprintf(stderr, "Warning: Unknown filesystem type %s\n", fsname);
- new->flags |= F_MTUNKNOWN;
+ new->flags |= F_MTTYPE;
+ new->c_data = fsname;
return new;
}
Modified: projects/largeSMP/usr.sbin/makefs/ffs/ffs_bswap.c
==============================================================================
--- projects/largeSMP/usr.sbin/makefs/ffs/ffs_bswap.c Mon Jun 13 16:05:41 2011 (r223052)
+++ projects/largeSMP/usr.sbin/makefs/ffs/ffs_bswap.c Mon Jun 13 18:27:09 2011 (r223053)
@@ -34,9 +34,6 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/lock.h>
-#include <sys/lockmgr.h>
#if defined(_KERNEL)
#include <sys/systm.h>
#endif
Modified: projects/largeSMP/usr.sbin/makefs/ffs/ffs_subr.c
==============================================================================
--- projects/largeSMP/usr.sbin/makefs/ffs/ffs_subr.c Mon Jun 13 16:05:41 2011 (r223052)
+++ projects/largeSMP/usr.sbin/makefs/ffs/ffs_subr.c Mon Jun 13 18:27:09 2011 (r223053)
@@ -35,9 +35,6 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/lock.h>
-#include <sys/lockmgr.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
More information about the svn-src-projects
mailing list