117703 Commits

Author SHA1 Message Date
delphij
e27db9d6b8 MFC (by le)
|  Prevent that sync operations can be started when they are already
|  in progress, and be a bit more user friendly in terms of error
|  messages returned from the kernel.
|
|  Revision  Changes    Path
|  1.11      +81 -71    src/sys/geom/vinum/geom_vinum_init.c

Approved by:	re (scottl)
2005-10-09 04:36:44 +00:00
delphij
5cd27adb61 MFC (by le)
| Correct the check if a plex is accessible in case it is not up.
| This makes degraded RAID5 plexes actually work.
|
| Revision  Changes    Path
| 1.10      +1 -1      src/sys/geom/vinum/geom_vinum_volume.cle

Approved by:	re (scottl)
2005-10-09 04:35:42 +00:00
ume
30c69abdde MFC 1.16: stop RFC 4193 address on the outside interface.
Approved by:	re (scottl)
Committed at:	CBUG Meeting meets XCAST6 Festival
2005-10-09 04:35:10 +00:00
delphij
18a5a36c5c MFC (by le)
| Shuffle around the order in which the components are compiled.
|
| This way, the VINUMDRIVE class is loaded before the VINUM class,
| but since geom does the tasting for newly arrived classes
| last-in-first-out, the VINUM class tastes first.
|
| This removes the need to call gv_parse_config() in the drive
| taste path.
|
| Revision  Changes    Path
| 1.20      +4 -14     src/sys/geom/vinum/geom_vinum_drive.c
| 1.2       +1 -1      src/sys/modules/geom/geom_vinum/Makefile

Approved by:	re (scottl)
2005-10-09 04:34:29 +00:00
delphij
23924d685f MFC (by jhb)
| - Add an assertion to panic if one tries to call mtx_trylock() on a spin
|   mutex.
| - Don't panic if a spin lock is held too long inside _mtx_lock_spin() if
|   panicstr is set (meaning that we are already in a panic).  Just keep
|   spinning forever instead.
|
|   Revision  Changes    Path
|   1.157     +4 -1      src/sys/kern/kern_mutex.c

Approved by:	re (scottl)
2005-10-09 04:30:31 +00:00
delphij
780fed3f51 MFC (by andre)
| Use the correct mbuf type for MGET().
|
| Revision  Changes    Path
| 1.304     +1 -1      src/sys/netinet/ip_input.c
| 1.246     +1 -1      src/sys/netinet/ip_output.c
| 1.232     +1 -1      src/sys/netinet/tcp_subr.c
| 1.97      +1 -1      src/sys/netinet6/ip6_output.c

Approved by:	re (scottl)
2005-10-09 04:24:45 +00:00
delphij
c54b3c27f5 MFC (by andre)
| Use the correct mbuf type for MGET().
|
| Revision  Changes    Path
| 1.28      +1 -1      src/sys/netatalk/ddp_output.c

Approved by:	re (scottl)
2005-10-09 04:22:03 +00:00
delphij
bc89d0daf4 MFC (by andre)
| Test the mbuf flags against the correct constant.  The previous
| version worked as intended but only by chance.
|
| MT_HEADER == M_PKTHDR == 0x2.
|
| Revision  Changes    Path
| 1.85      +1 -1      src/sys/compat/ndis/kern_ndis.c

Approved by:	re (scottl)
2005-10-09 04:21:11 +00:00
delphij
7164a33da2 MFC (by ru)
| Fix "struct ifnet" leak if attach() fails in the middle.
|
| Revision  Changes    Path
| 1.39      +2 -0      src/sys/contrib/dev/oltr/if_oltr.c
| 1.94      +1 -0      src/sys/dev/fe/if_fe.c
| 1.114     +3 -1      src/sys/dev/lnc/if_lnc.c
| 1.11      +3 -1      src/sys/dev/nve/if_nve.c
| 1.12      +3 -1      src/sys/dev/patm/if_patm_attach.c

Approved by:	re (scottl)
2005-10-09 04:18:18 +00:00
delphij
44895bc543 MFC (by ru)
| Avoid deferencing NULL in if_free().
|
| Revision  Changes    Path
| 1.16      +2 -3      src/sys/dev/ral/if_ral.c

