svn commit: r248229 - in user/attilio/vmobj-readlock: games/fortune/datfiles share/misc sys sys/arm/at91 sys/dev/bge sys/dev/re sys/kern sys/net sys/netinet/libalias sys/netpfil/pf sys/nfs sys/nfsc...
Attilio Rao
attilio at FreeBSD.org
Wed Mar 13 03:27:36 UTC 2013
Author: attilio
Date: Wed Mar 13 03:27:32 2013
New Revision: 248229
URL: http://svnweb.freebsd.org/changeset/base/248229
Log:
Merge from vmcontention.
Deleted:
user/attilio/vmobj-readlock/games/fortune/datfiles/fortunes-o.fake
user/attilio/vmobj-readlock/games/fortune/datfiles/fortunes-o.real
user/attilio/vmobj-readlock/games/fortune/datfiles/fortunes-o.sp.ok
Modified:
user/attilio/vmobj-readlock/games/fortune/datfiles/Makefile
user/attilio/vmobj-readlock/share/misc/committers-ports.dot
user/attilio/vmobj-readlock/share/misc/organization.dot
user/attilio/vmobj-readlock/sys/Makefile
user/attilio/vmobj-readlock/sys/arm/at91/if_ate.c
user/attilio/vmobj-readlock/sys/dev/bge/if_bge.c
user/attilio/vmobj-readlock/sys/dev/re/if_re.c
user/attilio/vmobj-readlock/sys/kern/uipc_mbuf.c
user/attilio/vmobj-readlock/sys/net/bpf.c
user/attilio/vmobj-readlock/sys/netinet/libalias/alias.c
user/attilio/vmobj-readlock/sys/netpfil/pf/if_pfsync.c
user/attilio/vmobj-readlock/sys/nfs/krpc_subr.c
user/attilio/vmobj-readlock/sys/nfsclient/nfs_vfsops.c
user/attilio/vmobj-readlock/sys/nfsclient/nfs_vnops.c
user/attilio/vmobj-readlock/sys/sys/mbuf.h
user/attilio/vmobj-readlock/sys/sys/param.h
user/attilio/vmobj-readlock/sys/vm/_vm_radix.h
user/attilio/vmobj-readlock/sys/vm/vm_radix.c
user/attilio/vmobj-readlock/usr.bin/grep/regex/tre-fastmatch.c
Directory Properties:
user/attilio/vmobj-readlock/ (props changed)
user/attilio/vmobj-readlock/sys/ (props changed)
Modified: user/attilio/vmobj-readlock/games/fortune/datfiles/Makefile
==============================================================================
--- user/attilio/vmobj-readlock/games/fortune/datfiles/Makefile Wed Mar 13 03:25:04 2013 (r248228)
+++ user/attilio/vmobj-readlock/games/fortune/datfiles/Makefile Wed Mar 13 03:27:32 2013 (r248229)
@@ -1,37 +1,22 @@
# @(#)Makefile 8.2 (Berkeley) 4/19/94
# $FreeBSD$
-FILES= fortunes freebsd-tips murphy startrek zippy
-BLDS= fortunes.dat murphy.dat startrek.dat zippy.dat \
- fortunes-o fortunes-o.dat freebsd-tips.dat
+DB= fortunes freebsd-tips murphy startrek zippy
# TO AVOID INSTALLING THE POTENTIALLY OFFENSIVE FORTUNES, COMMENT OUT THE
-# THREE LINES AND UNCOMMENT THE FOURTH LINE.
+# NEXT LINE.
+DB+= limerick murphy-o gerrold.limerick
-# THE THREE LINES:
-FILES+= limerick murphy-o gerrold.limerick
-BLDS+= limerick.dat murphy-o.dat gerrold.limerick.dat
-TYPE= real
-
-# THE FOURTH LINE:
-#TYPE= fake
-
-FILES+= ${BLDS}
+BLDS= ${DB:S/$/.dat/}
+FILES= ${DB} ${BLDS}
CLEANFILES+=${BLDS}
FILESDIR= ${SHAREDIR}/games/fortune
-.for f in fortunes freebsd-tips gerrold.limerick limerick murphy murphy-o startrek zippy
+.for f in ${DB}
$f.dat: $f
PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \
strfile -Cs ${.ALLSRC} ${.TARGET}
.endfor
-fortunes-o.dat: fortunes-o
- PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \
- strfile -Csx ${.ALLSRC} ${.TARGET}
-
-fortunes-o: fortunes-o.${TYPE}
- LC_ALL=C tr a-zA-Z n-za-mN-ZA-M < ${.ALLSRC} > ${.TARGET}
-
.include <bsd.prog.mk>
Modified: user/attilio/vmobj-readlock/share/misc/committers-ports.dot
==============================================================================
--- user/attilio/vmobj-readlock/share/misc/committers-ports.dot Wed Mar 13 03:25:04 2013 (r248228)
+++ user/attilio/vmobj-readlock/share/misc/committers-ports.dot Wed Mar 13 03:27:32 2013 (r248229)
@@ -171,7 +171,7 @@ philip [label="Philip Paeps\nphilip at Free
rafan [label="Rong-En Fan\nrafan at FreeBSD.org\n2006/06/23"]
rakuco [label="Raphael Kubo da Costa\nrakuco at FreeBSD.org\n2011/08/22"]
rene [label="Rene Ladan\nrene at FreeBSD.org\n2010/04/11"]
-rm [label="Ruslan Mahmatkhanov\nrm at FreeBSD.org\n2011/11/06"]
+rm [label="Ruslan Makhmatkhanov\nrm at FreeBSD.org\n2011/11/06"]
rnoland [label="Robert Noland\nrnoland at FreeBSD.org\n2008/07/21"]
romain [label="Romain Tartiere\nromain at FreeBSD.org\n2010/01/24"]
sahil [label="Sahil Tandon\nsahil at FreeBSD.org\n2010/04/11"]
Modified: user/attilio/vmobj-readlock/share/misc/organization.dot
==============================================================================
--- user/attilio/vmobj-readlock/share/misc/organization.dot Wed Mar 13 03:25:04 2013 (r248228)
+++ user/attilio/vmobj-readlock/share/misc/organization.dot Wed Mar 13 03:27:32 2013 (r248229)
@@ -30,7 +30,7 @@ coresecretary [label="Core Team Secretar
doccommitters [label="Doc/www Committers\ndoc-committers at FreeBSD.org"]
doceng [label="Documentation Engineering Team\ndoceng at FreeBSD.org\ngjb, blackend,\ngabor, hrs"]
portscommitters [label="Ports Committers\nports-committers at FreeBSD.org"]
-portmgr [label="Port Management Team\nportmgr at FreeBSD.org\ntabthorpe, marcus, bapt, \nerwin, pav,\nitetcu, miwi"]
+portmgr [label="Port Management Team\nportmgr at FreeBSD.org\ntabthorpe, marcus, bapt,\nerwin, bdrewery,\nitetcu, miwi"]
portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary at FreeBSD.org\ntabthorpe"]
re [label="Primary Release Engineering Team\nre at FreeBSD.org\nkib, blackend, jpaetzel, hrs, kensmith"]
secteam [label="Security Team\nsecteam at FreeBSD.org\nsimon, qingli, delphij,\nremko, philip, stas, cperciva,\ncsjp, rwatson, miwi, bz"]
Modified: user/attilio/vmobj-readlock/sys/Makefile
==============================================================================
--- user/attilio/vmobj-readlock/sys/Makefile Wed Mar 13 03:25:04 2013 (r248228)
+++ user/attilio/vmobj-readlock/sys/Makefile Wed Mar 13 03:27:32 2013 (r248229)
@@ -10,7 +10,7 @@ SUBDIR= boot
# Directories to include in cscope name file and TAGS.
CSCOPEDIRS= boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \
geom gnu isa kern libkern modules net net80211 netatalk \
- netgraph netinet netinet6 netipsec netipx netnatm netncp \
+ netgraph netinet netinet6 netipsec netipx netnatm \
netsmb nfs nfsclient nfsserver nlm ofed opencrypto \
pci rpc security sys ufs vm xdr xen ${CSCOPE_ARCHDIR}
.if !defined(CSCOPE_ARCHDIR)
Modified: user/attilio/vmobj-readlock/sys/arm/at91/if_ate.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/arm/at91/if_ate.c Wed Mar 13 03:25:04 2013 (r248228)
+++ user/attilio/vmobj-readlock/sys/arm/at91/if_ate.c Wed Mar 13 03:27:32 2013 (r248229)
@@ -900,8 +900,8 @@ ate_intr(void *xsc)
remain = (sc->rx_descs[idx].status & ETH_LEN_MASK) - 4;
/* Get an appropriately sized mbuf. */
- mb = m_get2(M_NOWAIT, MT_DATA, M_PKTHDR,
- remain + ETHER_ALIGN);
+ mb = m_get2(remain + ETHER_ALIGN, M_NOWAIT, MT_DATA,
+ M_PKTHDR);
if (mb == NULL) {
sc->ifp->if_iqdrops++;
rxdhead->status = 0;
Modified: user/attilio/vmobj-readlock/sys/dev/bge/if_bge.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/dev/bge/if_bge.c Wed Mar 13 03:25:04 2013 (r248228)
+++ user/attilio/vmobj-readlock/sys/dev/bge/if_bge.c Wed Mar 13 03:27:32 2013 (r248229)
@@ -3594,15 +3594,15 @@ bge_attach(device_t dev)
}
bge_stop_fw(sc);
- bge_sig_pre_reset(sc, BGE_RESET_START);
+ bge_sig_pre_reset(sc, BGE_RESET_SHUTDOWN);
if (bge_reset(sc)) {
device_printf(sc->bge_dev, "chip reset failed\n");
error = ENXIO;
goto fail;
}
- bge_sig_legacy(sc, BGE_RESET_START);
- bge_sig_post_reset(sc, BGE_RESET_START);
+ bge_sig_legacy(sc, BGE_RESET_SHUTDOWN);
+ bge_sig_post_reset(sc, BGE_RESET_SHUTDOWN);
if (bge_chipinit(sc)) {
device_printf(sc->bge_dev, "chip initialization failed\n");
@@ -3960,6 +3960,20 @@ bge_reset(struct bge_softc *sc)
} else
write_op = bge_writereg_ind;
+ if (sc->bge_asicrev != BGE_ASICREV_BCM5700 &&
+ sc->bge_asicrev != BGE_ASICREV_BCM5701) {
+ CSR_WRITE_4(sc, BGE_NVRAM_SWARB, BGE_NVRAMSWARB_SET1);
+ for (i = 0; i < 8000; i++) {
+ if (CSR_READ_4(sc, BGE_NVRAM_SWARB) &
+ BGE_NVRAMSWARB_GNT1)
+ break;
+ DELAY(20);
+ }
+ if (i == 8000) {
+ if (bootverbose)
+ device_printf(dev, "NVRAM lock timedout!\n");
+ }
+ }
/* Take APE lock when performing reset. */
bge_ape_lock(sc, BGE_APE_LOCK_GRC);
Modified: user/attilio/vmobj-readlock/sys/dev/re/if_re.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/dev/re/if_re.c Wed Mar 13 03:25:04 2013 (r248228)
+++ user/attilio/vmobj-readlock/sys/dev/re/if_re.c Wed Mar 13 03:27:32 2013 (r248229)
@@ -1587,7 +1587,8 @@ re_attach(device_t dev)
* packet has IP options so disable TX IP checksum offloading.
*/
if (sc->rl_hwrev->rl_rev == RL_HWREV_8168C ||
- sc->rl_hwrev->rl_rev == RL_HWREV_8168C_SPIN2)
+ sc->rl_hwrev->rl_rev == RL_HWREV_8168C_SPIN2 ||
+ sc->rl_hwrev->rl_rev == RL_HWREV_8168CP)
ifp->if_hwassist = CSUM_TCP | CSUM_UDP;
else
ifp->if_hwassist = CSUM_IP | CSUM_TCP | CSUM_UDP;
@@ -3419,7 +3420,8 @@ re_ioctl(struct ifnet *ifp, u_long comma
if ((ifp->if_capenable & IFCAP_TXCSUM) != 0) {
rev = sc->rl_hwrev->rl_rev;
if (rev == RL_HWREV_8168C ||
- rev == RL_HWREV_8168C_SPIN2)
+ rev == RL_HWREV_8168C_SPIN2 ||
+ rev == RL_HWREV_8168CP)
ifp->if_hwassist |= CSUM_TCP | CSUM_UDP;
else
ifp->if_hwassist |= RE_CSUM_FEATURES;
Modified: user/attilio/vmobj-readlock/sys/kern/uipc_mbuf.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/kern/uipc_mbuf.c Wed Mar 13 03:25:04 2013 (r248228)
+++ user/attilio/vmobj-readlock/sys/kern/uipc_mbuf.c Wed Mar 13 03:27:32 2013 (r248229)
@@ -88,7 +88,7 @@ SYSCTL_INT(_kern_ipc, OID_AUTO, m_defrag
* m_get2() allocates minimum mbuf that would fit "size" argument.
*/
struct mbuf *
-m_get2(int how, short type, int flags, int size)
+m_get2(int size, int how, short type, int flags)
{
struct mb_args args;
struct mbuf *m, *n;
Modified: user/attilio/vmobj-readlock/sys/net/bpf.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/net/bpf.c Wed Mar 13 03:25:04 2013 (r248228)
+++ user/attilio/vmobj-readlock/sys/net/bpf.c Wed Mar 13 03:27:32 2013 (r248229)
@@ -525,7 +525,7 @@ bpf_movein(struct uio *uio, int linktype
if (len < hlen || len - hlen > ifp->if_mtu)
return (EMSGSIZE);
- m = m_get2(M_WAITOK, MT_DATA, M_PKTHDR, len);
+ m = m_get2(len, M_WAITOK, MT_DATA, M_PKTHDR);
if (m == NULL)
return (EIO);
m->m_pkthdr.len = m->m_len = len;
Modified: user/attilio/vmobj-readlock/sys/netinet/libalias/alias.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/netinet/libalias/alias.c Wed Mar 13 03:25:04 2013 (r248228)
+++ user/attilio/vmobj-readlock/sys/netinet/libalias/alias.c Wed Mar 13 03:27:32 2013 (r248229)
@@ -1760,7 +1760,7 @@ m_megapullup(struct mbuf *m, int len) {
if (m->m_next == NULL && M_WRITABLE(m) && M_TRAILINGSPACE(m) >= RESERVE)
return (m);
- mcl = m_get2(M_NOWAIT, MT_DATA, M_PKTHDR, len + RESERVE);
+ mcl = m_get2(len + RESERVE, M_NOWAIT, MT_DATA, M_PKTHDR);
if (mcl == NULL)
goto bad;
Modified: user/attilio/vmobj-readlock/sys/netpfil/pf/if_pfsync.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/netpfil/pf/if_pfsync.c Wed Mar 13 03:25:04 2013 (r248228)
+++ user/attilio/vmobj-readlock/sys/netpfil/pf/if_pfsync.c Wed Mar 13 03:27:32 2013 (r248229)
@@ -1505,7 +1505,7 @@ pfsync_sendout(int schedswi)
return;
}
- m = m_get2(M_NOWAIT, MT_DATA, M_PKTHDR, max_linkhdr + sc->sc_len);
+ m = m_get2(max_linkhdr + sc->sc_len, M_NOWAIT, MT_DATA, M_PKTHDR);
if (m == NULL) {
sc->sc_ifp->if_oerrors++;
V_pfsyncstats.pfsyncs_onomem++;
Modified: user/attilio/vmobj-readlock/sys/nfs/krpc_subr.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/nfs/krpc_subr.c Wed Mar 13 03:25:04 2013 (r248228)
+++ user/attilio/vmobj-readlock/sys/nfs/krpc_subr.c Wed Mar 13 03:27:32 2013 (r248229)
@@ -459,7 +459,7 @@ xdr_string_encode(char *str, int len)
if (mlen > MCLBYTES) /* If too big, we just can't do it. */
return (NULL);
- m = m_get2(M_WAITOK, MT_DATA, 0, mlen);
+ m = m_get2(mlen, M_WAITOK, MT_DATA, 0);
xs = mtod(m, struct xdr_string *);
m->m_len = mlen;
xs->len = txdr_unsigned(len);
Modified: user/attilio/vmobj-readlock/sys/nfsclient/nfs_vfsops.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/nfsclient/nfs_vfsops.c Wed Mar 13 03:25:04 2013 (r248228)
+++ user/attilio/vmobj-readlock/sys/nfsclient/nfs_vfsops.c Wed Mar 13 03:27:32 2013 (r248229)
@@ -298,7 +298,7 @@ nfs_statfs(struct mount *mp, struct stat
} else
mtx_unlock(&nmp->nm_mtx);
nfsstats.rpccnt[NFSPROC_FSSTAT]++;
- mreq = m_get2(M_WAITOK, MT_DATA, 0, NFSX_FH(v3));
+ mreq = m_get2(NFSX_FH(v3), M_WAITOK, MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(vp, v3);
@@ -356,7 +356,7 @@ nfs_fsinfo(struct nfsmount *nmp, struct
u_int64_t maxfsize;
nfsstats.rpccnt[NFSPROC_FSINFO]++;
- mreq = m_get2(M_WAITOK, MT_DATA, 0, NFSX_FH(1));
+ mreq = m_get2(NFSX_FH(1), M_WAITOK, MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(vp, 1);
Modified: user/attilio/vmobj-readlock/sys/nfsclient/nfs_vnops.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/nfsclient/nfs_vnops.c Wed Mar 13 03:25:04 2013 (r248228)
+++ user/attilio/vmobj-readlock/sys/nfsclient/nfs_vnops.c Wed Mar 13 03:27:32 2013 (r248229)
@@ -294,7 +294,7 @@ nfs3_access_otw(struct vnode *vp, int wm
struct nfsnode *np = VTONFS(vp);
nfsstats.rpccnt[NFSPROC_ACCESS]++;
- mreq = m_get2(M_WAITOK, MT_DATA, 0, NFSX_FH(v3) + NFSX_UNSIGNED);
+ mreq = m_get2(NFSX_FH(v3) + NFSX_UNSIGNED, M_WAITOK, MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(vp, v3);
@@ -714,7 +714,7 @@ nfs_getattr(struct vop_getattr_args *ap)
goto nfsmout;
}
nfsstats.rpccnt[NFSPROC_GETATTR]++;
- mreq = m_get2(M_WAITOK, MT_DATA, 0, NFSX_FH(v3));
+ mreq = m_get2(NFSX_FH(v3), M_WAITOK, MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(vp, v3);
@@ -873,7 +873,7 @@ nfs_setattrrpc(struct vnode *vp, struct
int v3 = NFS_ISV3(vp);
nfsstats.rpccnt[NFSPROC_SETATTR]++;
- mreq = m_get2(M_WAITOK, MT_DATA, 0, NFSX_FH(v3) + NFSX_SATTR(v3));
+ mreq = m_get2(NFSX_FH(v3) + NFSX_SATTR(v3), M_WAITOK, MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(vp, v3);
@@ -1037,8 +1037,8 @@ nfs_lookup(struct vop_lookup_args *ap)
nfsstats.lookupcache_misses++;
nfsstats.rpccnt[NFSPROC_LOOKUP]++;
len = cnp->cn_namelen;
- mreq = m_get2(M_WAITOK, MT_DATA, 0,
- NFSX_FH(v3) + NFSX_UNSIGNED + nfsm_rndup(len));
+ mreq = m_get2(NFSX_FH(v3) + NFSX_UNSIGNED + nfsm_rndup(len), M_WAITOK,
+ MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(dvp, v3);
@@ -1251,7 +1251,7 @@ nfs_readlinkrpc(struct vnode *vp, struct
int v3 = NFS_ISV3(vp);
nfsstats.rpccnt[NFSPROC_READLINK]++;
- mreq = m_get2(M_WAITOK, MT_DATA, 0, NFSX_FH(v3));
+ mreq = m_get2(NFSX_FH(v3), M_WAITOK, MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(vp, v3);
@@ -1306,8 +1306,8 @@ nfs_readrpc(struct vnode *vp, struct uio
while (tsiz > 0) {
nfsstats.rpccnt[NFSPROC_READ]++;
len = (tsiz > rsize) ? rsize : tsiz;
- mreq = m_get2(M_WAITOK, MT_DATA, 0,
- NFSX_FH(v3) + NFSX_UNSIGNED * 3);
+ mreq = m_get2(NFSX_FH(v3) + NFSX_UNSIGNED * 3, M_WAITOK,
+ MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(vp, v3);
@@ -1379,8 +1379,8 @@ nfs_writerpc(struct vnode *vp, struct ui
while (tsiz > 0) {
nfsstats.rpccnt[NFSPROC_WRITE]++;
len = (tsiz > wsize) ? wsize : tsiz;
- mreq = m_get2(M_WAITOK, MT_DATA, 0,
- NFSX_FH(v3) + 5 * NFSX_UNSIGNED + nfsm_rndup(len));
+ mreq = m_get2(NFSX_FH(v3) + 5 * NFSX_UNSIGNED + nfsm_rndup(len),
+ M_WAITOK, MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(vp, v3);
@@ -1502,8 +1502,8 @@ nfs_mknodrpc(struct vnode *dvp, struct v
if ((error = VOP_GETATTR(dvp, &vattr, cnp->cn_cred)) != 0)
return (error);
nfsstats.rpccnt[NFSPROC_MKNOD]++;
- mreq = m_get2(M_WAITOK, MT_DATA, 0, NFSX_FH(v3) + 4 * NFSX_UNSIGNED +
- nfsm_rndup(cnp->cn_namelen) + NFSX_SATTR(v3));
+ mreq = m_get2(NFSX_FH(v3) + 4 * NFSX_UNSIGNED +
+ nfsm_rndup(cnp->cn_namelen) + NFSX_SATTR(v3), M_WAITOK, MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(dvp, v3);
@@ -1606,8 +1606,8 @@ nfs_create(struct vop_create_args *ap)
fmode |= O_EXCL;
again:
nfsstats.rpccnt[NFSPROC_CREATE]++;
- mreq = m_get2(M_WAITOK, MT_DATA, 0, NFSX_FH(v3) + 2 * NFSX_UNSIGNED +
- nfsm_rndup(cnp->cn_namelen) + NFSX_SATTR(v3));
+ mreq = m_get2(NFSX_FH(v3) + 2 * NFSX_UNSIGNED +
+ nfsm_rndup(cnp->cn_namelen) + NFSX_SATTR(v3), M_WAITOK, MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(dvp, v3);
@@ -1788,8 +1788,8 @@ nfs_removerpc(struct vnode *dvp, const c
int v3 = NFS_ISV3(dvp);
nfsstats.rpccnt[NFSPROC_REMOVE]++;
- mreq = m_get2(M_WAITOK, MT_DATA, 0,
- NFSX_FH(v3) + NFSX_UNSIGNED + nfsm_rndup(namelen));
+ mreq = m_get2(NFSX_FH(v3) + NFSX_UNSIGNED + nfsm_rndup(namelen),
+ M_WAITOK, MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(dvp, v3);
@@ -1924,8 +1924,8 @@ nfs_renamerpc(struct vnode *fdvp, const
int v3 = NFS_ISV3(fdvp);
nfsstats.rpccnt[NFSPROC_RENAME]++;
- mreq = m_get2(M_WAITOK, MT_DATA, 0, (NFSX_FH(v3) + NFSX_UNSIGNED)*2 +
- nfsm_rndup(fnamelen) + nfsm_rndup(tnamelen));
+ mreq = m_get2((NFSX_FH(v3) + NFSX_UNSIGNED)*2 + nfsm_rndup(fnamelen) +
+ nfsm_rndup(tnamelen), M_WAITOK, MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(fdvp, v3);
@@ -1983,8 +1983,8 @@ nfs_link(struct vop_link_args *ap)
v3 = NFS_ISV3(vp);
nfsstats.rpccnt[NFSPROC_LINK]++;
- mreq = m_get2(M_WAITOK, MT_DATA, 0,
- NFSX_FH(v3)*2 + NFSX_UNSIGNED + nfsm_rndup(cnp->cn_namelen));
+ mreq = m_get2(NFSX_FH(v3)*2 + NFSX_UNSIGNED +
+ nfsm_rndup(cnp->cn_namelen), M_WAITOK, MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(vp, v3);
@@ -2029,8 +2029,9 @@ nfs_symlink(struct vop_symlink_args *ap)
nfsstats.rpccnt[NFSPROC_SYMLINK]++;
slen = strlen(ap->a_target);
- mreq = m_get2(M_WAITOK, MT_DATA, 0, NFSX_FH(v3) + 2*NFSX_UNSIGNED +
- nfsm_rndup(cnp->cn_namelen) + nfsm_rndup(slen) + NFSX_SATTR(v3));
+ mreq = m_get2(NFSX_FH(v3) + 2*NFSX_UNSIGNED +
+ nfsm_rndup(cnp->cn_namelen) + nfsm_rndup(slen) + NFSX_SATTR(v3),
+ M_WAITOK, MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(dvp, v3);
@@ -2123,8 +2124,8 @@ nfs_mkdir(struct vop_mkdir_args *ap)
return (error);
len = cnp->cn_namelen;
nfsstats.rpccnt[NFSPROC_MKDIR]++;
- mreq = m_get2(M_WAITOK, MT_DATA, 0,
- NFSX_FH(v3) + NFSX_UNSIGNED + nfsm_rndup(len) + NFSX_SATTR(v3));
+ mreq = m_get2(NFSX_FH(v3) + NFSX_UNSIGNED + nfsm_rndup(len) +
+ NFSX_SATTR(v3), M_WAITOK, MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(dvp, v3);
@@ -2188,8 +2189,8 @@ nfs_rmdir(struct vop_rmdir_args *ap)
if (dvp == vp)
return (EINVAL);
nfsstats.rpccnt[NFSPROC_RMDIR]++;
- mreq = m_get2(M_WAITOK, MT_DATA, 0,
- NFSX_FH(v3) + NFSX_UNSIGNED + nfsm_rndup(cnp->cn_namelen));
+ mreq = m_get2(NFSX_FH(v3) + NFSX_UNSIGNED +
+ nfsm_rndup(cnp->cn_namelen), M_WAITOK, MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(dvp, v3);
@@ -2307,8 +2308,8 @@ nfs_readdirrpc(struct vnode *vp, struct
*/
while (more_dirs && bigenough) {
nfsstats.rpccnt[NFSPROC_READDIR]++;
- mreq = m_get2(M_WAITOK, MT_DATA, 0,
- NFSX_FH(v3) + NFSX_READDIR(v3));
+ mreq = m_get2(NFSX_FH(v3) + NFSX_READDIR(v3), M_WAITOK,
+ MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(vp, v3);
@@ -2513,8 +2514,8 @@ nfs_readdirplusrpc(struct vnode *vp, str
*/
while (more_dirs && bigenough) {
nfsstats.rpccnt[NFSPROC_READDIRPLUS]++;
- mreq = m_get2(M_WAITOK, MT_DATA, 0,
- NFSX_FH(1) + 6 * NFSX_UNSIGNED);
+ mreq = m_get2(NFSX_FH(1) + 6 * NFSX_UNSIGNED, M_WAITOK,
+ MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(vp, 1);
@@ -2818,8 +2819,8 @@ nfs_lookitup(struct vnode *dvp, const ch
int v3 = NFS_ISV3(dvp);
nfsstats.rpccnt[NFSPROC_LOOKUP]++;
- mreq = m_get2(M_WAITOK, MT_DATA, 0,
- NFSX_FH(v3) + NFSX_UNSIGNED + nfsm_rndup(len));
+ mreq = m_get2(NFSX_FH(v3) + NFSX_UNSIGNED + nfsm_rndup(len),
+ M_WAITOK, MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(dvp, v3);
@@ -2897,7 +2898,7 @@ nfs_commit(struct vnode *vp, u_quad_t of
}
mtx_unlock(&nmp->nm_mtx);
nfsstats.rpccnt[NFSPROC_COMMIT]++;
- mreq = m_get2(M_WAITOK, MT_DATA, 0, NFSX_FH(1));
+ mreq = m_get2(NFSX_FH(1), M_WAITOK, MT_DATA, 0);
mb = mreq;
bpos = mtod(mb, caddr_t);
nfsm_fhtom(vp, 1);
Modified: user/attilio/vmobj-readlock/sys/sys/mbuf.h
==============================================================================
--- user/attilio/vmobj-readlock/sys/sys/mbuf.h Wed Mar 13 03:25:04 2013 (r248228)
+++ user/attilio/vmobj-readlock/sys/sys/mbuf.h Wed Mar 13 03:27:32 2013 (r248229)
@@ -801,7 +801,7 @@ int m_dup_pkthdr(struct mbuf *, struct
u_int m_fixhdr(struct mbuf *);
struct mbuf *m_fragment(struct mbuf *, int, int);
void m_freem(struct mbuf *);
-struct mbuf *m_get2(int, short, int, int);
+struct mbuf *m_get2(int, int, short, int);
struct mbuf *m_getjcl(int, short, int, int);
struct mbuf *m_getm2(struct mbuf *, int, int, short, int);
struct mbuf *m_getptr(struct mbuf *, int, int *);
Modified: user/attilio/vmobj-readlock/sys/sys/param.h
==============================================================================
--- user/attilio/vmobj-readlock/sys/sys/param.h Wed Mar 13 03:25:04 2013 (r248228)
+++ user/attilio/vmobj-readlock/sys/sys/param.h Wed Mar 13 03:27:32 2013 (r248229)
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1000029 /* Master, propagated to newvers */
+#define __FreeBSD_version 1000030 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
Modified: user/attilio/vmobj-readlock/sys/vm/_vm_radix.h
==============================================================================
--- user/attilio/vmobj-readlock/sys/vm/_vm_radix.h Wed Mar 13 03:25:04 2013 (r248228)
+++ user/attilio/vmobj-readlock/sys/vm/_vm_radix.h Wed Mar 13 03:27:32 2013 (r248229)
@@ -37,6 +37,8 @@ struct vm_radix {
uintptr_t rt_root;
};
+#ifdef _KERNEL
+
static __inline boolean_t
vm_radix_is_empty(struct vm_radix *rtree)
{
@@ -44,4 +46,5 @@ vm_radix_is_empty(struct vm_radix *rtree
return (rtree->rt_root == 0);
}
+#endif /* _KERNEL */
#endif /* !__VM_RADIX_H_ */
Modified: user/attilio/vmobj-readlock/sys/vm/vm_radix.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/vm/vm_radix.c Wed Mar 13 03:25:04 2013 (r248228)
+++ user/attilio/vmobj-readlock/sys/vm/vm_radix.c Wed Mar 13 03:27:32 2013 (r248229)
@@ -375,6 +375,9 @@ vm_radix_insert(struct vm_radix *rtree,
int slot;
uint16_t clev;
+ KASSERT(index == page->pindex, ("%s: index != page->pindex",
+ __func__));
+
/*
* The owner of record for root is not really important because it
* will never be used.
@@ -442,7 +445,7 @@ vm_radix_insert(struct vm_radix *rtree,
* Setup the new intermediate node and add the 2 children: the
* new object and the older edge.
*/
- tmp2 = vm_radix_node_get(vm_radix_trimkey(page->pindex, clev - 1), 2,
+ tmp2 = vm_radix_node_get(vm_radix_trimkey(index, clev - 1), 2,
clev);
rnode->rn_child[slot] = tmp2;
vm_radix_addpage(tmp2, index, clev, page);
Modified: user/attilio/vmobj-readlock/usr.bin/grep/regex/tre-fastmatch.c
==============================================================================
--- user/attilio/vmobj-readlock/usr.bin/grep/regex/tre-fastmatch.c Wed Mar 13 03:25:04 2013 (r248228)
+++ user/attilio/vmobj-readlock/usr.bin/grep/regex/tre-fastmatch.c Wed Mar 13 03:27:32 2013 (r248229)
@@ -103,7 +103,7 @@ static int fastcmp(const fastmatch_t *fg
((!fg->reversed \
? ((type == STR_WIDE) ? ((j + fg->wlen) > len) \
: ((j + fg->len) > len)) \
- : (j <= 0)))
+ : (j < 0)))
/*
* Checks whether the new position after shifting in the input string
More information about the svn-src-user
mailing list