Approved by:	re (scottl)
2005-10-09 04:15:59 +00:00
delphij
112fbfa0fd MFC (by ru)
| Fix "struct ifnet" leaks when attach() fails in the middle.
|
| Revision  Changes    Path
| 1.28      +4 -5      src/sys/dev/bfe/if_bfe.c
| 1.95      +3 -2      src/sys/dev/bge/if_bge.c
| 1.21      +2 -0      src/sys/dev/cnw/if_cnw.c
| 1.261     +2 -1      src/sys/dev/ed/if_ed.c
| 1.38      +9 -2      src/sys/dev/en/if_en_pci.c
| 1.59      +3 -1      src/sys/dev/ex/if_ex.c
| 1.26      +4 -3      src/sys/dev/hatm/if_hatm.c
| 1.105     +2 -1      src/sys/dev/ie/if_ie.c
| 1.17      +2 -1      src/sys/dev/vge/if_vge.c

Approved by:	re (scottl)
2005-10-09 04:15:12 +00:00
delphij
3527f35222 MFC (by ru)
| Fix "struct ifnet" leaks when attach() fails in the middle, e.g.
| when mii_phy_probe() or bus_setup_intr() fails.  For drivers that
| call their detach() in this case, call if_free() there to cover
| this case too.
|
| Revision  Changes    Path
| 1.168     +2 -2      src/sys/pci/if_dc.c
| 1.75      +2 -2      src/sys/pci/if_pcn.c
| 1.156     +3 -5      src/sys/pci/if_rl.c (already merged)
| 1.87      +2 -2      src/sys/pci/if_sf.c
| 1.136     +2 -3      src/sys/pci/if_sis.c
| 1.110     +2 -3      src/sys/pci/if_sk.c
| 1.89      +2 -2      src/sys/pci/if_ste.c
| 1.110     +2 -2      src/sys/pci/if_ti.c
| 1.103     +2 -2      src/sys/pci/if_tl.c
| 1.107     +2 -2      src/sys/pci/if_vr.c
| 1.83      +2 -2      src/sys/pci/if_wb.c
| 1.196     +2 -2      src/sys/pci/if_xl.c

Approved by:	re (scottl)
2005-10-09 04:11:20 +00:00
delphij
1fbf99add2 MFC (by ru)
| Fix "struct ifnet" leak on detach.
|
| Revision  Changes    Path
| 1.104     +1 -0      src/sys/dev/ath/if_ath.c

Approved by:	re (scottl)
2005-10-09 04:00:47 +00:00
delphij
cf5f829810 MFC (by ru)
| Add missing mtx_destroy() when if_alloc() fails.
| Add missing if_free() when mii_phy_probe() fails.
| Put if_free() into the correct #ifdef in detach().
|
| Revision  Changes    Path
| 1.93      +6 -1      src/sys/dev/usb/if_aue.c
| 1.33      +6 -1      src/sys/dev/usb/if_axe.c
| 1.9       +2 -0      src/sys/dev/usb/if_cdce.c
| 1.60      +5 -1      src/sys/dev/usb/if_cue.c
| 1.67      +5 -1      src/sys/dev/usb/if_kue.c
| 1.17      +3 -0      src/sys/dev/usb/if_udav.c

Approved by:	re (scottl)
2005-10-09 03:59:36 +00:00
delphij
0159af9c94 MFC (by ru)
| Add missing if_free() in rue_detach().
|
| Revision  Changes    Path
| 1.25      +1 -0      src/sys/dev/usb/if_rue.c

Approved by:	re (scottl)
2005-10-09 03:56:37 +00:00
delphij
2d065140b8 MFC (by ps)
| Unbreak tail -f on non-local filesystems.
|
| Revision  Changes    Path
| 1.39      +10 -0     src/usr.bin/tail/forward.c

Approved by:	re (scottl)
2005-10-09 03:51:55 +00:00
delphij
4e1ef01420 MFC (by dds)
| Interpret correctly the glob(3) return value.
| Previously, interactive commands specifying a non-existent file or
| directory used to display an "out of memory error".
|
| MFC after:      2 weeks
|
| Revision  Changes    Path
| 1.18      +7 -1      src/sbin/restore/interactive.c

Approved by:	re (scottl)
2005-10-09 03:50:30 +00:00
delphij
2bc56e044b MFC revision 1.70
date: 2005/07/17 03:24:11;  author: obrien;  state: Exp;  lines: +0 -29
Catch up with menus.c revision 1.399.

Approved by:	re (scottl)
2005-10-09 03:48:42 +00:00
delphij
52502943e5 MFC (by stefanf):
| Log:
| El_parse's third parameter is now const-qualified, add a cast.
|
| Revision  Changes    Path
| 1.27      +1 -1      src/bin/sh/histedit.c

Approved by:	re (scottl)
2005-10-09 03:46:26 +00:00
delphij
7c007a1069 MFC (by stefanf):
| The libedit update made a const cast necessary.
|
| Revision  Changes    Path
| 1.30      +1 -1      src/sbin/fsdb/fsdb.c

Approved by:	re (scottl)
2005-10-09 03:45:28 +00:00
delphij
f93a29eca0 MFC stefanf's work on libedit. This includes a sync with NetBSD/OpenBSD
and some bugfixes.

Approved by:	re (scottl)
2005-10-09 03:44:01 +00:00
delphij
a89c653df5 MFC (by obrien)
| Fix bug where GCC thought athlon-tbird had SSE support.
|
| Revision  Changes    Path
| 1.21      +4 -4      src/contrib/gcc/config/i386/i386.h

Approved by:	re (scottl)
2005-10-09 03:37:42 +00:00
delphij
04dc98a1b0 MFC (by obrien)
| Remove WANT_FORCE_OPTIMIZATION_DOWNGRADE and out dated warnings about
| libalias(3) exposing compiler bugs.
|
| Revision  Changes    Path
| 1.266     +2 -10     src/share/examples/etc/make.conf

Approved by:	re (scottl)
2005-10-09 03:36:41 +00:00
delphij
7c26851aa1 MFC (by obrien)
| Ensure the full value is written into inode variables.
|
| PR:             85503
| Submitted by:   Dmitry Pryanishnikov <dmitry@atlantis.dp.ua>
|
| Revision  Changes    Path
| 1.89      +2 -2      src/sys/fs/msdosfs/msdosfs_denode.c

Approved by:	re (scottl)
2005-10-09 03:33:52 +00:00
delphij
be43bdee0e MFC (by phk)
| Comment typo
|
| Revision  Changes    Path
| 1.23      +1 -1      src/sys/geom/bde/g_bde_crypt.c

Approved by:	re (scottl)
2005-10-09 03:30:30 +00:00
delphij
58595c1a96 MFC (by davidxu)
| Reorder statements to avoid accessing unknown memory.
| In theory, invoking kenv with very long string can panic
| kernel.
|
| Revision  Changes    Path
| 1.41      +2 -2      src/sys/kern/kern_environment.c

Approved by:	re (scottl)
2005-10-09 03:29:03 +00:00
delphij
29f73bbbe3 MFC (by netchild)
|  Add bounds checking to the setenv part of the kernel environment.
|
| PR:             83687 [1]
| Submitted by:   Harry Coin <harrycoin@qconline.com> [1]
| Submitted by:   Ariff Abdullah <skywizard@MyBSD.org.my> [2]
|
| Revision  Changes    Path
| 1.40      +10 -1     src/sys/kern/kern_environment.c

Approved by:	re (scottl)
2005-10-09 03:27:36 +00:00
delphij
86fff66f18 MFC (by jhb):
| Trim a couple of unneeded includes.
|
| Revision  Changes    Path
| 1.153     +0 -1      src/sys/kern/subr_turnstile.c
| 1.35      +0 -1      src/sys/vm/vm_zeroidle.c

Approved by:	re (scottl)
2005-10-09 03:25:37 +00:00
delphij
3a5f5c6bf5 MFC (by ps):
| Fix up the comment for MAX_SACK_BLKS.
|
| Submitted by:   Noritoshi Demizu
|
| Revision  Changes    Path
| 1.32      +1 -1      src/sys/netinet/tcp.h

Approved by:	re (scottl)
2005-10-09 03:22:51 +00:00
delphij
31cd49528b MFC (by ps):
| Fixes for NFS crashes on architectures that require strict alignment.
| - Fix nfsm_disct() so that after pulling up data, the remaining data
|   is aligned if necessary.
| - Fix nfs_clnt_tcp_soupcall() to bcopy() the rpc length out of the
|   mbuf (instead of casting m_data to a uint32).
|
| Submitted by:   Pyun YongHyeon
| Reviewed by:    Mohan Srinivasan
|
| Revision  Changes    Path
| 1.118     +12 -3     src/sys/nfs/nfs_common.c
| 1.38      +6 -0      src/sys/nfs/nfs_common.h
| 1.126     +2 -1      src/sys/nfsclient/nfs_socket.c

Approved by:	re (scottl)
2005-10-09 03:21:56 +00:00
delphij
4e1e9b5f05 MFC (by andre)
| Remove unnecessary IPSEC includes.
|
| MFC after:      2 weeks
| Sponsored by:   TCP/IP Optimization Fundraise 2005
|
| Revision  Changes    Path
| 1.27      +0 -11     src/sys/netinet/tcp_sack.c
| 1.126     +0 -5      src/sys/netinet/tcp_usrreq.c

Approved by:	re (scottl)
2005-10-09 03:17:41 +00:00
delphij
373205352c MFC (by ps)
| In nfs_nget() if two threads race on the same filehandle, the loser
| should cause the nfsnode to get freed. This fixes a potential vnode
| (and nfsnode) leak in that path.
|
| Submitted by:   Mohan Srinivasan
| Reviewed by:    phk
|
| Revision  Changes    Path
| 1.78      +2 -1      src/sys/nfsclient/nfs_node.c

Approved by:	re (scottl)
2005-10-09 03:15:36 +00:00
delphij
fa2b46e4e1 MFC (by andre)
| Remove bogous semicolons at the end of the definitions of
| 'do { ... } while (0)' macros.
|
| PR:             kern/83088
| Sumbitted by:   <antoine.brodin at laposte.net>

Approved by:	re (scottl)
2005-10-09 03:13:49 +00:00
delphij
f1abc488c4 MFC (by alc)
| Eliminate an incorrect cast.
|
| Revision  Changes    Path
| 1.208     +1 -1      src/sys/vm/vm_fault.c

Approved by:	re (scottl)
2005-10-09 03:08:28 +00:00
delphij
a23e4ad2fe MFC (by alc)
| Eliminate an incorrect (and unnecessary) cast.
|
| Revision  Changes    Path
| 1.367     +1 -1      src/sys/vm/vm_map.c

Approved by:	re (scottl)
2005-10-09 03:07:29 +00:00
delphij
1a4ed13319 MFC (by peter)
| Remove unused (but initialized) variable 'objsize' from vm_mmap()
|
| Revision  Changes    Path
| 1.201     +1 -2      src/sys/vm/vm_mmap.c

Approved by:	re (scottl)
2005-10-09 03:05:23 +00:00
tanimura
e04edc1b3f MFC 1.35: do not derefer NULL sc in ngt_input().
Approved by:	re (scottl)
2005-10-09 00:19:28 +00:00
rodrigc
3e9ac3c943 MFC 1.58
Fix so that when a slice or a partition is removed through g_slice_config(),
  it is destroyed in GEOM, in addition to being removed from /dev.
  Before this patch, if you applied a new MBR which deleted a slice,
  the deleted slice would not be in /dev, but it would still appear
  in kern.geom.conftxt and kern.geom.confxml, which would confused
  the diskPartitionEditor in sysinstall.

Submitted by:	pjd
Requested by:	delphij
Approved by:	re (scottl)
2005-10-08 22:11:38 +00:00
pjd
8660beb374 MFC: lib/libmd/sha256.3 1.3
Correct type.

Approved by:	re (scottl)
Requested by:	delphij
OK'ed by:	cperciva
2005-10-08 21:46:23 +00:00
thompsa
34f6f0204d MFC r1.2
Display the status of the spanning tree for each port.

        member: xl0 flags=7<LEARNING,DISCOVER,STP>
        member: gem0 flags=7<LEARNING,DISCOVER,STP>
 to:
        member: xl0 flags=7<LEARNING,DISCOVER,STP>
                port 3 priority 128 path cost 55 forwarding
        member: gem0 flags=7<LEARNING,DISCOVER,STP>
                port 1 priority 128 path cost 55 learning

Approved by:	re (scottl)
2005-10-08 21:19:15 +00:00
delphij
6092a2ab34 MFC (by ume)
| refer RFC 3542 rather than RFC 2292bis.
|
| Submitted by:   Keiichi SHIMA <keiichi__at__iijlab.net>
| Obtained from:  KAME
|
| Revision  Changes    Path
| 1.8       +2 -2      src/lib/libc/net/ip6opt.c
| 1.25      +1 -1      src/lib/libc/net/rcmd.3 (already merged)
| 1.8       +1 -1      src/lib/libc/net/rthdr.c

Approved by:	re (scottl)
2005-10-08 20:58:29 +00:00
delphij
6c069067ed MFC (by ume)
| fixed the validation code of routing header length in inet6_rth_getaddr().
| reported by Delia Kecskemeti <delia.kecskemeti__at__windriver.com>
|
| Submitted by:   Keiichi SHIMA <keiichi__at__iijlab.net>
| Obtained from:  KAME
|
| Revision  Changes    Path
| 1.7       +3 -4      src/lib/libc/net/rthdr.c

Approved by:	re (scottl)
2005-10-08 20:52:53 +00:00
keramida
168f95cde9 MFC:
1.36	- Removal of obsolete/wrong OPTIONS section
	1.37	- Workaround for an mdoc bug by trhodes

Approved by:	re (kensmith)
2005-10-08 19:01:21 +00:00
imp
5eaca6ae49 MFC: Bring in support for new PC Card chipset (TC5299J) and old
ISA/PCI chipset (RTL8019 and RTL8029).  Eliminate ED_NO_MIIBUS option.
You are now required to have miibus if you have pccard in your kernel
(but not required if you don't!).  Split out register definitions for
possible future subsetting.

Approved by: re@ (scottl)
2005-10-08 18:00:41 +00:00
delphij
7eae1cb08f MFC (by deischen)
|  Add usleep to the map files.
|
|  Noticed by:     davidxu
|
|  Revision  Changes    Path
|  1.15      +2 -0      src/lib/libpthread/pthread.map
|  1.4       +2 -0      src/lib/libthr/pthread.map

Approved by:	re (kensmith)
Ok'ed by:	deischen, davidxu
2005-10-08 17:58:11 +00:00
delphij
1a10afa24f MFC (by deischen)
|  Add a cancellation point for usleep().
|
|  Revision  Changes    Path
|  1.9       +16 -1     src/lib/libpthread/thread/thr_sleep.c

Approved by:	re (kensmith)
Ok'ed by:	deischen, davidxu
2005-10-08 17:57:49 +00:00
delphij
c87122e6d8 MFC (by deischen)
|  Add a cancellation point for usleep().
|
|  While here, fix sleep() so that it is also a cancellation point (a
|  missing weak reference prevented that).
|
|  Revision  Changes    Path
|  1.10      +19 -0     src/lib/libthr/thread/thr_syscalls.c

Approved by:	re (kensmith)
Ok'ed by:	deischen, davidxu
2005-10-08 17:57:28 +00:00
maxim
2d97b0f05a MFC rev. 1.77: restore kerneldumpheader.architectureversion bytes
swopping.

Approved by:	re (kensmith)
2005-10-08 17:57:15 +00:00
delphij
50d80715c4 MFC (by deischen)
|  Make syslog() use the internal (non-cancellation point) _usleep().
|  Prior to this it was calling the cancellable usleep() while holding
|  a lock.
|
|  Revision  Changes    Path
|  1.36      +1 -1      src/lib/libc/gen/syslog.c

Approved by:	re (kensmith)
Ok'ed by:	deischen, davidxu
2005-10-08 17:57:10 +00:00
delphij
1de4269756 MFC (by deischen)
| Make usleep() overridable by the thread libraries so they can provide
| cancellation points.
|
| Noticed by:     phk
|
| Revision  Changes    Path
| 1.29      +4 -1      src/lib/libc/gen/usleep.c

Approved by:	re (kensmith)
Ok'ed by:	deischen, davidxu
2005-10-08 17:56:53 +00:00