From owner-p4-projects@FreeBSD.ORG Sun May 16 00:16:27 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B74F106566B; Sun, 16 May 2010 00:16:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E43FE1065670 for ; Sun, 16 May 2010 00:16:26 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D1E6E8FC0C for ; Sun, 16 May 2010 00:16:26 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4G0GQMx083306 for ; Sun, 16 May 2010 00:16:26 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4G0GQBU083304 for perforce@freebsd.org; Sun, 16 May 2010 00:16:26 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 16 May 2010 00:16:26 GMT Message-Id: <201005160016.o4G0GQBU083304@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178306 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 May 2010 00:16:27 -0000 http://p4web.freebsd.org/@@178306?ac=10 Change 178306 by rene@rene_eee on 2010/05/16 00:16:12 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#16 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#16 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#13 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#47 integrate .. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#13 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#16 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -519,6 +519,11 @@ + &a.sysinstall.name; + &man.sysinstall.8; development + + + &a.threads.name; Threading in FreeBSD ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#16 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -3127,8 +3127,8 @@ Reasons to Run a Name Server - Name servers usually come in two forms: an authoritative - name server, and a caching name server. + Name servers generally come in two forms: authoritative + name servers, and caching name servers. An authoritative name server is needed when: @@ -3173,8 +3173,8 @@ retrieves the reply. With a local, caching DNS server, the query only has to be made once to the outside world by the caching DNS - server. Every additional query will not have to look to the - outside of the local network, since the information is cached + server. Additional queries will not have to go + outside the local network, since the information is cached locally. @@ -3234,7 +3234,7 @@ starting - Since BIND is installed by default, configuring it all is + Since BIND is installed by default, configuring it is relatively simple. The default named configuration @@ -3805,7 +3805,7 @@ The MX record indicates which mail servers are responsible for handling incoming mail for the zone. mail.example.org is the - hostname of the mail server, and 10 being the priority of + hostname of a mail server, and 10 is the priority of that mail server. One can have several mail servers, with priorities of 10, @@ -3838,7 +3838,7 @@ 5 IN PTR mail.example.org. This file gives the proper IP address to hostname - mappings of our above fictitious domain. + mappings for the above fictitious domain. It is worth noting that all names on the right side of a PTR record need to be fully qualified (i.e., end in @@ -3879,8 +3879,8 @@ If a problem arises, keeping sources up to date and - having a fresh build of named would - not hurt. + having a fresh build of named + may help. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#13 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -455,6 +455,10 @@ SVN commit messages for the vendor work area tree"> svn-src-vendor"> + +Sysinstall development mailing list"> +freebsd-sysinstall"> + FreeBSD test mailing list"> freebsd-test"> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#47 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -629,6 +629,12 @@ + &a.sysinstall.name; + + Ontwikkeling van &man.sysinstall.8; + + + &a.threads.name; Threading in &os; ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#27 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.23 2010/03/16 18:45:17 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml - %SRCID% 1.120 + %SRCID% 1.121 --> @@ -3393,8 +3393,8 @@ Redenen om een naamserver te draaien - Naamservers bestaan in het algemeen in twee smaken: een - autoratieve naamserver en een caching naamserver. + Naamservers bestaan in het algemeen in twee smaken: autoratieve + naamservers en caching naamservers. Er is een autoratieve naamserver nodig als: @@ -3442,9 +3442,8 @@ DNS-server hoeft het verzoek maar één keer door de caching DNS-server naar de buitenwereld gedaan te - worden. Voor ieder volgend verzoek hoeft niet buiten het lokale - netwerk gekeken te worden omdat het al lokaal in de cache - staat. + worden. Voor aanvullende verzoeken hoeft niet buiten het lokale + netwerk te gaan omdat het al lokaal in de cache staat. @@ -4119,8 +4118,7 @@ MX records geven aan welke mailservers verantwoordelijk zijn voor het afhandelen van inkomende mail voor de zone. mail.example.org is de hostnaam - voor de mailserver en 10 is de prioriteit voor die - mailserver. + van een mailserver en 10 is de prioriteit voor die mailserver. Het is mogelijk meerdere mailservers in te stellen met prioriteiten 10, 20, enzovoorts. Een mailserver die probeert @@ -4197,7 +4195,7 @@ Als er problemen ontstaan, kan het bijwerken van broncode en het opnieuw bouwen van named - geen kwaad doen. + hulp bieden. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#18 (text+ko) ==== @@ -5,7 +5,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/share/sgml/mailing-lists.ent - %SRCID% 1.69 + %SRCID% 1.70 --> @@ -459,6 +459,10 @@ SVN-commitberichten voor de structuur van het verkoperswerkgebied"> svn-src-vendor"> + +Sysinstall-ontwikkeling mailinglijst"> +freebsd-sysinstall"> + FreeBSD test mailinglijst"> freebsd-test"> From owner-p4-projects@FreeBSD.ORG Sun May 16 08:37:50 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDE72106567B; Sun, 16 May 2010 08:37:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A02BB1065678 for ; Sun, 16 May 2010 08:37:49 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8CF478FC0C for ; Sun, 16 May 2010 08:37:49 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4G8bn0d051551 for ; Sun, 16 May 2010 08:37:49 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4G8bnI4051549 for perforce@freebsd.org; Sun, 16 May 2010 08:37:49 GMT (envelope-from lz@FreeBSD.org) Date: Sun, 16 May 2010 08:37:49 GMT Message-Id: <201005160837.o4G8bnI4051549@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178315 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 May 2010 08:37:50 -0000 http://p4web.freebsd.org/@@178315?ac=10 Change 178315 by lz@gnehzuil-freebsd on 2010/05/16 08:37:13 Remove hashalloc algorithm in ext2_alloc_rsv() function. * It do not require to call ext2_hashalloc function Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#10 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#10 (text+ko) ==== @@ -217,16 +217,14 @@ break; } - if (prev != rp && rp->rw_end != EXT2_RWI_NOT_ALLOCATED) + if (rp->rw_end != EXT2_RWI_NOT_ALLOCATED) ext2_remove_rsv_win(fs, rp); rp->rw_start = cur; rp->rw_end = cur + size - 1; rp->rw_alloc_hit = 0; - if (prev != rp) { - ext2_add_rsv_win(fs, rp); - } + ext2_add_rsv_win(fs, rp); return 0; } @@ -239,12 +237,13 @@ struct m_ext2fs *fs, int cg, struct buf *bp) { struct ext2_rsv_win *search_rsv; + struct ext2mount *ump; int size, ret; int start, end, loc; char *bbp; + ump = ip->i_ump; bbp = (char *)bp->b_data; - bpref = bpref; size = rp->rw_goal_size; mtx_lock_spin(&fs->e2fs_rsv_lock); @@ -256,7 +255,7 @@ * So try to allocate it in other group. */ if (dtog(fs, bpref) != cg) - return -1; + return 0; if (bpref != 0) { bpref = dtogd(fs, bpref); if (isclr(bbp, bpref)) @@ -274,12 +273,17 @@ } } - for (loc = start; loc < start; loc++) { + for (loc = 0; loc < start; loc++) { if (bbp[loc] == 0) { bpref = loc * NBBY; goto gotit; } } + + bpref = ext2_mapsearch(fs, bbp, bpref); + if (bpref < 0) + return 0; + goto allocated1; } else { search_rsv = ext2_search_rsv_win(&fs->e2fs_rsv_tree, bpref); @@ -288,14 +292,18 @@ if (rp->rw_end != EXT2_RWI_NOT_ALLOCATED) ext2_remove_rsv_win(fs, rp); mtx_unlock_spin(&fs->e2fs_rsv_lock); - return 0; + + bpref = ext2_mapsearch(fs, bbp, bpref); + if (bpref < 0) + return 0; + goto allocated1; } mtx_unlock_spin(&fs->e2fs_rsv_lock); if (isclr(bbp, bpref) && bpref >= rp->rw_start && bpref < rp->rw_end) - return 0; + goto allocated; start = dtogd(fs, bpref) / NBBY; end = howmany(fs->e2fs->e2fs_fpg, NBBY) - start; @@ -303,7 +311,8 @@ if (bbp[loc] == 0 && loc * NBBY >= rp->rw_start && loc * NBBY < rp->rw_end) { - return 0; + bpref = loc * NBBY; + goto allocated; } } @@ -311,7 +320,11 @@ mtx_lock_spin(&fs->e2fs_rsv_lock); ext2_remove_rsv_win(fs, rp); mtx_unlock_spin(&fs->e2fs_rsv_lock); - return -1; + + bpref = ext2_mapsearch(fs, bbp, bpref); + if (bpref < 0) + return 0; + goto allocated1; } } @@ -322,7 +335,18 @@ mtx_lock_spin(&fs->e2fs_rsv_lock); ext2_add_rsv_win(fs, rp); mtx_unlock_spin(&fs->e2fs_rsv_lock); - return 0; + +allocated: + rp->rw_alloc_hit = bpref - rp->rw_start + 1; +allocated1: + setbit(bbp, (daddr_t)bpref); + EXT2_LOCK(ump); + fs->e2fs->e2fs_fbcount--; + fs->e2fs_gd[cg].ext2bgd_nbfree--; + fs->e2fs_fmod = 1; + EXT2_UNLOCK(ump); + bdwrite(bp); + return cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock + bpref; } /* @@ -353,10 +377,13 @@ ext2_remove_rsv_win(fs, rp); mtx_unlock_spin(&fs->e2fs_rsv_lock); - return 0; - + bno = ext2_mapsearch(fs, bbp, bpref); + if (bno < 0) + return 0; + goto allocated; gotit: rp->rw_alloc_hit++; +allocated: setbit(bbp, (daddr_t)bno); EXT2_LOCK(ump); fs->e2fs->e2fs_fbcount--; @@ -375,7 +402,6 @@ struct buf *bp, int32_t bpref, int size) { struct ext2_rsv_win *rp; - int32_t ret; rp = ip->i_rsv; @@ -384,13 +410,9 @@ * Then we try to allocate a free block. */ if (rp->rw_end == EXT2_RWI_NOT_ALLOCATED) { - ret = ext2_alloc_new_rsv_win(ip, rp, bpref, fs, cg, bp); - if (ret < 0) - return 0; + return ext2_alloc_new_rsv_win(ip, rp, bpref, fs, cg, bp); } else if (rp->rw_start + rp->rw_alloc_hit - 1 == rp->rw_end) { - ret = ext2_alloc_new_rsv_win(ip, rp, rp->rw_end, fs, cg, bp); - if (ret < 0) - return 0; + return ext2_alloc_new_rsv_win(ip, rp, rp->rw_end, fs, cg, bp); } return ext2_alloc_blk(fs, ip, cg, bp, bpref, rp); @@ -452,32 +474,35 @@ EXT2_LOCK(ump); } - /* TODO: Just need to try to allocate a free block from rest groups. - * Now just use old allocation algorihtm. - */ - for (i = 0; i < fs->e2fs_gcount; i++) { - /* Read block bitmap from buffer */ - EXT2_UNLOCK(ump); - error = bread(ip->i_devvp, - fsbtodb(fs, fs->e2fs_gd[i].ext2bgd_b_bitmap), - (int)fs->e2fs_bsize, NOCRED, &bp); - if (error) { + /* Just need to try to allocate a free block from rest groups. */ + cg = (cg + 1) % fs->e2fs_gcount; + for (i = 1; i < fs->e2fs_gcount; i++) { + if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) { + /* Read block bitmap from buffer */ + EXT2_UNLOCK(ump); + error = bread(ip->i_devvp, + fsbtodb(fs, fs->e2fs_gd[i].ext2bgd_b_bitmap), + (int)fs->e2fs_bsize, NOCRED, &bp); + if (error) { + brelse(bp); + goto ioerror; + } + + EXT2_IRSV_LOCK(ip); + bno = ext2_rsvalloc(fs, ip, i, bp, bpref, size); + EXT2_IRSV_UNLOCK(ip); + if (bno > 0) + goto allocated; + brelse(bp); - goto ioerror; + EXT2_LOCK(ump); } - EXT2_IRSV_LOCK(ip); - bno = ext2_rsvalloc(fs, ip, i, bp, bpref, size); - EXT2_IRSV_UNLOCK(ip); - if (bno > 0) - goto allocated; - - brelse(bp); - EXT2_LOCK(ump); + cg++; + if (cg == fs->e2fs_gcount) + cg = 0; } - bno = (daddr_t)ext2_hashalloc(ip, cg, bpref, fs->e2fs_bsize, ext2_alloccg); - allocated: if (bno > 0) { ip->i_blocks += btodb(fs->e2fs_bsize); From owner-p4-projects@FreeBSD.ORG Sun May 16 12:59:56 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BF151065672; Sun, 16 May 2010 12:59:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB616106564A for ; Sun, 16 May 2010 12:59:55 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B846A8FC08 for ; Sun, 16 May 2010 12:59:55 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4GCxtSm024260 for ; Sun, 16 May 2010 12:59:55 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4GCxtVa024258 for perforce@freebsd.org; Sun, 16 May 2010 12:59:55 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 16 May 2010 12:59:55 GMT Message-Id: <201005161259.o4GCxtVa024258@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178324 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 May 2010 12:59:56 -0000 http://p4web.freebsd.org/@@178324?ac=10 Change 178324 by pgj@csupor on 2010/05/16 12:59:01 - Simplify code of accessors by introducing macros - Fixing up discrepancies in function names - Chasing the changes in netstat(1) - Bump copyright year where applicable Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#68 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_if.c#7 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#66 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_mroute.c#3 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_route.c#8 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#75 edit .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/mbuf.c#6 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#68 (text+ko) ==== @@ -363,7 +363,7 @@ /* "Memory buffers" */ struct mbuf_type *netstat_mbt_alloc(void); void netstat_mbt_free(struct mbuf_type *); -int netstat_mbt_geterror(const struct mbuf_type *); +int netstat_mbt_get_error(const struct mbuf_type *); int netstat_mbuf(const struct session_type *, struct mbuf_type *stats, int flags); ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_if.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2009 Gabor Pali + * Copyright (c) 2009, 2010 Gabor Pali * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -155,9 +155,9 @@ if (domain != PF_UNSPEC && domain != ifmultiaddr.ifma_addr->sa_family) continue; - if (itp->it_maddrcnt >= IFTYPE_MAXADDRCNT) + if (itp->it_mcast_addrcnt >= IFTYPE_MAXADDRCNT) continue; - itp->it_maddress[itp->it_maddrcnt++] = + itp->it_maddress[itp->it_mcast_addrcnt++] = extract_if_address(NETSTAT_IF_IFMULTIADDR, &ifmultiaddr, ifmultiaddr.ifma_addr, itp); } ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#66 (text+ko) ==== @@ -274,7 +274,7 @@ /* Multicast addresses. */ struct intfaddr_type *it_maddress[IFTYPE_MAXADDRCNT]; - int it_maddrcnt; + int it_mcast_addrcnt; TAILQ_ENTRY(interface_type) it_list; }; @@ -455,7 +455,7 @@ int rmt_bit; u_int64_t rmt_address; u_int64_t rmt_refs; - struct routeaddr_type *rmt_mask; + struct routeaddr_type *rmt_netmask; }; struct routenode_type { @@ -466,7 +466,7 @@ u_int64_t rnt_right; u_int64_t rnt_key; u_int64_t rnt_dupedkey; - struct routeaddr_type *rnt_mask; + struct routeaddr_type *rnt_netmask; int rnt_mkcnt; struct routemask_type *rnt_mklist; }; @@ -507,8 +507,8 @@ u_int32_t mit_limit; /* threshold/rate limit */ struct routeaddr_type *mit_address; struct routeaddr_type *mit_remote_address; - u_int64_t mit_pkts_in; - u_int64_t mit_pkts_out; + u_int64_t mit_packets_in; + u_int64_t mit_packets_out; u_int64_t mit_bytes_in; u_int64_t mit_bytes_out; char mit_ifname[MIFTYPE_MAXNAME]; @@ -533,9 +533,9 @@ struct mroute_type { struct routeaddr_type *mrt_origin; struct routeaddr_type *mrt_group; - u_int64_t mrt_pkt_cnt; - u_int64_t mrt_byte_cnt; - u_int64_t mrt_nstall; + u_int64_t mrt_packets; + u_int64_t mrt_bytes; + u_int64_t mrt_waitings; u_int32_t mrt_parent; u_int8_t mrt_ttls[MRTTYPE_MAXVIFS]; struct if_set mrt_ifset; ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_mroute.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2009 Gabor Pali + * Copyright (c) 2009, 2010 Gabor Pali * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -396,8 +396,8 @@ sa_in.sin_addr = v->v_rmt_addr; mitp->mit_remote_address = extract_address(&sa_in, NULL, 0); } - mitp->mit_pkts_in = v->v_pkt_in; - mitp->mit_pkts_out = v->v_pkt_out; + mitp->mit_packets_in = v->v_pkt_in; + mitp->mit_packets_out = v->v_pkt_out; mitp->mit_bytes_in = v->v_bytes_in; mitp->mit_bytes_out = v->v_bytes_out; if (v->v_flags & VIFF_REGISTER) @@ -432,8 +432,8 @@ sa_in.sin_addr.s_addr = v->vd_rmt_addr; mitp->mit_remote_address = extract_address(&sa_in, NULL, 0); } - mitp->mit_pkts_in = v->vd_pkt_in; - mitp->mit_pkts_out = v->vd_pkt_out; + mitp->mit_packets_in = v->vd_pkt_in; + mitp->mit_packets_out = v->vd_pkt_out; mitp->mit_bytes_in = v->vd_bytes_in; mitp->mit_bytes_out = v->vd_bytes_out; if (v->vd_flags & VIFF_REGISTER) @@ -463,8 +463,8 @@ CNV_FLAG(MIFF_REGISTER, NETSTAT_MIF_REGISTER); mitp->mit_limit = m->m6_rate_limit; mitp->mit_address = extract_address(&sa_in6, NULL, 0); - mitp->mit_pkts_in = m->m6_pkt_in; - mitp->mit_pkts_out = m->m6_pkt_out; + mitp->mit_packets_in = m->m6_pkt_in; + mitp->mit_packets_out = m->m6_pkt_out; if (m->m6_flags & MIFF_REGISTER) strlcpy(mitp->mit_ifname, "reg0", sizeof(mitp->mit_ifname)); else if (m->m6_ifp != NULL) @@ -491,8 +491,8 @@ CNV_FLAG(MIFF_REGISTER, NETSTAT_MIF_REGISTER); mitp->mit_limit = m->md_rate_limit; mitp->mit_address = extract_address(&sa_in6, NULL, 0); - mitp->mit_pkts_in = m->md_pkt_in; - mitp->mit_pkts_out = m->md_pkt_out; + mitp->mit_packets_in = m->md_pkt_in; + mitp->mit_packets_out = m->md_pkt_out; if (m->md_flags & MIFF_REGISTER) strlcpy(mitp->mit_ifname, "reg0", sizeof(mitp->mit_ifname)); else @@ -777,9 +777,9 @@ mrtp->mrt_origin = extract_address(&sa_in, NULL, 0); sa_in.sin_addr = m->mfc_mcastgrp; mrtp->mrt_group = extract_address(&sa_in, NULL, 0); - mrtp->mrt_pkt_cnt = m->mfc_pkt_cnt; - mrtp->mrt_byte_cnt = m->mfc_byte_cnt; - mrtp->mrt_nstall = m->mfc_nstall; + mrtp->mrt_packets = m->mfc_pkt_cnt; + mrtp->mrt_bytes = m->mfc_byte_cnt; + mrtp->mrt_waitings = m->mfc_nstall; mrtp->mrt_parent = m->mfc_parent; for (i = 0; i < MAXVIFS; i++) mrtp->mrt_ttls[i] = m->mfc_ttls[i]; @@ -798,9 +798,9 @@ mrtp->mrt_origin = extract_address(&sa_in, NULL, 0); sa_in.sin_addr.s_addr = md->md_mcastgrp; mrtp->mrt_group = extract_address(&sa_in, NULL, 0); - mrtp->mrt_pkt_cnt = md->md_pkt_cnt; - mrtp->mrt_byte_cnt = md->md_byte_cnt; - mrtp->mrt_nstall = md->md_nstall; + mrtp->mrt_packets = md->md_pkt_cnt; + mrtp->mrt_bytes = md->md_byte_cnt; + mrtp->mrt_waitings = md->md_nstall; mrtp->mrt_parent = md->md_parent; bcopy(md->md_ttls, mrtp->mrt_ttls, sizeof(md->md_ttls)); } @@ -811,9 +811,9 @@ { mrtp->mrt_origin = extract_address(&m->mf6c_origin, NULL, 0); mrtp->mrt_group = extract_address(&m->mf6c_mcastgrp, NULL, 0); - mrtp->mrt_pkt_cnt = m->mf6c_pkt_cnt; - mrtp->mrt_byte_cnt = m->mf6c_byte_cnt; - mrtp->mrt_nstall = nstall; + mrtp->mrt_packets = m->mf6c_pkt_cnt; + mrtp->mrt_bytes = m->mf6c_byte_cnt; + mrtp->mrt_waitings = nstall; mrtp->mrt_parent = m->mf6c_parent; mrtp->mrt_ifset = m->mf6c_ifset; } @@ -831,9 +831,9 @@ mrtp->mrt_origin = extract_address(&sa_in6, NULL, 0); sa_in6.sin6_addr = *((struct in6_addr *)md->md_mcastgrp); mrtp->mrt_group = extract_address(&sa_in6, NULL, 0); - mrtp->mrt_pkt_cnt = md->md_pkt_cnt; - mrtp->mrt_byte_cnt = md->md_byte_cnt; - mrtp->mrt_nstall = md->md_nstall; + mrtp->mrt_packets = md->md_pkt_cnt; + mrtp->mrt_bytes = md->md_byte_cnt; + mrtp->mrt_waitings = md->md_nstall; mrtp->mrt_parent = md->md_parent; bcopy(&md->md_ifs_bits, &mrtp->mrt_ifset, sizeof(md->md_ifs_bits)); } ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_route.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2009 Gabor Pali + * Copyright (c) 2009, 2010 Gabor Pali * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -249,7 +249,7 @@ rtp = _netstat_rt_allocate(list); PTR2INT(rtp->rt_node.rnt_address, rn); - rtp->rt_node.rnt_mask = + rtp->rt_node.rnt_netmask = extract_address(rnode->rn_mask, NULL, 0); extract_rtentry_data(&rtentry, rtp); extract_node(rnode, &rtp->rt_node, cnt); @@ -554,7 +554,7 @@ rnp->rnt_mklist[i].rmt_bit = rmp->rm_bit; rnp->rnt_mklist[i].rmt_refs = rmp->rm_refs; rnode = rmp->rm_leaf; - rnp->rnt_mklist[i].rmt_mask = + rnp->rnt_mklist[i].rmt_netmask = (rmp->rm_flags & RNF_NORMAL && rnode->rn_mask != NULL) ? extract_address(rnode->rn_mask, NULL, 0) : extract_address(rmp->rm_mask, NULL, 0); ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#75 (text+ko) ==== @@ -451,109 +451,49 @@ free(satp); } -/* Accessor functions. */ -int -netstat_st_get_family(const struct socket_type *stp) -{ - return (stp->st_family); -} -int -netstat_st_get_protocol(const struct socket_type *stp) -{ - return (stp->st_protocol); -} +/* Accessor macros. */ -const char * -netstat_st_get_name(const struct socket_type *stp) -{ - return (stp->st_name); +#define ACCESSOR(returns, tp, type, field) \ +returns \ +netstat_##tp##t_get_##field(const struct type##_type *a) \ +{ \ + return (a->tp##t_##field); \ } -const char * -netstat_st_get_extname(const struct socket_type *stp) -{ - return (stp->st_extname); +#define ACCESSORP(returns, tp, type, field) \ +returns \ +netstat_##tp##t_get_##field(const struct type##_type *a) \ +{ \ + return (&a->tp##t_##field); \ } -const struct sockbuf_type * -netstat_st_get_snd(const struct socket_type *stp) -{ - return (&stp->st_snd); -} -const struct sockbuf_type * -netstat_st_get_rcv(const struct socket_type *stp) -{ - return (&stp->st_rcv); -} +/* Accessor functions. */ -u_int16_t -netstat_st_get_qlen(const struct socket_type *stp) -{ - return (stp->st_qlen); -} +#define SOCKET_ACC(returns, field) \ + ACCESSOR(returns, s, socket, field) -u_int16_t -netstat_st_get_incqlen(const struct socket_type *stp) -{ - return (stp->st_incqlen); -} +#define SOCKET_ACCP(returns, field) \ + ACCESSORP(returns, s, socket, field) -u_int16_t -netstat_st_get_qlimit(const struct socket_type *stp) -{ - return (stp->st_qlimit); -} - -u_int64_t -netstat_st_get_pcb(const struct socket_type *stp) -{ - return (stp->st_pcb); -} - -u_int64_t -netstat_st_get_vnode(const struct socket_type *stp) -{ - return (stp->st_vnode); -} - -u_int64_t -netstat_st_get_conn(const struct socket_type *stp) -{ - return (stp->st_conn); -} - -u_int64_t -netstat_st_get_refs(const struct socket_type *stp) -{ - return (stp->st_refs); -} - -u_int64_t -netstat_st_get_reflink(const struct socket_type *stp) -{ - return (stp->st_reflink); -} - -const char * -netstat_st_get_tcpstate(const struct socket_type *stp) -{ - return (stp->st_tcpstate); -} - -enum tcp_state -netstat_st_get_tcps(const struct socket_type *stp) -{ - return (stp->st_tcps); -} - -int -netstat_st_get_addrcnt(const struct socket_type *stp) -{ - - return (stp->st_addrcnt); -} +SOCKET_ACC (int, family); +SOCKET_ACC (int, protocol); +SOCKET_ACC (const char *, name); +SOCKET_ACC (const char *, extname); +SOCKET_ACCP(const struct sockbuf_type *, snd); +SOCKET_ACCP(const struct sockbuf_type *, rcv); +SOCKET_ACC (u_int16_t, qlen); +SOCKET_ACC (u_int16_t, incqlen); +SOCKET_ACC (u_int16_t, qlimit); +SOCKET_ACC (u_int64_t, pcb); +SOCKET_ACC (u_int64_t, vnode); +SOCKET_ACC (u_int64_t, conn); +SOCKET_ACC (u_int64_t, refs); +SOCKET_ACC (u_int64_t, reflink); +SOCKET_ACC (const char *, tcpstate); +SOCKET_ACC (enum tcp_state, tcps); +SOCKET_ACC (int, addrcnt); struct sockaddr_type * netstat_st_get_address(const struct socket_type *stp, @@ -566,6 +506,15 @@ return (NULL); } +#undef SOCKET_ACC +#undef SOCKET_ACCP + +#define SOCKADDR_ACC(returns, field) \ + ACCESSOR(returns, sa, sockaddr, field) + +SOCKADDR_ACC(const char *, numeric); +SOCKADDR_ACC(u_int16_t, port); + const char * netstat_sat_get_name(struct sockaddr_type *satp) { @@ -575,12 +524,6 @@ return (satp->sat_name); } -const char * -netstat_sat_get_numeric(const struct sockaddr_type *satp) -{ - return (satp->sat_numeric); -} - int netstat_sat_get_address(const struct sockaddr_type *satp, char *addr, int size) { @@ -593,12 +536,6 @@ return (0); } -u_int16_t -netstat_sat_get_port(const struct sockaddr_type *satp) -{ - return (satp->sat_port); -} - const char * netstat_sat_get_portname(struct sockaddr_type *satp) { @@ -608,48 +545,21 @@ return (satp->sat_portname); } -u_int32_t -netstat_sbt_get_cc(const struct sockbuf_type *sbtp) -{ - return (sbtp->sbt_cc); -} +#undef SOCKADDR_ACC -u_int32_t -netstat_sbt_get_hiwat(const struct sockbuf_type *sbtp) -{ - return (sbtp->sbt_hiwat); -} +#define SOCKBUF_ACC(returns, field) \ + ACCESSOR(returns, sb, sockbuf, field) -u_int32_t -netstat_sbt_get_lowat(const struct sockbuf_type *sbtp) -{ - return (sbtp->sbt_lowat); -} +SOCKBUF_ACC(u_int32_t, cc); +SOCKBUF_ACC(u_int32_t, hiwat); +SOCKBUF_ACC(u_int32_t, lowat); +SOCKBUF_ACC(u_int32_t, mbcnt); +SOCKBUF_ACC(u_int32_t, mcnt); +SOCKBUF_ACC(u_int32_t, ccnt); +SOCKBUF_ACC(u_int32_t, mbmax); -u_int32_t -netstat_sbt_get_mbcnt(const struct sockbuf_type *sbtp) -{ - return (sbtp->sbt_mbcnt); -} - -u_int32_t -netstat_sbt_get_mcnt(const struct sockbuf_type *sbtp) -{ - return (sbtp->sbt_mcnt); -} - -u_int32_t -netstat_sbt_get_ccnt(const struct sockbuf_type *sbtp) -{ - return (sbtp->sbt_ccnt); -} +#undef SOCKBUF_ACC -u_int32_t -netstat_sbt_get_mbmax(const struct sockbuf_type *sbtp) -{ - return (sbtp->sbt_mbmax); -} - /* Memory buffer type */ struct mbuf_type * netstat_mbt_alloc(void) @@ -668,151 +578,48 @@ free(mbtp); } -int -netstat_mbt_geterror(const struct mbuf_type *mbtp) -{ - return (mbtp->mbt_error); -} +#define MBUF_ACC(returns, field) \ + ACCESSOR(returns, mb, mbuf, field) -const struct buffer_type * -netstat_mbt_get_mbuf(const struct mbuf_type *mbtp) -{ - return (&mbtp->mbt_mbuf); -} +#define MBUF_ACCP(returns, field) \ + ACCESSORP(returns, mb, mbuf, field) -const struct buffer_type * -netstat_mbt_get_cluster(const struct mbuf_type *mbtp) -{ - return (&mbtp->mbt_cluster); -} +MBUF_ACC (int, error); +MBUF_ACCP(const struct buffer_type *, mbuf); +MBUF_ACCP(const struct buffer_type *, cluster); +MBUF_ACCP(const struct buffer_type *, packet); +MBUF_ACCP(const struct buffer_type *, tag); +MBUF_ACCP(const struct buffer_type *, jumbop); +MBUF_ACCP(const struct buffer_type *, jumbo9); +MBUF_ACCP(const struct buffer_type *, jumbo16); +MBUF_ACC (u_int64_t, bytes_inuse); +MBUF_ACC (u_int64_t, bytes_incache); +MBUF_ACC (u_int64_t, bytes_total); +MBUF_ACC (u_int64_t, drain); +MBUF_ACC (u_int64_t, sf_bufs); +MBUF_ACC (u_int64_t, sf_bufs_peak); +MBUF_ACC (u_int64_t, sf_bufs_inuse); +MBUF_ACC (u_int64_t, sf_iocnt); +MBUF_ACC (u_int64_t, sf_allocfail); +MBUF_ACC (u_int64_t, sf_allocwait); -const struct buffer_type * -netstat_mbt_get_packet(const struct mbuf_type *mbtp) -{ - return (&mbtp->mbt_packet); -} - -const struct buffer_type * -netstat_mbt_get_tag(const struct mbuf_type *mbtp) -{ - return (&mbtp->mbt_tag); -} - -const struct buffer_type * -netstat_mbt_get_jumbop(const struct mbuf_type *mbtp) -{ - return (&mbtp->mbt_jumbop); -} - -const struct buffer_type * -netstat_mbt_get_jumbo9(const struct mbuf_type *mbtp) -{ - return (&mbtp->mbt_jumbo9); -} - -const struct buffer_type * -netstat_mbt_get_jumbo16(const struct mbuf_type *mbtp) -{ - return (&mbtp->mbt_jumbo16); -} - -u_int64_t -netstat_mbt_get_bytes_inuse(const struct mbuf_type *mbtp) -{ - return (mbtp->mbt_bytes_inuse); -} - -u_int64_t -netstat_mbt_get_bytes_incache(const struct mbuf_type *mbtp) -{ - return (mbtp->mbt_bytes_incache); -} - -u_int64_t -netstat_mbt_get_bytes_total(const struct mbuf_type *mbtp) -{ - return (mbtp->mbt_bytes_total); -} - -u_int64_t -netstat_mbt_get_drain(const struct mbuf_type *mbtp) -{ - return (mbtp->mbt_drain); -} - -u_int64_t -netstat_mbt_get_sf_bufs(const struct mbuf_type *mbtp) -{ - return (mbtp->mbt_sf_bufs); -} - -u_int64_t -netstat_mbt_get_sf_bufs_peak(const struct mbuf_type *mbtp) -{ - return (mbtp->mbt_sf_bufs_peak); -} +#undef MBUF_ACC +#undef MBUF_ACCP -u_int64_t -netstat_mbt_get_sf_bufs_inuse(const struct mbuf_type *mbtp) -{ - return (mbtp->mbt_sf_bufs_inuse); -} - -u_int64_t -netstat_mbt_get_sf_iocnt(const struct mbuf_type *mbtp) -{ - return (mbtp->mbt_sf_iocnt); -} - -u_int64_t -netstat_mbt_get_sf_allocfail(const struct mbuf_type *mbtp) -{ - return (mbtp->mbt_sf_allocfail); -} - -u_int64_t -netstat_mbt_get_sf_allocwait(const struct mbuf_type *mbtp) -{ - return (mbtp->mbt_sf_allocwait); -} - /* Buffer type */ -u_int64_t -netstat_bt_get_count(const struct buffer_type *btp) -{ - return (btp->bt_count); -} -u_int64_t -netstat_bt_get_bytes(const struct buffer_type *btp) -{ - return (btp->bt_bytes); -} +#define BUFFER_ACC(returns, field) \ + ACCESSOR(returns, b, buffer, field) -u_int64_t -netstat_bt_get_free(const struct buffer_type *btp) -{ - return (btp->bt_free); -} +BUFFER_ACC(u_int64_t, count); +BUFFER_ACC(u_int64_t, bytes); +BUFFER_ACC(u_int64_t, free); +BUFFER_ACC(u_int64_t, failures); +BUFFER_ACC(u_int64_t, size); +BUFFER_ACC(u_int64_t, limit); -u_int64_t -netstat_bt_get_failures(const struct buffer_type *btp) -{ - return (btp->bt_failures); -} +#undef BUFFER_ACC -u_int64_t -netstat_bt_get_size(const struct buffer_type *btp) -{ - return (btp->bt_size); -} - -u_int64_t -netstat_bt_get_limit(const struct buffer_type *btp) -{ - return (btp->bt_limit); -} - struct interface_type * _netstat_it_allocate(struct interface_type_list *list, int type, int physical, const char *name) @@ -957,54 +764,23 @@ free(iatp); } -const char * -netstat_it_get_name(const struct interface_type *itp) -{ - return (itp->it_name); -} -u_int64_t -netstat_it_get_mtu(const struct interface_type *itp) -{ - return (itp->it_mtu); -} +#define INTERFACE_ACC(returns, field) \ + ACCESSOR(returns, i, interface, field) -int -netstat_it_get_flags(const struct interface_type *itp) -{ - return (itp->it_flags); -} +#define INTERFACE_ACCP(returns, field) \ + ACCESSORP(returns, i, interface, field) -u_int64_t -netstat_it_get_collisions(const struct interface_type *itp) -{ - return (itp->it_collisions); -} - -u_int64_t -netstat_it_get_drops(const struct interface_type *itp) -{ - return (itp->it_drops); -} - -const struct face_type * -netstat_it_get_in(const struct interface_type *itp) -{ - return (&itp->it_in); -} +INTERFACE_ACC (const char *, name); +INTERFACE_ACC (u_int64_t, mtu); +INTERFACE_ACC (int, flags); +INTERFACE_ACC (u_int64_t, collisions); +INTERFACE_ACC (u_int64_t, drops); +INTERFACE_ACCP(const struct face_type *, in); +INTERFACE_ACCP(const struct face_type *, out); +INTERFACE_ACC (int, addrcnt); +INTERFACE_ACC (int, mcast_addrcnt); -const struct face_type * -netstat_it_get_out(const struct interface_type *itp) -{ - return (&itp->it_out); -} - -int -netstat_it_get_addrcnt(const struct interface_type *itp) -{ - return (itp->it_addrcnt); -} - const struct intfaddr_type * netstat_it_get_address(const struct interface_type *itp, int index) { @@ -1013,55 +789,41 @@ return (NULL); } -int -netstat_it_get_mcast_addrcnt(const struct interface_type *itp) -{ - return (itp->it_maddrcnt); -} - const struct intfaddr_type * netstat_it_get_mcast_address(const struct interface_type *itp, int index) { - if (0 <= index && index < itp->it_maddrcnt) + if (0 <= index && index < itp->it_mcast_addrcnt) return (itp->it_maddress[index]); return (NULL); } -u_int64_t -netstat_ft_get_packets(const struct face_type *ftp) -{ - return (ftp->ft_packets); -} +#undef INTERFACE_ACC +#undef INTERFACE_ACCP + +#define FACE_ACC(returns, field) \ + ACCESSOR(returns, f, face, field) -u_int64_t -netstat_ft_get_bytes(const struct face_type *ftp) -{ - return (ftp->ft_bytes); -} +FACE_ACC(u_int64_t, packets); +FACE_ACC(u_int64_t, bytes); +FACE_ACC(u_int64_t, mcasts); +FACE_ACC(u_int64_t, errors); +FACE_ACC(u_int64_t, drops); -u_int64_t -netstat_ft_get_mcasts(const struct face_type *ftp) -{ - return (ftp->ft_mcasts); -} +#undef FACE_ACC -u_int64_t -netstat_ft_get_errors(const struct face_type *ftp) -{ - return (ftp->ft_errors); -} +#define INTFADDR_ACC(returns, field) \ + ACCESSOR(returns, ia, intfaddr, field) -u_int64_t -netstat_ft_get_drops(const struct face_type *ftp) -{ - return (ftp->ft_drops); -} +#define INTFADDR_ACCP(returns, field) \ + ACCESSORP(returns, ia, intfaddr, field) -int -netstat_iat_get_family(const struct intfaddr_type *iatp) -{ - return (iatp->iat_family); -} +INTFADDR_ACC(int, family); +INTFADDR_ACC(enum intfaddr_layer, layer); +INTFADDR_ACC(u_int64_t, ipackets); +INTFADDR_ACC(u_int64_t, ibytes); +INTFADDR_ACC(u_int64_t, opackets); +INTFADDR_ACC(u_int64_t, obytes); +INTFADDR_ACC(u_int32_t, refcount); const char * netstat_iat_get_address(const struct intfaddr_type *iatp, int numeric) @@ -1079,42 +841,9 @@ return (iatp->iat_network); } -enum intfaddr_layer -netstat_iat_get_layer(const struct intfaddr_type *iatp) -{ - return (iatp->iat_layer); -} - -u_int64_t -netstat_iat_get_ipackets(const struct intfaddr_type *iatp) -{ - return (iatp->iat_ipackets); -} +#undef INTFADDR_ACC +#undef INTFADDR_ACCP -u_int64_t -netstat_iat_get_ibytes(const struct intfaddr_type *iatp) -{ - return (iatp->iat_ibytes); -} - -u_int64_t -netstat_iat_get_opackets(const struct intfaddr_type *iatp) -{ - return (iatp->iat_opackets); -} - -u_int64_t -netstat_iat_get_obytes(const struct intfaddr_type *iatp) -{ - return (iatp->iat_obytes); -} - -u_int32_t -netstat_iat_get_refcount(const struct intfaddr_type *iatp) -{ - return (iatp->iat_refcount); -} - void _netstat_bptl_empty(struct bpf_type_list *list) { @@ -1224,66 +953,22 @@ free(btp); } -int -netstat_bpt_get_flags(const struct bpf_type *btp) -{ - return (btp->bpt_flags); -} +#define BPF_ACC(returns, field) \ + ACCESSOR(returns, bp, bpf, field) -enum bpf_dir -netstat_bpt_get_direction(const struct bpf_type *btp) -{ - return (btp->bpt_direction); -} +BPF_ACC(int, flags); +BPF_ACC(enum bpf_dir, direction); +BPF_ACC(u_int32_t, pid); +BPF_ACC(const char *, ifname); +BPF_ACC(u_int64_t, recv); +BPF_ACC(u_int64_t, drop); +BPF_ACC(u_int64_t, match); +BPF_ACC(u_int64_t, slen); +BPF_ACC(u_int64_t, hlen); +BPF_ACC(const char *, pidname); -u_int32_t -netstat_bpt_get_pid(const struct bpf_type *btp) -{ - return (btp->bpt_pid); -} - -const char * -netstat_bpt_get_ifname(const struct bpf_type *btp) -{ - return (btp->bpt_ifname); -} - -u_int64_t -netstat_bpt_get_recv(const struct bpf_type *btp) -{ - return (btp->bpt_recv); -} - -u_int64_t -netstat_bpt_get_drop(const struct bpf_type *btp) -{ - return (btp->bpt_drop); -} - -u_int64_t -netstat_bpt_get_match(const struct bpf_type *btp) -{ - return (btp->bpt_match); -} +#undef BPF_ACC -u_int64_t -netstat_bpt_get_slen(const struct bpf_type *btp) -{ - return (btp->bpt_slen); -} - -u_int64_t -netstat_bpt_get_hlen(const struct bpf_type *btp) -{ - return (btp->bpt_hlen); -} - -const char * -netstat_bpt_get_pidname(const struct bpf_type *btp) -{ - return (btp->bpt_pidname); -} - struct stat_type * netstat_stat_alloc(void) { @@ -2295,7 +1980,7 @@ _netstat_rat_free(rtp->rt_destination); _netstat_rat_free(rtp->rt_gateway); for (i = 0; i < rtp->rt_node.rnt_mkcnt; i++) - _netstat_rat_free(rtp->rt_node.rnt_mklist[i].rmt_mask); + _netstat_rat_free(rtp->rt_node.rnt_mklist[i].rmt_netmask); if (rtp->rt_node.rnt_mklist != NULL) free(rtp->rt_node.rnt_mklist); free(rtp->rt_interface); @@ -2422,114 +2107,38 @@ free(rtip); } -int -netstat_rt_get_fib(const struct route_type *rtp) -{ - return (rtp->rt_fib); -} +#define ROUTE_ACC(returns, field) \ + ACCESSOR(returns, r, route, field) -int -netstat_rt_get_family(const struct route_type *rtp) -{ - return (rtp->rt_family); -} +#define ROUTE_ACCP(returns, field) \ + ACCESSORP(returns, r, route, field) -const struct routeaddr_type * -netstat_rt_get_destination(const struct route_type *rtp) -{ - return (rtp->rt_destination); -} +ROUTE_ACC (int, fib); +ROUTE_ACC (int, family); +ROUTE_ACC (const struct routeaddr_type *, destination); +ROUTE_ACC (const struct routeaddr_type *, gateway); +ROUTE_ACC (int, flags); +ROUTE_ACC (u_int64_t, refs); +ROUTE_ACC (u_int64_t, used); +ROUTE_ACC (const char *, interface); +ROUTE_ACC (u_int64_t, expire); +ROUTE_ACC (u_int32_t, mtu); +ROUTE_ACCP(const struct routenode_type *, node); -const struct routeaddr_type * -netstat_rt_get_gateway(const struct route_type *rtp) -{ - return (rtp->rt_gateway); -} +#undef ROUTE_ACC +#undef ROUTE_ACCP -int >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 17 03:03:55 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A2CE1065679; Mon, 17 May 2010 03:03:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 484781065677 for ; Mon, 17 May 2010 03:03:55 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 334848FC18 for ; Mon, 17 May 2010 03:03:55 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4H33tpw034920 for ; Mon, 17 May 2010 03:03:55 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4H33XiO034902 for perforce@freebsd.org; Mon, 17 May 2010 03:03:33 GMT (envelope-from thompsa@freebsd.org) Date: Mon, 17 May 2010 03:03:33 GMT Message-Id: <201005170303.o4H33XiO034902@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178360 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 03:03:55 -0000 http://p4web.freebsd.org/@@178360?ac=10 Change 178360 by thompsa@thompsa_pea on 2010/05/17 03:03:02 IFC Affected files ... .. //depot/projects/usb_buf/src/lib/libusb/Makefile#2 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb.3#6 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb.h#1 branch .. //depot/projects/usb_buf/src/lib/libusb/libusb10.c#1 branch .. //depot/projects/usb_buf/src/lib/libusb/libusb10.h#1 branch .. //depot/projects/usb_buf/src/lib/libusb/libusb10_desc.c#1 branch .. //depot/projects/usb_buf/src/lib/libusb/libusb10_io.c#1 branch .. //depot/projects/usb_buf/src/lib/libusb/libusb20.3#1 branch .. //depot/projects/usb_buf/src/lib/libusb/libusb20.c#4 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb20.h#4 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb20_compat01.c#2 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb20_compat10.c#2 delete .. //depot/projects/usb_buf/src/lib/libusb/libusb20_compat10.h#2 delete .. //depot/projects/usb_buf/src/lib/libusb/libusb20_desc.c#2 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb20_desc.h#2 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb20_int.h#3 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb20_ugen20.c#3 integrate .. //depot/projects/usb_buf/src/lib/libusb/usb.h#2 integrate .. //depot/projects/usb_buf/src/lib/libusbhid/Makefile#2 integrate .. //depot/projects/usb_buf/src/lib/libusbhid/data.c#2 integrate .. //depot/projects/usb_buf/src/lib/libusbhid/descr.c#3 integrate .. //depot/projects/usb_buf/src/lib/libusbhid/parse.c#2 integrate .. //depot/projects/usb_buf/src/lib/libusbhid/usage.c#2 integrate .. //depot/projects/usb_buf/src/lib/libusbhid/usbhid.h#2 integrate .. //depot/projects/usb_buf/src/lib/libusbhid/usbvar.h#2 integrate .. //depot/projects/usb_buf/src/share/man/Makefile#1 branch .. //depot/projects/usb_buf/src/share/man/man4/Makefile#1 branch .. //depot/projects/usb_buf/src/share/man/man4/aac.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/acpi.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/acpi_asus.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/acpi_fujitsu.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/acpi_hp.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/acpi_ibm.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/acpi_panasonic.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/acpi_sony.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/acpi_toshiba.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/acpi_wmi.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/ada.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/ahci.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/alc.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/alpm.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/altq.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/amdpm.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/amdsbwd.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/asmc.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ata.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/atapicam.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ath.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/atp.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/audit.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/aue.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/axe.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/bce.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/bge.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/bridge.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/bwn.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/carp.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/cas.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/cd.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/cdce.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ch.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/cpuctl.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/cpufreq.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/da.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/dc.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/de.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/dpms.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/ed.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ehci.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/epair.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/faith.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/gem.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/geom.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/gif.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/gpib.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/gre.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/hifn.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/hme.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/hptrr.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ichwd.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ieee80211.4#2 delete .. //depot/projects/usb_buf/src/share/man/man4/if_bridge.4#2 delete .. //depot/projects/usb_buf/src/share/man/man4/ifmib.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/inet6.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/io.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ip.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ip6.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ips.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ipsec.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ipwfw.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/iwifw.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/iwn.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/iwnfw.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ksyms.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/lge.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/lindev.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/linux.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/mac.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/mac_mls.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/malo.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/man4.i386/Makefile#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/man4.i386/alpm.4#2 delete .. //depot/projects/usb_buf/src/share/man/man4/man4.i386/amdpm.4#2 delete .. //depot/projects/usb_buf/src/share/man/man4/man4.i386/dpms.4#2 delete .. //depot/projects/usb_buf/src/share/man/man4/man4.i386/mcd.4#2 delete .. //depot/projects/usb_buf/src/share/man/man4/man4.i386/padlock.4#2 delete .. //depot/projects/usb_buf/src/share/man/man4/man4.i386/pcf.4#2 delete .. //depot/projects/usb_buf/src/share/man/man4/man4.i386/scd.4#2 delete .. //depot/projects/usb_buf/src/share/man/man4/man4.i386/viapm.4#2 delete .. //depot/projects/usb_buf/src/share/man/man4/man4.i386/vpd.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/man4.powerpc/Makefile#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/man4.powerpc/adb.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/man4.powerpc/akbd.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/man4.powerpc/ams.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/man4.powerpc/cuda.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/man4.powerpc/pmu.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/man4.powerpc/smu.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/man4.sparc64/ebus.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/man4.sparc64/sbus.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/mcd.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/mfi.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/miibus.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/mk48txx.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/mld.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/mpt.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/msk.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/multicast.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/mwl.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/mwlfw.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/mxge.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ndis.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/net80211.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/netintro.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ng_ipfw.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/nge.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/nvram.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/ohci.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/padlock.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/pass.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/pcf.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/pcii.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/pcm.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/pcn.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/polling.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/psm.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/pt.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/pts.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/pty.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ral.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/re.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/rl.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/rue.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/rum.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/run.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/sa.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/sbp_targ.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/scd.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/scsi.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/sctp.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/sf.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/siba.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/siis.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/sis.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/sk.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/smbus.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/snd_uaudio.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ste.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/stge.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/syscons.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/sysmouse.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/targ.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/termios.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/textdump.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/tnt4882.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/tty.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/u3g.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/uart.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ubsa.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ucom.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/udav.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/udbp.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ufm.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/uftdi.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ugen.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/uhci.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/uhid.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/uhso.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/ukbd.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ulpt.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/umass.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/umodem.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ums.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/unix.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/uplcom.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/ural.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/urio.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/urtw.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/usb.4#3 integrate .. //depot/projects/usb_buf/src/share/man/man4/uvisor.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/uvscom.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/vge.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/viapm.4#1 branch .. //depot/projects/usb_buf/src/share/man/man4/vlan.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/vr.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/watchdog.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/wi.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/wlan.4#2 integrate .. //depot/projects/usb_buf/src/share/man/man4/zyd.4#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/acpica/acpi_switch.S#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/atpic_vector.S#1 branch .. //depot/projects/usb_buf/src/sys/amd64/amd64/bpf_jit_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/bpf_jit_machdep.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/io.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/mca.c#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/conf/GENERIC.hints#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/conf/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/conf/XENHVM#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/_align.h#1 branch .. //depot/projects/usb_buf/src/sys/amd64/include/_inttypes.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/apm_bios.h#1 branch .. //depot/projects/usb_buf/src/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/elf.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/iodev.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/mca.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/param.h#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/proc.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/reg.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/smp.h#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/vm.h#1 branch .. //depot/projects/usb_buf/src/sys/amd64/include/vmparam.h#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/isa/atpic.c#2 delete .. //depot/projects/usb_buf/src/sys/amd64/isa/atpic_vector.S#2 delete .. //depot/projects/usb_buf/src/sys/amd64/isa/clock.c#2 delete .. //depot/projects/usb_buf/src/sys/amd64/isa/elcr.c#2 delete .. //depot/projects/usb_buf/src/sys/amd64/isa/icu.h#2 delete .. //depot/projects/usb_buf/src/sys/amd64/isa/isa.c#2 delete .. //depot/projects/usb_buf/src/sys/amd64/isa/isa.h#2 delete .. //depot/projects/usb_buf/src/sys/amd64/isa/isa_dma.c#2 delete .. //depot/projects/usb_buf/src/sys/amd64/isa/nmi.c#2 delete .. //depot/projects/usb_buf/src/sys/amd64/linux32/linux.h#4 integrate .. //depot/projects/usb_buf/src/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/cpufunc_asm_fa526.S#1 branch .. //depot/projects/usb_buf/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/gdb_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/intr.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/locore.S#2 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/mem.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/minidump_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/support.S#2 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/at91/at91.c#3 integrate .. //depot/projects/usb_buf/src/sys/arm/at91/at91_cfata.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/at91/at91_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/at91/at91_mci.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/usb_buf/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/conf/AVILA#3 integrate .. //depot/projects/usb_buf/src/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/usb_buf/src/sys/arm/conf/BWCT#2 integrate .. //depot/projects/usb_buf/src/sys/arm/conf/BWCT.hints#2 integrate .. //depot/projects/usb_buf/src/sys/arm/conf/CAMBRIA#2 integrate .. //depot/projects/usb_buf/src/sys/arm/conf/CAMBRIA.hints#2 integrate .. //depot/projects/usb_buf/src/sys/arm/conf/CNS11XXNAS#1 branch .. //depot/projects/usb_buf/src/sys/arm/conf/CRB#2 integrate .. //depot/projects/usb_buf/src/sys/arm/conf/DB-78XXX#2 integrate .. //depot/projects/usb_buf/src/sys/arm/conf/DB-88F5XXX#2 integrate .. //depot/projects/usb_buf/src/sys/arm/conf/DB-88F6XXX#2 integrate .. //depot/projects/usb_buf/src/sys/arm/conf/DEFAULTS#2 integrate .. //depot/projects/usb_buf/src/sys/arm/conf/EP80219#2 integrate .. //depot/projects/usb_buf/src/sys/arm/conf/GUMSTIX#2 integrate .. //depot/projects/usb_buf/src/sys/arm/conf/HL200#2 integrate .. //depot/projects/usb_buf/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/usb_buf/src/sys/arm/conf/KB920X#2 integrate .. //depot/projects/usb_buf/src/sys/arm/conf/LN2410SBC#1 branch .. //depot/projects/usb_buf/src/sys/arm/conf/NSLU#2 integrate .. //depot/projects/usb_buf/src/sys/arm/conf/SHEEVAPLUG#1 branch .. //depot/projects/usb_buf/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/usb_buf/src/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/usb_buf/src/sys/arm/econa/cfi_bus_econa.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/econa/econa.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/econa/econa_machdep.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/econa/econa_reg.h#1 branch .. //depot/projects/usb_buf/src/sys/arm/econa/econa_var.h#1 branch .. //depot/projects/usb_buf/src/sys/arm/econa/ehci_ebus.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/econa/files.econa#1 branch .. //depot/projects/usb_buf/src/sys/arm/econa/if_ece.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/econa/if_ecereg.h#1 branch .. //depot/projects/usb_buf/src/sys/arm/econa/if_ecevar.h#1 branch .. //depot/projects/usb_buf/src/sys/arm/econa/ohci_ec.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/econa/std.econa#1 branch .. //depot/projects/usb_buf/src/sys/arm/econa/timer.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/econa/uart_bus_ec.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/econa/uart_cpu_ec.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/include/_align.h#1 branch .. //depot/projects/usb_buf/src/sys/arm/include/_inttypes.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/include/_stdint.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/include/armreg.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/include/bus.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/include/bus_dma.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/include/elf.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/include/intr.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/include/md_var.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/include/param.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/include/proc.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/include/ucontext.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/include/vm.h#1 branch .. //depot/projects/usb_buf/src/sys/arm/mv/common.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/mv/discovery/db78xxx.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/mv/discovery/discovery.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/mv/files.mv#2 integrate .. //depot/projects/usb_buf/src/sys/arm/mv/ic.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/mv/kirkwood/db88f6xxx.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/mv/kirkwood/files.db88f6xxx#2 integrate .. //depot/projects/usb_buf/src/sys/arm/mv/kirkwood/files.kirkwood#1 branch .. //depot/projects/usb_buf/src/sys/arm/mv/kirkwood/files.sheevaplug#1 branch .. //depot/projects/usb_buf/src/sys/arm/mv/kirkwood/kirkwood.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/mv/kirkwood/sheevaplug.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/mv/kirkwood/std.db88f6xxx#2 integrate .. //depot/projects/usb_buf/src/sys/arm/mv/kirkwood/std.kirkwood#1 branch .. //depot/projects/usb_buf/src/sys/arm/mv/kirkwood/std.sheevaplug#1 branch .. //depot/projects/usb_buf/src/sys/arm/mv/mv_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/mv/mv_sata.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/mv/mvreg.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/mv/mvvar.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/mv/mvwin.h#1 branch .. //depot/projects/usb_buf/src/sys/arm/mv/orion/db88f5xxx.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/mv/orion/orion.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/mv/twsi.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/board_ln2410sbc.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/files.s3c2xx0#1 branch .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/s3c2410reg.h#1 branch .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/s3c2410var.h#1 branch .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/s3c2440reg.h#1 branch .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/s3c24x0.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/s3c24x0_clk.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/s3c24x0_machdep.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/s3c24x0reg.h#1 branch .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/s3c24x0var.h#1 branch .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/s3c2xx0_space.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/s3c2xx0board.h#1 branch .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/s3c2xx0reg.h#1 branch .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/s3c2xx0var.h#1 branch .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/std.ln2410sbc#1 branch .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/std.s3c2410#1 branch .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/uart_bus_s3c2410.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/uart_cpu_s3c2410.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/s3c2xx0/uart_dev_s3c2410.h#1 branch .. //depot/projects/usb_buf/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/sa11x0/sa11x0_dmacreg.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/sa11x0/sa11x0_gpioreg.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/sa11x0/sa11x0_irq.S#2 integrate .. //depot/projects/usb_buf/src/sys/arm/sa11x0/sa11x0_irqhandler.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/sa11x0/sa11x0_ostreg.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/sa11x0/sa11x0_ppcreg.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/sa11x0/sa11x0_reg.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/sa11x0/sa11x0_var.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/i8134x/i81342.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/avila_led.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/cambria_exp_space.c#1 branch .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/cambria_fled.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/cambria_led.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/ixp425_npereg.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/ixp425reg.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/ixp425var.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/pxa/pxa_icu.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/pxa/pxa_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/xscalereg.h#2 delete .. //depot/projects/usb_buf/src/sys/arm/xscale/xscalevar.h#2 delete .. //depot/projects/usb_buf/src/sys/boot/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/boot/arm/at91/boot2/bwct_board.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/common/Makefile.inc#2 integrate .. //depot/projects/usb_buf/src/sys/boot/common/boot.c#3 integrate .. //depot/projects/usb_buf/src/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/usb_buf/src/sys/boot/common/commands.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/common/md.c#1 branch .. //depot/projects/usb_buf/src/sys/boot/common/module.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/efi/include/efilib.h#2 integrate .. //depot/projects/usb_buf/src/sys/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/boot/efi/libefi/efifs.c#2 delete .. //depot/projects/usb_buf/src/sys/boot/efi/libefi/efipart.c#1 branch .. //depot/projects/usb_buf/src/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/usb_buf/src/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/efi/Makefile#1 branch .. //depot/projects/usb_buf/src/sys/boot/i386/efi/autoload.c#1 branch .. //depot/projects/usb_buf/src/sys/boot/i386/efi/bootinfo.c#1 branch .. //depot/projects/usb_buf/src/sys/boot/i386/efi/conf.c#1 branch .. //depot/projects/usb_buf/src/sys/boot/i386/efi/devicename.c#1 branch .. //depot/projects/usb_buf/src/sys/boot/i386/efi/efimd.c#1 branch .. //depot/projects/usb_buf/src/sys/boot/i386/efi/elf32_freebsd.c#1 branch .. //depot/projects/usb_buf/src/sys/boot/i386/efi/exec.c#1 branch .. //depot/projects/usb_buf/src/sys/boot/i386/efi/i386_copy.c#1 branch .. //depot/projects/usb_buf/src/sys/boot/i386/efi/ldscript.amd64#1 branch .. //depot/projects/usb_buf/src/sys/boot/i386/efi/ldscript.i386#1 branch .. //depot/projects/usb_buf/src/sys/boot/i386/efi/main.c#1 branch .. //depot/projects/usb_buf/src/sys/boot/i386/efi/reloc.c#1 branch .. //depot/projects/usb_buf/src/sys/boot/i386/efi/start.S#1 branch .. //depot/projects/usb_buf/src/sys/boot/i386/efi/version#1 branch .. //depot/projects/usb_buf/src/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/libi386/biospnp.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/libi386/elf32_freebsd.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/libi386/spinconsole.c#1 branch .. //depot/projects/usb_buf/src/sys/boot/i386/libi386/vidconsole.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/zfsboot/zfsboot.c#3 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/zfsboot/zfsldr.S#2 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/zfsloader/Makefile#1 branch .. //depot/projects/usb_buf/src/sys/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/ia64/efi/main.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/ia64/efi/version#2 integrate .. //depot/projects/usb_buf/src/sys/boot/ia64/ski/acpi_stub.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/usb_buf/src/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/asm.S#2 delete .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/asm.h#2 delete .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/bios.S#2 delete .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/boot.c#2 delete .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/boot.h#2 delete .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/boot1.S#1 branch .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/boot2.S#2 delete .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/boot2.c#1 branch .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/dinode.h#2 delete .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/disk.c#2 delete .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/fs.h#2 delete .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/inode.h#2 delete .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/io.c#2 delete .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/probe_keyboard.c#2 delete .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/quota.h#2 delete .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/serial.S#2 delete .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/serial_16550.S#2 delete .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/serial_8251.S#2 delete .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/start.S#2 delete .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/sys.c#3 delete .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/table.c#2 delete .. //depot/projects/usb_buf/src/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/usb_buf/src/sys/boot/pc98/kgzldr/crt.s#2 integrate .. //depot/projects/usb_buf/src/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/pc98/libpc98/biosmem.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/pc98/libpc98/libpc98.h#1 branch .. //depot/projects/usb_buf/src/sys/boot/pc98/libpc98/pc98_sys.c#1 branch .. //depot/projects/usb_buf/src/sys/boot/pc98/loader/conf.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/powerpc/ofw/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/boot/powerpc/uboot/conf.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/powerpc/uboot/version#2 integrate .. //depot/projects/usb_buf/src/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/uboot/common/metadata.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/zfs/zfsimpl.c#3 integrate .. //depot/projects/usb_buf/src/sys/bsm/audit.h#2 integrate .. //depot/projects/usb_buf/src/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/usb_buf/src/sys/cam/ata/ata_all.c#1 branch .. //depot/projects/usb_buf/src/sys/cam/ata/ata_all.h#1 branch .. //depot/projects/usb_buf/src/sys/cam/ata/ata_da.c#1 branch .. //depot/projects/usb_buf/src/sys/cam/ata/ata_pmp.c#1 branch .. //depot/projects/usb_buf/src/sys/cam/ata/ata_xpt.c#1 branch .. //depot/projects/usb_buf/src/sys/cam/cam.c#2 integrate .. //depot/projects/usb_buf/src/sys/cam/cam.h#2 integrate .. //depot/projects/usb_buf/src/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/usb_buf/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/usb_buf/src/sys/cam/cam_periph.h#2 integrate .. //depot/projects/usb_buf/src/sys/cam/cam_queue.c#2 integrate .. //depot/projects/usb_buf/src/sys/cam/cam_queue.h#2 integrate .. //depot/projects/usb_buf/src/sys/cam/cam_sim.c#2 integrate .. //depot/projects/usb_buf/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/usb_buf/src/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/usb_buf/src/sys/cam/cam_xpt_internal.h#1 branch .. //depot/projects/usb_buf/src/sys/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/usb_buf/src/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/usb_buf/src/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/usb_buf/src/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/usb_buf/src/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/usb_buf/src/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/usb_buf/src/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/usb_buf/src/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/usb_buf/src/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/usb_buf/src/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/usb_buf/src/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/usb_buf/src/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/usb_buf/src/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/usb_buf/src/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/usb_buf/src/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/usb_buf/src/sys/cam/scsi/scsi_xpt.c#1 branch .. //depot/projects/usb_buf/src/sys/cddl/boot/zfs/zfsimpl.h#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/boot/zfs/zfssubr.c#4 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#1 branch .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/mutex.h#4 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/sig.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/taskq.h#2 delete .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#2 delete .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#2 delete .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#2 delete .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#2 delete .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#2 delete .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#3 delete .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#2 delete .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#2 delete .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h#1 branch .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/dev/cyclic/amd64/cyclic_machdep.c#2 delete .. //depot/projects/usb_buf/src/sys/cddl/dev/cyclic/i386/cyclic_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/usb_buf/src/sys/compat/freebsd32/freebsd32_ipc.h#2 integrate .. //depot/projects/usb_buf/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/usb_buf/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/usb_buf/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/usb_buf/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/usb_buf/src/sys/compat/freebsd32/freebsd32_util.h#2 integrate .. //depot/projects/usb_buf/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/usb_buf/src/sys/compat/ia32/ia32_reg.h#2 integrate .. //depot/projects/usb_buf/src/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/usb_buf/src/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/usb_buf/src/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/usb_buf/src/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/linux/linux_mib.c#3 integrate .. //depot/projects/usb_buf/src/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/usb_buf/src/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/linux/linux_socket.c#5 integrate .. //depot/projects/usb_buf/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/linux/linux_time.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/linux/linux_videodev.h#1 branch .. //depot/projects/usb_buf/src/sys/compat/linux/linux_videodev_compat.h#1 branch .. //depot/projects/usb_buf/src/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/usb_buf/src/sys/compat/ndis/kern_windrv.c#3 integrate .. //depot/projects/usb_buf/src/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/usb_buf/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/ndis/subr_usbd.c#4 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_stat.c#4 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_termios.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/syscalls.master#2 integrate .. //depot/projects/usb_buf/src/sys/compat/x86bios/x86bios.c#1 branch .. //depot/projects/usb_buf/src/sys/compat/x86bios/x86bios.h#1 branch .. //depot/projects/usb_buf/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/usb_buf/src/sys/conf/Makefile.mips#2 integrate .. //depot/projects/usb_buf/src/sys/conf/NOTES#5 integrate .. //depot/projects/usb_buf/src/sys/conf/files#7 integrate .. //depot/projects/usb_buf/src/sys/conf/files.amd64#3 integrate .. //depot/projects/usb_buf/src/sys/conf/files.arm#2 integrate .. //depot/projects/usb_buf/src/sys/conf/files.i386#5 integrate .. //depot/projects/usb_buf/src/sys/conf/files.ia64#2 integrate .. //depot/projects/usb_buf/src/sys/conf/files.mips#2 integrate .. //depot/projects/usb_buf/src/sys/conf/files.pc98#3 integrate .. //depot/projects/usb_buf/src/sys/conf/files.powerpc#5 integrate .. //depot/projects/usb_buf/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/usb_buf/src/sys/conf/files.sun4v#2 integrate .. //depot/projects/usb_buf/src/sys/conf/kern.mk#2 integrate .. //depot/projects/usb_buf/src/sys/conf/kern.post.mk#2 integrate .. //depot/projects/usb_buf/src/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/usb_buf/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/usb_buf/src/sys/conf/ldscript.mips#2 integrate .. //depot/projects/usb_buf/src/sys/conf/ldscript.mips.cfe#2 integrate .. //depot/projects/usb_buf/src/sys/conf/ldscript.mips.mips64#1 branch .. //depot/projects/usb_buf/src/sys/conf/ldscript.mips.octeon1.32#1 branch .. //depot/projects/usb_buf/src/sys/conf/ldscript.mips.octeon1.64#1 branch .. //depot/projects/usb_buf/src/sys/conf/ldscript.mips.octeon1.n32#1 branch .. //depot/projects/usb_buf/src/sys/conf/makeLINT.mk#2 integrate .. //depot/projects/usb_buf/src/sys/conf/newvers.sh#2 integrate .. //depot/projects/usb_buf/src/sys/conf/options#5 integrate .. //depot/projects/usb_buf/src/sys/conf/options.amd64#2 integrate .. //depot/projects/usb_buf/src/sys/conf/options.arm#2 integrate .. //depot/projects/usb_buf/src/sys/conf/options.i386#2 integrate .. //depot/projects/usb_buf/src/sys/conf/options.ia64#2 integrate .. //depot/projects/usb_buf/src/sys/conf/options.mips#2 integrate .. //depot/projects/usb_buf/src/sys/conf/options.pc98#2 integrate .. //depot/projects/usb_buf/src/sys/conf/options.sparc64#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/CHANGES.txt#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acapps.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acconfig.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acdebug.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acdisasm.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acdispat.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acefi.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acenv.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acevents.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acexcep.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acfreebsd.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acgcc.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acglobal.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/achware.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acinterp.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/aclocal.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acmacros.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acnames.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acnamesp.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acobject.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acopcode.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acoutput.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acparser.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acpi.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acpiosxf.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acpixf.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acresrc.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acstruct.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/actables.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/actbl.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/actbl1.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/actbl2.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/actypes.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/acutils.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/aecommon.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/amlcode.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/amlresrc.h#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/changes.txt#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/common/adfile.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/common/adwalk.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/common/dmextern.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/common/dmrestag.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/common/dmtable.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/common/dmtbdump.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/common/dmtbinfo.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslpredef.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslrestype1i.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslrestype2d.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslrestype2e.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslrestype2q.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslrestype2w.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslstartup.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dbcmds.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dbdisply.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dbexec.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dbfileio.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dbhistry.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dbinput.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dbstats.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dbutils.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dbxface.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/debugger/dbcmds.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/debugger/dbdisply.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/debugger/dbexec.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/debugger/dbfileio.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/debugger/dbhistry.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/debugger/dbinput.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/debugger/dbstats.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/debugger/dbutils.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/debugger/dbxface.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/disassembler/dmbuffer.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/disassembler/dmnames.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/disassembler/dmobject.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/disassembler/dmopcode.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/disassembler/dmresrc.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/disassembler/dmresrcl.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/disassembler/dmresrcs.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/disassembler/dmutils.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/disassembler/dmwalk.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dispatcher/dsinit.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dispatcher/dsopcode.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dispatcher/dsutils.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dispatcher/dswexec.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dispatcher/dswload.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dispatcher/dswscope.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dispatcher/dswstate.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dmbuffer.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dmnames.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dmobject.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dmopcode.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dmresrc.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dmresrcl.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dmresrcs.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dmutils.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dmwalk.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dsfield.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dsinit.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dsmethod.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dsmthdat.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dsobject.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dsopcode.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dsutils.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dswexec.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dswload.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dswscope.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/dswstate.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/events/evevent.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/events/evgpe.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/events/evgpeblk.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/events/evgpeinit.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/events/evgpeutil.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/events/evmisc.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/events/evregion.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/events/evrgnini.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/events/evsci.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/events/evxface.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/events/evxfevnt.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/events/evxfregn.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/evevent.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/evgpe.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/evgpeblk.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/evmisc.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/evregion.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/evrgnini.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/evsci.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/evxface.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/evxfevnt.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/evxfregn.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exconfig.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exconvrt.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/excreate.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exdump.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exconfig.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exconvrt.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/excreate.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exdebug.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exdump.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exfield.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exfldio.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exmisc.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exmutex.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exnames.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exoparg1.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exoparg2.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exoparg3.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exoparg6.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exprep.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exregion.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exresnte.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exresolv.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exresop.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exstore.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exstoren.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exstorob.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exsystem.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/executer/exutils.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exfield.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exfldio.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exmisc.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exmutex.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exnames.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exoparg1.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exoparg2.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exoparg3.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exoparg6.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exprep.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exregion.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exresnte.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exresolv.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exresop.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exstore.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exstoren.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exstorob.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exsystem.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/exutils.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/hardware/hwacpi.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/hardware/hwgpe.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/hardware/hwregs.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/hardware/hwsleep.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/hardware/hwtimer.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/hardware/hwvalid.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/hardware/hwxface.c#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/hwacpi.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/hwgpe.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/hwregs.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/hwsleep.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/hwtimer.c#2 delete .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acapps.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/accommon.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acconfig.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acdebug.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acdisasm.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acdispat.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acevents.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acexcep.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acglobal.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/achware.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acinterp.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/aclocal.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acmacros.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acnames.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acnamesp.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acobject.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acopcode.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acoutput.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acparser.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acpi.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acpiosxf.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acpixf.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acpredef.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acresrc.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acrestyp.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/acstruct.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/actables.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/actbl.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/actbl1.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/actbl2.h#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/acpica/include/actypes.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 17 03:48:45 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 370511065670; Mon, 17 May 2010 03:48:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EFB25106564A for ; Mon, 17 May 2010 03:48:44 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DD7BC8FC0C for ; Mon, 17 May 2010 03:48:44 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4H3mijF038138 for ; Mon, 17 May 2010 03:48:44 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4H3miuY038136 for perforce@freebsd.org; Mon, 17 May 2010 03:48:44 GMT (envelope-from jona@FreeBSD.org) Date: Mon, 17 May 2010 03:48:44 GMT Message-Id: <201005170348.o4H3miuY038136@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178362 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 03:48:45 -0000 http://p4web.freebsd.org/@@178362?ac=10 Change 178362 by jona@jona-belle-freebsd8 on 2010/05/17 03:48:27 Added regression test case: fcntl(x) should fail with ENOTCAPABLE (rather than EBADF) when x does not have CAP_FCNTL Affected files ... .. //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_fcntl.c#2 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_fcntl.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_fcntl.c#1 $"); +__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_fcntl.c#2 $"); #include #include @@ -101,6 +101,13 @@ else if(fcntl(files[i].fd, F_GETFL, 0) == -1) warnx("Error calling fcntl('%s', F_GETFL)", files[i].name); + + else if (fcntl(cap_new(files[i].fd, 0), F_GETFL, 0) == -1) + { + if(errno != ENOTCAPABLE) + warn("fcntl('%s', F_GETFL) failed, but errno" + " != ENOTCAPABLE", files[i].name); + } } } From owner-p4-projects@FreeBSD.ORG Mon May 17 04:19:20 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23B651065679; Mon, 17 May 2010 04:19:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D344C1065677 for ; Mon, 17 May 2010 04:19:19 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BF0AA8FC0C for ; Mon, 17 May 2010 04:19:19 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4H4JJCU041300 for ; Mon, 17 May 2010 04:19:19 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4H4JI7m041298 for perforce@freebsd.org; Mon, 17 May 2010 04:19:18 GMT (envelope-from thompsa@freebsd.org) Date: Mon, 17 May 2010 04:19:18 GMT Message-Id: <201005170419.o4H4JI7m041298@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178365 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 04:19:20 -0000 http://p4web.freebsd.org/@@178365?ac=10 Change 178365 by thompsa@thompsa_pea on 2010/05/17 04:19:10 IFC @178363 Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb.h#16 integrate .. //depot/projects/usb/src/lib/libusb/libusb10.c#25 integrate .. //depot/projects/usb/src/lib/libusb/libusb10_desc.c#14 integrate .. //depot/projects/usb/src/lib/libusb/libusb10_io.c#15 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_compat01.c#11 integrate .. //depot/projects/usb/src/lib/libusbhid/data.c#7 integrate .. //depot/projects/usb/src/lib/libusbhid/usbhid.h#8 integrate .. //depot/projects/usb/src/sys/amd64/amd64/apic_vector.S#6 integrate .. //depot/projects/usb/src/sys/amd64/amd64/exception.S#15 integrate .. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#22 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#39 integrate .. //depot/projects/usb/src/sys/amd64/amd64/trap.c#24 integrate .. //depot/projects/usb/src/sys/amd64/include/specialreg.h#18 integrate .. //depot/projects/usb/src/sys/amd64/include/xen/xenfunc.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/xen/xenvar.h#2 integrate .. //depot/projects/usb/src/sys/arm/arm/identcpu.c#12 integrate .. //depot/projects/usb/src/sys/arm/arm/pmap.c#26 integrate .. //depot/projects/usb/src/sys/arm/include/disassem.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/md_var.h#6 integrate .. //depot/projects/usb/src/sys/boot/common/module.c#5 integrate .. //depot/projects/usb/src/sys/boot/forth/loader.conf.5#4 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_sg.c#11 integrate .. //depot/projects/usb/src/sys/cddl/boot/zfs/zfsimpl.h#7 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#3 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/dnlc.h#3 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#7 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#7 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#9 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#14 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#19 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#6 integrate .. //depot/projects/usb/src/sys/conf/files#96 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#28 integrate .. //depot/projects/usb/src/sys/conf/options#49 integrate .. //depot/projects/usb/src/sys/contrib/dev/run/rt2870.fw.uu#3 integrate .. //depot/projects/usb/src/sys/ddb/db_output.c#6 integrate .. //depot/projects/usb/src/sys/ddb/ddb.h#6 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-serverworks.c#7 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#28 integrate .. //depot/projects/usb/src/sys/dev/bwn/if_bwn.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_adapter.h#17 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#30 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#24 integrate .. //depot/projects/usb/src/sys/dev/cxgb/sys/mvec.h#8 integrate .. //depot/projects/usb/src/sys/dev/cxgb/sys/uipc_mvec.c#9 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.c#20 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#20 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_lem.c#2 integrate .. //depot/projects/usb/src/sys/dev/esp/esp_sbus.c#9 integrate .. //depot/projects/usb/src/sys/dev/fxp/if_fxp.c#18 integrate .. //depot/projects/usb/src/sys/dev/fxp/if_fxpreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/fxp/if_fxpvar.h#5 integrate .. //depot/projects/usb/src/sys/dev/ipw/if_ipw.c#17 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.c#16 integrate .. //depot/projects/usb/src/sys/dev/isp/ispvar.h#9 integrate .. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#19 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.c#19 integrate .. //depot/projects/usb/src/sys/dev/mvs/mvs.c#2 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#24 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_if.m#3 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_standard.c#6 integrate .. //depot/projects/usb/src/sys/dev/ofw/openfirm.c#8 integrate .. //depot/projects/usb/src/sys/dev/ofw/openfirm.h#7 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#35 integrate .. //depot/projects/usb/src/sys/dev/re/if_re.c#28 integrate .. //depot/projects/usb/src/sys/dev/sge/if_sge.c#3 integrate .. //depot/projects/usb/src/sys/dev/sge/if_sgereg.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#52 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#42 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#29 integrate .. //depot/projects/usb/src/sys/dev/usb/net/uhso.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#31 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#32 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#28 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#45 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#68 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#36 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#44 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#45 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_request.c#32 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#122 integrate .. //depot/projects/usb/src/sys/dev/usb/usbhid.h#14 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#27 integrate .. //depot/projects/usb/src/sys/dev/xen/netfront/netfront.c#15 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_devs.c#15 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_int.h#7 integrate .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_readwrite.c#2 integrate .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vnops.c#15 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonkrpc.c#6 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfskpiport.h#2 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfsport.h#12 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clbio.c#11 integrate .. //depot/projects/usb/src/sys/fs/nullfs/null_vnops.c#16 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_io.c#9 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_ctl.c#4 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_io.c#13 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.c#14 integrate .. //depot/projects/usb/src/sys/geom/geom.h#11 integrate .. //depot/projects/usb/src/sys/geom/geom_subr.c#17 integrate .. //depot/projects/usb/src/sys/geom/multipath/g_multipath.c#6 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_apm.c#13 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum.c#10 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum.h#6 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_events.c#4 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_var.h#5 integrate .. //depot/projects/usb/src/sys/geom/zero/g_zero.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#11 integrate .. //depot/projects/usb/src/sys/i386/i386/geode.c#5 integrate .. //depot/projects/usb/src/sys/i386/i386/identcpu.c#19 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#35 integrate .. //depot/projects/usb/src/sys/i386/include/specialreg.h#18 integrate .. //depot/projects/usb/src/sys/i386/include/xen/xenfunc.h#4 integrate .. //depot/projects/usb/src/sys/i386/include/xen/xenvar.h#3 integrate .. //depot/projects/usb/src/sys/i386/xen/pmap.c#23 integrate .. //depot/projects/usb/src/sys/ia64/ia64/pmap.c#21 integrate .. //depot/projects/usb/src/sys/kern/kern_conf.c#22 integrate .. //depot/projects/usb/src/sys/kern/kern_exec.c#26 integrate .. //depot/projects/usb/src/sys/kern/kern_mutex.c#19 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#29 integrate .. //depot/projects/usb/src/sys/kern/sched_ule.c#25 integrate .. //depot/projects/usb/src/sys/kern/subr_bufring.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_pcpu.c#8 integrate .. //depot/projects/usb/src/sys/kern/subr_smp.c#15 integrate .. //depot/projects/usb/src/sys/kern/subr_uio.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_witness.c#24 integrate .. //depot/projects/usb/src/sys/kern/sys_pipe.c#17 integrate .. //depot/projects/usb/src/sys/kern/uipc_cow.c#5 integrate .. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#27 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#28 integrate .. //depot/projects/usb/src/sys/kern/vfs_default.c#19 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#33 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#27 integrate .. //depot/projects/usb/src/sys/kern/vnode_if.src#17 integrate .. //depot/projects/usb/src/sys/mips/adm5120/if_admsw.c#10 integrate .. //depot/projects/usb/src/sys/mips/conf/XLR#5 integrate .. //depot/projects/usb/src/sys/mips/include/locore.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/param.h#8 integrate .. //depot/projects/usb/src/sys/mips/include/pmap.h#10 integrate .. //depot/projects/usb/src/sys/mips/include/smp.h#6 integrate .. //depot/projects/usb/src/sys/mips/mips/cpu.c#5 integrate .. //depot/projects/usb/src/sys/mips/mips/elf_machdep.c#11 integrate .. //depot/projects/usb/src/sys/mips/mips/machdep.c#13 integrate .. //depot/projects/usb/src/sys/mips/mips/mp_machdep.c#8 integrate .. //depot/projects/usb/src/sys/mips/mips/mpboot.S#3 integrate .. //depot/projects/usb/src/sys/mips/mips/pmap.c#20 integrate .. //depot/projects/usb/src/sys/mips/rmi/dev/xlr/rge.c#4 integrate .. //depot/projects/usb/src/sys/mips/rmi/files.xlr#3 integrate .. //depot/projects/usb/src/sys/mips/rmi/interrupt.h#3 integrate .. //depot/projects/usb/src/sys/mips/rmi/intr_machdep.c#4 integrate .. //depot/projects/usb/src/sys/mips/rmi/iodi.c#3 integrate .. //depot/projects/usb/src/sys/mips/rmi/on_chip.c#3 integrate .. //depot/projects/usb/src/sys/mips/rmi/pic.h#4 integrate .. //depot/projects/usb/src/sys/mips/rmi/xlr_machdep.c#4 integrate .. //depot/projects/usb/src/sys/mips/rmi/xlr_pci.c#3 integrate .. //depot/projects/usb/src/sys/mips/rmi/xlrconfig.h#2 integrate .. //depot/projects/usb/src/sys/modules/Makefile#52 integrate .. //depot/projects/usb/src/sys/modules/cas/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/mvs/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/zfs/Makefile#13 integrate .. //depot/projects/usb/src/sys/net/bpf_zerocopy.c#6 integrate .. //depot/projects/usb/src/sys/net/flowtable.c#18 integrate .. //depot/projects/usb/src/sys/net/flowtable.h#10 integrate .. //depot/projects/usb/src/sys/net/vnet.c#8 integrate .. //depot/projects/usb/src/sys/netgraph/ng_base.c#24 integrate .. //depot/projects/usb/src/sys/netgraph/ng_bridge.c#8 integrate .. //depot/projects/usb/src/sys/netgraph/ng_bridge.h#2 integrate .. //depot/projects/usb/src/sys/netgraph/ng_hub.c#2 integrate .. //depot/projects/usb/src/sys/netgraph/ng_hub.h#2 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ksocket.c#9 integrate .. //depot/projects/usb/src/sys/netinet/sctp_bsd_addr.c#14 integrate .. //depot/projects/usb/src/sys/netinet/sctp_bsd_addr.h#8 integrate .. //depot/projects/usb/src/sys/netinet/sctp_constants.h#19 integrate .. //depot/projects/usb/src/sys/netinet/sctp_indata.c#27 integrate .. //depot/projects/usb/src/sys/netinet/sctp_input.c#25 integrate .. //depot/projects/usb/src/sys/netinet/sctp_lock_bsd.h#9 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.c#31 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#25 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.h#16 integrate .. //depot/projects/usb/src/sys/netinet/sctp_structs.h#17 integrate .. //depot/projects/usb/src/sys/netinet/sctp_timer.c#16 integrate .. //depot/projects/usb/src/sys/netinet/sctp_usrreq.c#22 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#32 integrate .. //depot/projects/usb/src/sys/netinet6/in6_proto.c#23 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_input.c#34 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_output.c#23 integrate .. //depot/projects/usb/src/sys/netinet6/udp6_usrreq.c#24 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_bio.c#22 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea.c#13 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea64.c#13 integrate .. //depot/projects/usb/src/sys/powerpc/aim/ofw_machdep.c#8 integrate .. //depot/projects/usb/src/sys/powerpc/booke/pmap.c#20 integrate .. //depot/projects/usb/src/sys/powerpc/cpufreq/pcr.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/include/intr_machdep.h#6 integrate .. //depot/projects/usb/src/sys/powerpc/ofw/ofw_pcibus.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/ofw/ofw_real.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/ata_kauai.c#5 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/cpcht.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/cpchtvar.h#2 delete .. //depot/projects/usb/src/sys/powerpc/powermac/smu.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/uninorth.c#10 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/uninorthpci.c#1 branch .. //depot/projects/usb/src/sys/powerpc/powermac/uninorthvar.h#5 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/openpic.c#9 integrate .. //depot/projects/usb/src/sys/sparc64/pci/schizo.c#9 integrate .. //depot/projects/usb/src/sys/sparc64/pci/schizoreg.h#3 integrate .. //depot/projects/usb/src/sys/sparc64/pci/schizovar.h#5 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/pmap.c#18 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/pmap.c#12 integrate .. //depot/projects/usb/src/sys/sys/buf_ring.h#5 integrate .. //depot/projects/usb/src/sys/sys/conf.h#23 integrate .. //depot/projects/usb/src/sys/sys/eventhandler.h#11 integrate .. //depot/projects/usb/src/sys/sys/lock.h#12 integrate .. //depot/projects/usb/src/sys/sys/mbuf.h#16 integrate .. //depot/projects/usb/src/sys/sys/param.h#53 integrate .. //depot/projects/usb/src/sys/sys/vmmeter.h#7 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#30 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_snapshot.c#16 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_softdep.c#17 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vnops.c#16 integrate .. //depot/projects/usb/src/sys/ufs/ufs/quota.h#5 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_quota.c#8 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_vfsops.c#7 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufsmount.h#5 integrate .. //depot/projects/usb/src/sys/vm/device_pager.c#14 integrate .. //depot/projects/usb/src/sys/vm/sg_pager.c#4 integrate .. //depot/projects/usb/src/sys/vm/swap_pager.c#21 integrate .. //depot/projects/usb/src/sys/vm/vm_contig.c#17 integrate .. //depot/projects/usb/src/sys/vm/vm_fault.c#23 integrate .. //depot/projects/usb/src/sys/vm/vm_glue.c#14 integrate .. //depot/projects/usb/src/sys/vm/vm_object.c#25 integrate .. //depot/projects/usb/src/sys/vm/vm_page.c#24 integrate .. //depot/projects/usb/src/sys/vm/vm_page.h#15 integrate .. //depot/projects/usb/src/sys/vm/vm_pageout.c#22 integrate .. //depot/projects/usb/src/sys/vm/vm_pageout.h#4 integrate .. //depot/projects/usb/src/sys/vm/vnode_pager.c#22 integrate Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb.h#16 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb.h,v 1.12 2010/02/13 09:45:50 wkoszek Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb.h,v 1.13 2010/05/13 00:25:30 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb/libusb10.c#25 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.8 2010/02/13 09:45:50 wkoszek Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.9 2010/05/13 00:25:30 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * Copyright (c) 2009 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb/src/lib/libusb/libusb10_desc.c#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10_desc.c,v 1.6 2010/02/13 09:45:50 wkoszek Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10_desc.c,v 1.7 2010/05/13 00:25:30 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb/libusb10_io.c#15 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10_io.c,v 1.6 2010/02/13 09:45:50 wkoszek Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10_io.c,v 1.7 2010/05/13 00:25:30 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb/libusb20_compat01.c#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20_compat01.c,v 1.6 2010/02/13 09:45:50 wkoszek Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20_compat01.c,v 1.7 2010/05/13 00:26:30 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/lib/libusbhid/data.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libusbhid/data.c,v 1.7 2010/03/27 08:00:16 kaiw Exp $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/data.c,v 1.9 2010/05/13 02:03:00 thompsa Exp $"); #include #include ==== //depot/projects/usb/src/lib/libusbhid/usbhid.h#8 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libusbhid/usbhid.h,v 1.13 2010/03/27 08:00:16 kaiw Exp $ + * $FreeBSD: src/lib/libusbhid/usbhid.h,v 1.14 2010/05/13 02:03:00 thompsa Exp $ * */ ==== //depot/projects/usb/src/sys/amd64/amd64/apic_vector.S#6 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.113 2010/03/29 19:13:34 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.115 2010/05/13 09:59:10 kib Exp $ */ /* @@ -81,7 +81,7 @@ /* No EOI cycle used here */ - iretq + jmp doreti_iret ISR_VEC(1, apic_isr1) ISR_VEC(2, apic_isr2) @@ -135,7 +135,7 @@ incl smp_tlb_wait popq %rax - iretq + jmp doreti_iret /* * Single page TLB shootdown @@ -155,7 +155,7 @@ incl smp_tlb_wait popq %rax - iretq + jmp doreti_iret /* * Page range TLB shootdown. @@ -181,7 +181,7 @@ popq %rdx popq %rax - iretq + jmp doreti_iret /* * Invalidate cache. @@ -200,7 +200,7 @@ incl smp_tlb_wait popq %rax - iretq + jmp doreti_iret /* * Handler for IPIs sent via the per-cpu IPI bitmap. @@ -247,7 +247,7 @@ call cpususpend_handler POP_FRAME - iretq + jmp doreti_iret /* * Executed by a CPU when it receives a RENDEZVOUS IPI from another CPU. ==== //depot/projects/usb/src/sys/amd64/amd64/exception.S#15 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.145 2010/05/03 14:30:49 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.146 2010/05/12 10:29:35 kib Exp $ */ #include "opt_atpic.h" @@ -553,7 +553,7 @@ movq TF_R14(%rsp),%r14 movq TF_R15(%rsp),%r15 addq $TF_RIP,%rsp - iretq + jmp doreti_iret ENTRY(fork_trampoline) movq %r12,%rdi /* function */ ==== //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#22 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.180 2010/03/11 14:17:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.181 2010/05/05 21:07:47 kib Exp $"); #include "opt_cpu.h" @@ -240,7 +240,7 @@ printf("\n Features2=0x%b", cpu_feature2, "\020" "\001SSE3" /* SSE3 */ - "\002" + "\002PCLMULQDQ" /* Carry-Less Mul Quadword */ "\003DTES64" /* 64-bit Debug Trace */ "\004MON" /* MONITOR/MWAIT Instructions */ "\005DS_CPL" /* CPL Qualified Debug Store */ @@ -264,7 +264,7 @@ "\027MOVBE" "\030POPCNT" "\031" - "\032" + "\032AESNI" /* AES Crypto*/ "\033XSAVE" "\034OSXSAVE" "\035" ==== //depot/projects/usb/src/sys/amd64/amd64/pmap.c#39 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.694 2010/04/30 00:46:43 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.697 2010/05/16 23:45:10 alc Exp $"); /* * Manages physical address maps. @@ -2796,7 +2796,7 @@ KASSERT((m->flags & PG_FICTITIOUS) == 0, ("pmap_remove_all: page %p is fictitious", m)); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock_queues(); pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); while ((pv = TAILQ_FIRST(&pvh->pv_list)) != NULL) { pmap = PV_PMAP(pv); @@ -2834,6 +2834,7 @@ PMAP_UNLOCK(pmap); } vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_unlock_queues(); } /* @@ -3138,7 +3139,10 @@ va = trunc_page(va); KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig")); KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS, - ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", va)); + ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", + va)); + KASSERT((m->oflags & VPO_BUSY) != 0, + ("pmap_enter: page %p is not busy", m)); mpte = NULL; @@ -3414,8 +3418,10 @@ pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) { + vm_page_lock_queues(); PMAP_LOCK(pmap); - (void) pmap_enter_quick_locked(pmap, va, m, prot, NULL); + (void)pmap_enter_quick_locked(pmap, va, m, prot, NULL); + vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } @@ -3926,8 +3932,11 @@ count = 0; if ((m->flags & PG_FICTITIOUS) != 0) return (count); + vm_page_lock_queues(); count = pmap_pvh_wired_mappings(&m->md, count); - return (pmap_pvh_wired_mappings(pa_to_pvh(VM_PAGE_TO_PHYS(m)), count)); + count = pmap_pvh_wired_mappings(pa_to_pvh(VM_PAGE_TO_PHYS(m)), count); + vm_page_unlock_queues(); + return (count); } /* @@ -3961,16 +3970,15 @@ boolean_t pmap_page_is_mapped(vm_page_t m) { - struct md_page *pvh; + boolean_t rv; if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0) return (FALSE); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); - if (TAILQ_EMPTY(&m->md.pv_list)) { - pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); - return (!TAILQ_EMPTY(&pvh->pv_list)); - } else - return (TRUE); + vm_page_lock_queues(); + rv = !TAILQ_EMPTY(&m->md.pv_list) || + !TAILQ_EMPTY(&pa_to_pvh(VM_PAGE_TO_PHYS(m))->pv_list); + vm_page_unlock_queues(); + return (rv); } /* @@ -4235,10 +4243,19 @@ pt_entry_t oldpte, *pte; vm_offset_t va; - if ((m->flags & PG_FICTITIOUS) != 0 || + KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + ("pmap_remove_write: page %p is not managed", m)); + + /* + * If the page is not VPO_BUSY, then PG_WRITEABLE cannot be set by + * another thread while the object is locked. Thus, if PG_WRITEABLE + * is clear, no page table entries need updating. + */ + VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); + if ((m->oflags & VPO_BUSY) == 0 && (m->flags & PG_WRITEABLE) == 0) return; - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock_queues(); pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); TAILQ_FOREACH_SAFE(pv, &pvh->pv_list, pv_list, next_pv) { pmap = PV_PMAP(pv); @@ -4269,6 +4286,7 @@ PMAP_UNLOCK(pmap); } vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_unlock_queues(); } /* ==== //depot/projects/usb/src/sys/amd64/amd64/trap.c#24 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.342 2010/05/01 13:15:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.343 2010/05/12 10:29:06 kib Exp $"); /* * AMD64 Trap and System call handling @@ -488,22 +488,18 @@ } if (frame->tf_rip == (long)ld_ds) { frame->tf_rip = (long)ds_load_fault; - frame->tf_ds = _udatasel; goto out; } if (frame->tf_rip == (long)ld_es) { frame->tf_rip = (long)es_load_fault; - frame->tf_es = _udatasel; goto out; } if (frame->tf_rip == (long)ld_fs) { frame->tf_rip = (long)fs_load_fault; - frame->tf_fs = _ufssel; goto out; } if (frame->tf_rip == (long)ld_gs) { frame->tf_rip = (long)gs_load_fault; - frame->tf_gs = _ugssel; goto out; } if (frame->tf_rip == (long)ld_gsbase) { ==== //depot/projects/usb/src/sys/amd64/include/specialreg.h#18 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.61 2010/03/22 15:08:26 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.62 2010/05/05 21:07:47 kib Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -113,6 +113,7 @@ #define CPUID_PBE 0x80000000 #define CPUID2_SSE3 0x00000001 +#define CPUID2_PCLMULQDQ 0x00000002 #define CPUID2_DTES64 0x00000004 #define CPUID2_MON 0x00000008 #define CPUID2_DS_CPL 0x00000010 @@ -131,6 +132,7 @@ #define CPUID2_X2APIC 0x00200000 #define CPUID2_MOVBE 0x00400000 #define CPUID2_POPCNT 0x00800000 +#define CPUID2_AESNI 0x02000000 /* * Important bits in the AMD extended cpuid flags ==== //depot/projects/usb/src/sys/amd64/include/xen/xenfunc.h#2 (text+ko) ==== @@ -1,6 +1,5 @@ -/* - * - * Copyright (c) 2004,2005 Kip Macy +/*- + * Copyright (c) 2004, 2005 Kip Macy * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,22 +10,22 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (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/sys/amd64/include/xen/xenfunc.h,v 1.2 2010/05/05 20:39:02 joel Exp $ */ - #ifndef _XEN_XENFUNC_H_ #define _XEN_XENFUNC_H_ ==== //depot/projects/usb/src/sys/amd64/include/xen/xenvar.h#2 (text+ko) ==== @@ -1,31 +1,29 @@ -/* +/*- * Copyright (c) 2008 Kip Macy * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (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/sys/amd64/include/xen/xenvar.h,v 1.1 2009/03/11 15:30:12 dfr Exp $ + * $FreeBSD: src/sys/amd64/include/xen/xenvar.h,v 1.2 2010/05/05 20:39:02 joel Exp $ */ #ifndef XENVAR_H_ #define XENVAR_H_ ==== //depot/projects/usb/src/sys/arm/arm/identcpu.c#12 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.19 2010/05/04 10:14:05 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.20 2010/05/12 05:50:56 kevlo Exp $"); #include #include #include @@ -220,7 +220,7 @@ generic_steppings }, { CPU_ID_ARM966ESR1, CPU_CLASS_ARM9ES, "ARM966E-S", generic_steppings }, - { CPU_ID_FA526, CPU_CLASS_ARM9, "FA526", + { CPU_ID_FA526, CPU_CLASS_ARM9TDMI, "FA526", generic_steppings }, { CPU_ID_FA626TE, CPU_CLASS_ARM9ES, "FA626TE", generic_steppings }, @@ -322,7 +322,6 @@ { "ARM7", "CPU_ARM7" }, /* CPU_CLASS_ARM7 */ { "ARM7TDMI", "CPU_ARM7TDMI" }, /* CPU_CLASS_ARM7TDMI */ { "ARM8", "CPU_ARM8" }, /* CPU_CLASS_ARM8 */ - { "ARM9", "CPU_ARM9" }, /* CPU_CLASS_ARM9 */ { "ARM9TDMI", "CPU_ARM9TDMI" }, /* CPU_CLASS_ARM9TDMI */ { "ARM9E-S", "CPU_ARM9E" }, /* CPU_CLASS_ARM9ES */ { "ARM9EJ-S", "CPU_ARM9E" }, /* CPU_CLASS_ARM9EJS */ ==== //depot/projects/usb/src/sys/arm/arm/pmap.c#26 (text+ko) ==== @@ -140,7 +140,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.121 2010/04/30 00:46:43 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.123 2010/05/16 23:45:10 alc Exp $"); #include #include #include @@ -3118,18 +3118,11 @@ pmap_t curpm; int flags = 0; -#if defined(PMAP_DEBUG) - /* - * XXX This makes pmap_remove_all() illegal for non-managed pages! - */ - if (m->flags & PG_FICTITIOUS) { - panic("pmap_remove_all: illegal for unmanaged page, va: 0x%x", VM_PAGE_TO_PHYS(m)); - } -#endif - + KASSERT((m->flags & PG_FICTITIOUS) == 0, + ("pmap_remove_all: page %p is fictitious", m)); if (TAILQ_EMPTY(&m->md.pv_list)) return; - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock_queues(); pmap_remove_write(m); curpm = vmspace_pmap(curproc->p_vmspace); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { @@ -3180,6 +3173,7 @@ pmap_tlb_flushD(curpm); } vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_unlock_queues(); } @@ -3324,6 +3318,8 @@ u_int oflags; vm_paddr_t pa; + KASSERT((m->oflags & VPO_BUSY) != 0 || (flags & M_NOWAIT) != 0, + ("pmap_enter_locked: page %p is not busy", m)); PMAP_ASSERT_LOCKED(pmap); mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (va == vector_page) { @@ -3615,9 +3611,11 @@ pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) { + vm_page_lock_queues(); PMAP_LOCK(pmap); pmap_enter_locked(pmap, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE), FALSE, M_NOWAIT); + vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } @@ -4450,10 +4448,11 @@ count = 0; if ((m->flags & PG_FICTITIOUS) != 0) return (count); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock_queues(); TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) if ((pv->pv_flags & PVF_WIRED) != 0) count++; + vm_page_unlock_queues(); return (count); } @@ -4530,8 +4529,21 @@ pmap_remove_write(vm_page_t m) { - if (m->flags & PG_WRITEABLE) + KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + ("pmap_remove_write: page %p is not managed", m)); + + /* + * If the page is not VPO_BUSY, then PG_WRITEABLE cannot be set by + * another thread while the object is locked. Thus, if PG_WRITEABLE + * is clear, no page table entries need updating. + */ + VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); + if ((m->oflags & VPO_BUSY) != 0 || + (m->flags & PG_WRITEABLE) != 0) { + vm_page_lock_queues(); pmap_clearbit(m, PVF_WRITE); + vm_page_unlock_queues(); + } } ==== //depot/projects/usb/src/sys/arm/include/disassem.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * * Define the interface structure required by the disassembler. * - * $FreeBSD: src/sys/arm/include/disassem.h,v 1.2 2005/01/05 21:58:48 imp Exp $ + * $FreeBSD: src/sys/arm/include/disassem.h,v 1.3 2010/05/14 00:00:19 cognet Exp $ */ #ifndef _MACHINE_DISASSEM_H_ @@ -43,7 +43,7 @@ typedef struct { u_int (*di_readword)(u_int); void (*di_printaddr)(u_int); - void (*di_printf)(const char *, ...) __printflike(1, 2); + int (*di_printf)(const char *, ...) __printflike(1, 2); } disasm_interface_t; /* Prototypes for callable functions */ ==== //depot/projects/usb/src/sys/arm/include/md_var.h#6 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/md_var.h,v 1.40 2001/07/12 - * $FreeBSD: src/sys/arm/include/md_var.h,v 1.7 2010/02/20 14:54:11 kevlo Exp $ + * $FreeBSD: src/sys/arm/include/md_var.h,v 1.8 2010/05/12 05:50:56 kevlo Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -57,7 +57,6 @@ CPU_CLASS_ARM7, CPU_CLASS_ARM7TDMI, CPU_CLASS_ARM8, - CPU_CLASS_ARM9, CPU_CLASS_ARM9TDMI, CPU_CLASS_ARM9ES, CPU_CLASS_ARM9EJS, ==== //depot/projects/usb/src/sys/boot/common/module.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.29 2009/12/31 12:17:38 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.30 2010/05/10 18:23:00 imp Exp $"); /* * file/module function dispatcher, support, etc. @@ -295,7 +295,8 @@ } static int -file_load_dependencies(struct preloaded_file *base_file) { +file_load_dependencies(struct preloaded_file *base_file) +{ struct file_metadata *md; struct preloaded_file *fp; struct mod_depend *verinfo; ==== //depot/projects/usb/src/sys/boot/forth/loader.conf.5#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.29 2009/11/27 03:55:42 sobomax Exp $ +.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.30 2010/05/13 12:07:55 uqs Exp $ .Dd January 16, 2008 .Dt LOADER.CONF 5 .Os @@ -243,6 +243,14 @@ .Xr boot 8 , .Xr loader 8 , .Xr loader.4th 8 +.Sh HISTORY +The file +.Nm +first appeared in +.Fx 3.2 . +.Sh AUTHORS +This manual page was written by +.An Daniel C. Sobral Aq dcs@FreeBSD.org . .Sh BUGS The .Xr loader 8 @@ -253,11 +261,3 @@ .Dq Va hw.ata.ata_dma Ns "=0" ) should precede any experimental additions to .Nm . -.Sh HISTORY -The file -.Nm -first appeared in -.Fx 3.2 . -.Sh AUTHORS -This manual page was written by -.An Daniel C. Sobral Aq dcs@FreeBSD.org . ==== //depot/projects/usb/src/sys/cam/scsi/scsi_sg.c#11 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.17 2010/03/17 18:53:58 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.19 2010/05/11 22:51:13 mjacob Exp $"); #include #include @@ -303,7 +303,14 @@ softc->dev = make_dev(&sg_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); - (void)make_dev_alias(softc->dev, "sg%c", 'a' + periph->unit_number); + if (periph->unit_number < 26) { + (void)make_dev_alias(softc->dev, "sg%c", + periph->unit_number + 'a'); + } else { + (void)make_dev_alias(softc->dev, "sg%c%c", + ((periph->unit_number / 26) - 1) + 'a', + (periph->unit_number % 26) + 'a'); + } cam_periph_lock(periph); softc->dev->si_drv1 = periph; ==== //depot/projects/usb/src/sys/cddl/boot/zfs/zfsimpl.h#7 (text+ko) ==== @@ -66,7 +66,7 @@ #define P2ROUNDUP(x, align) (-(-(x) & -(align))) #define P2END(x, align) (-(~(x) & -(align))) #define P2PHASEUP(x, align, phase) ((phase) - (((phase) - (x)) & -(align))) -#define P2CROSS(x, y, align) (((x) ^ (y)) > (align) - 1) +#define P2BOUNDARY(off, len, align) (((off) ^ ((off) + (len) - 1)) > (align) - 1) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 17 04:26:29 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CB9B1065675; Mon, 17 May 2010 04:26:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AC4E3106566B for ; Mon, 17 May 2010 04:26:28 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 982318FC16 for ; Mon, 17 May 2010 04:26:28 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4H4QS1H041861 for ; Mon, 17 May 2010 04:26:28 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4H4QRjx041857 for perforce@freebsd.org; Mon, 17 May 2010 04:26:27 GMT (envelope-from thompsa@freebsd.org) Date: Mon, 17 May 2010 04:26:27 GMT Message-Id: <201005170426.o4H4QRjx041857@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 04:26:29 -0000 http://p4web.freebsd.org/@@178366?ac=10 Change 178366 by thompsa@thompsa_pea on 2010/05/17 04:25:44 IFC @178363 Affected files ... .. //depot/projects/usb_buf/src/lib/libusb/libusb.h#2 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb10.c#2 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb10_desc.c#2 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb10_io.c#2 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb20_compat01.c#3 integrate .. //depot/projects/usb_buf/src/lib/libusbhid/data.c#3 integrate .. //depot/projects/usb_buf/src/lib/libusbhid/usbhid.h#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/xen/xenfunc.h#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/include/xen/xenvar.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/usb_buf/src/sys/arm/include/disassem.h#2 integrate .. //depot/projects/usb_buf/src/sys/arm/include/md_var.h#3 integrate .. //depot/projects/usb_buf/src/sys/boot/common/module.c#3 integrate .. //depot/projects/usb_buf/src/sys/boot/forth/loader.conf.5#3 integrate .. //depot/projects/usb_buf/src/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/boot/zfs/zfsimpl.h#4 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/usb_buf/src/sys/conf/files#8 integrate .. //depot/projects/usb_buf/src/sys/conf/files.powerpc#6 integrate .. //depot/projects/usb_buf/src/sys/conf/options#6 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/run/rt2870.fw.uu#2 integrate .. //depot/projects/usb_buf/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/usb_buf/src/sys/ddb/ddb.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/ata/chipsets/ata-serverworks.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/bwn/if_bwn.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/cxgb/sys/mvec.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/e1000/if_em.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/e1000/if_igb.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/e1000/if_lem.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/fxp/if_fxpvar.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/ipw/if_ipw.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/iwn/if_iwn.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/ixgbe/ixgbe.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/mvs/mvs.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/ofw/ofw_if.m#3 integrate .. //depot/projects/usb_buf/src/sys/dev/ofw/ofw_standard.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/ofw/openfirm.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/pci/pci.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/re/if_re.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/sge/if_sge.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/sge/if_sgereg.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#14 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/usb_controller.c#10 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/input/ums.c#10 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/uhso.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/quirk/usb_quirk.c#6 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/u3g.c#10 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uftdi.c#10 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dev.c#11 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.c#15 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.h#10 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#16 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hid.c#9 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.c#14 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.c#15 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usbhid.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rum.c#13 integrate .. //depot/projects/usb_buf/src/sys/dev/xen/netfront/netfront.c#5 integrate .. //depot/projects/usb_buf/src/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/devfs/devfs_int.h#3 integrate .. //depot/projects/usb_buf/src/sys/fs/ext2fs/ext2_readwrite.c#2 integrate .. //depot/projects/usb_buf/src/sys/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/usb_buf/src/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/nfs/nfs_commonkrpc.c#5 integrate .. //depot/projects/usb_buf/src/sys/fs/nfs/nfskpiport.h#2 integrate .. //depot/projects/usb_buf/src/sys/fs/nfs/nfsport.h#6 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clbio.c#6 integrate .. //depot/projects/usb_buf/src/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/usb_buf/src/sys/fs/nwfs/nwfs_io.c#4 integrate .. //depot/projects/usb_buf/src/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/usb_buf/src/sys/fs/smbfs/smbfs_io.c#5 integrate .. //depot/projects/usb_buf/src/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/usb_buf/src/sys/geom/geom.h#3 integrate .. //depot/projects/usb_buf/src/sys/geom/geom_subr.c#4 integrate .. //depot/projects/usb_buf/src/sys/geom/multipath/g_multipath.c#3 integrate .. //depot/projects/usb_buf/src/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/usb_buf/src/sys/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/usb_buf/src/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/usb_buf/src/sys/geom/vinum/geom_vinum_events.c#3 integrate .. //depot/projects/usb_buf/src/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/usb_buf/src/sys/geom/zero/g_zero.c#2 integrate .. //depot/projects/usb_buf/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate .. //depot/projects/usb_buf/src/sys/i386/i386/geode.c#2 integrate .. //depot/projects/usb_buf/src/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/usb_buf/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/usb_buf/src/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/usb_buf/src/sys/i386/include/xen/xenfunc.h#2 integrate .. //depot/projects/usb_buf/src/sys/i386/include/xen/xenvar.h#2 integrate .. //depot/projects/usb_buf/src/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/usb_buf/src/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_conf.c#5 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_mutex.c#6 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_proc.c#5 integrate .. //depot/projects/usb_buf/src/sys/kern/sched_ule.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/subr_bufring.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/subr_pcpu.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/subr_smp.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/subr_uio.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/subr_witness.c#4 integrate .. //depot/projects/usb_buf/src/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/uipc_cow.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_default.c#4 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/vnode_if.src#4 integrate .. //depot/projects/usb_buf/src/sys/mips/adm5120/if_admsw.c#3 integrate .. //depot/projects/usb_buf/src/sys/mips/conf/XLR#2 integrate .. //depot/projects/usb_buf/src/sys/mips/include/locore.h#3 integrate .. //depot/projects/usb_buf/src/sys/mips/include/param.h#3 integrate .. //depot/projects/usb_buf/src/sys/mips/include/pmap.h#3 integrate .. //depot/projects/usb_buf/src/sys/mips/include/smp.h#3 integrate .. //depot/projects/usb_buf/src/sys/mips/mips/cpu.c#3 integrate .. //depot/projects/usb_buf/src/sys/mips/mips/elf_machdep.c#3 integrate .. //depot/projects/usb_buf/src/sys/mips/mips/machdep.c#4 integrate .. //depot/projects/usb_buf/src/sys/mips/mips/mp_machdep.c#3 integrate .. //depot/projects/usb_buf/src/sys/mips/mips/mpboot.S#2 integrate .. //depot/projects/usb_buf/src/sys/mips/mips/pmap.c#4 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/dev/xlr/rge.c#2 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/files.xlr#2 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/interrupt.h#2 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/intr_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/iodi.c#2 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/on_chip.c#2 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/pic.h#2 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/xlr_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/xlr_pci.c#2 integrate .. //depot/projects/usb_buf/src/sys/mips/rmi/xlrconfig.h#2 integrate .. //depot/projects/usb_buf/src/sys/modules/Makefile#5 integrate .. //depot/projects/usb_buf/src/sys/modules/cas/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/modules/mvs/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/modules/zfs/Makefile#5 integrate .. //depot/projects/usb_buf/src/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/usb_buf/src/sys/net/flowtable.c#3 integrate .. //depot/projects/usb_buf/src/sys/net/flowtable.h#3 integrate .. //depot/projects/usb_buf/src/sys/net/vnet.c#2 integrate .. //depot/projects/usb_buf/src/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/usb_buf/src/sys/netgraph/ng_bridge.c#3 integrate .. //depot/projects/usb_buf/src/sys/netgraph/ng_bridge.h#2 integrate .. //depot/projects/usb_buf/src/sys/netgraph/ng_hub.c#2 integrate .. //depot/projects/usb_buf/src/sys/netgraph/ng_hub.h#2 integrate .. //depot/projects/usb_buf/src/sys/netgraph/ng_ksocket.c#4 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_bsd_addr.h#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_constants.h#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctputil.c#4 integrate .. //depot/projects/usb_buf/src/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet6/ip6_input.c#5 integrate .. //depot/projects/usb_buf/src/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/usb_buf/src/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfs_bio.c#6 integrate .. //depot/projects/usb_buf/src/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/usb_buf/src/sys/powerpc/aim/mmu_oea64.c#4 integrate .. //depot/projects/usb_buf/src/sys/powerpc/aim/ofw_machdep.c#4 integrate .. //depot/projects/usb_buf/src/sys/powerpc/booke/pmap.c#5 integrate .. //depot/projects/usb_buf/src/sys/powerpc/cpufreq/pcr.c#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/ofw/ofw_pcibus.c#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/ofw/ofw_real.c#3 integrate .. //depot/projects/usb_buf/src/sys/powerpc/powermac/ata_kauai.c#3 integrate .. //depot/projects/usb_buf/src/sys/powerpc/powermac/cpcht.c#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/powermac/cpchtvar.h#2 delete .. //depot/projects/usb_buf/src/sys/powerpc/powermac/smu.c#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/powermac/uninorth.c#3 integrate .. //depot/projects/usb_buf/src/sys/powerpc/powermac/uninorthpci.c#1 branch .. //depot/projects/usb_buf/src/sys/powerpc/powermac/uninorthvar.h#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/powerpc/openpic.c#4 integrate .. //depot/projects/usb_buf/src/sys/sparc64/pci/schizo.c#3 integrate .. //depot/projects/usb_buf/src/sys/sparc64/pci/schizoreg.h#2 integrate .. //depot/projects/usb_buf/src/sys/sparc64/pci/schizovar.h#3 integrate .. //depot/projects/usb_buf/src/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/usb_buf/src/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/usb_buf/src/sys/sys/buf_ring.h#3 integrate .. //depot/projects/usb_buf/src/sys/sys/conf.h#4 integrate .. //depot/projects/usb_buf/src/sys/sys/eventhandler.h#5 integrate .. //depot/projects/usb_buf/src/sys/sys/lock.h#4 integrate .. //depot/projects/usb_buf/src/sys/sys/mbuf.h#3 integrate .. //depot/projects/usb_buf/src/sys/sys/param.h#7 integrate .. //depot/projects/usb_buf/src/sys/sys/vmmeter.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/vnode.h#4 integrate .. //depot/projects/usb_buf/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/usb_buf/src/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/usb_buf/src/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/usb_buf/src/sys/ufs/ufs/quota.h#2 integrate .. //depot/projects/usb_buf/src/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/usb_buf/src/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/usb_buf/src/sys/ufs/ufs/ufsmount.h#3 integrate .. //depot/projects/usb_buf/src/sys/vm/device_pager.c#3 integrate .. //depot/projects/usb_buf/src/sys/vm/sg_pager.c#2 integrate .. //depot/projects/usb_buf/src/sys/vm/swap_pager.c#3 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_contig.c#4 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_fault.c#3 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_glue.c#3 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_object.c#4 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_page.c#5 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_page.h#5 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_pageout.h#2 integrate .. //depot/projects/usb_buf/src/sys/vm/vnode_pager.c#5 integrate Differences ... ==== //depot/projects/usb_buf/src/lib/libusb/libusb.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb.h,v 1.12 2010/02/13 09:45:50 wkoszek Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb.h,v 1.13 2010/05/13 00:25:30 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * ==== //depot/projects/usb_buf/src/lib/libusb/libusb10.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.8 2010/02/13 09:45:50 wkoszek Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.9 2010/05/13 00:25:30 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * Copyright (c) 2009 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb_buf/src/lib/libusb/libusb10_desc.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10_desc.c,v 1.6 2010/02/13 09:45:50 wkoszek Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10_desc.c,v 1.7 2010/05/13 00:25:30 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * ==== //depot/projects/usb_buf/src/lib/libusb/libusb10_io.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10_io.c,v 1.6 2010/02/13 09:45:50 wkoszek Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10_io.c,v 1.7 2010/05/13 00:25:30 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * ==== //depot/projects/usb_buf/src/lib/libusb/libusb20_compat01.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20_compat01.c,v 1.6 2010/02/13 09:45:50 wkoszek Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20_compat01.c,v 1.7 2010/05/13 00:26:30 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb_buf/src/lib/libusbhid/data.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libusbhid/data.c,v 1.7 2010/03/27 08:00:16 kaiw Exp $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/data.c,v 1.9 2010/05/13 02:03:00 thompsa Exp $"); #include #include ==== //depot/projects/usb_buf/src/lib/libusbhid/usbhid.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libusbhid/usbhid.h,v 1.13 2010/03/27 08:00:16 kaiw Exp $ + * $FreeBSD: src/lib/libusbhid/usbhid.h,v 1.14 2010/05/13 02:03:00 thompsa Exp $ * */ ==== //depot/projects/usb_buf/src/sys/amd64/amd64/apic_vector.S#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.113 2010/03/29 19:13:34 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.115 2010/05/13 09:59:10 kib Exp $ */ /* @@ -81,7 +81,7 @@ /* No EOI cycle used here */ - iretq + jmp doreti_iret ISR_VEC(1, apic_isr1) ISR_VEC(2, apic_isr2) @@ -135,7 +135,7 @@ incl smp_tlb_wait popq %rax - iretq + jmp doreti_iret /* * Single page TLB shootdown @@ -155,7 +155,7 @@ incl smp_tlb_wait popq %rax - iretq + jmp doreti_iret /* * Page range TLB shootdown. @@ -181,7 +181,7 @@ popq %rdx popq %rax - iretq + jmp doreti_iret /* * Invalidate cache. @@ -200,7 +200,7 @@ incl smp_tlb_wait popq %rax - iretq + jmp doreti_iret /* * Handler for IPIs sent via the per-cpu IPI bitmap. @@ -247,7 +247,7 @@ call cpususpend_handler POP_FRAME - iretq + jmp doreti_iret /* * Executed by a CPU when it receives a RENDEZVOUS IPI from another CPU. ==== //depot/projects/usb_buf/src/sys/amd64/amd64/exception.S#3 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.145 2010/05/03 14:30:49 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.146 2010/05/12 10:29:35 kib Exp $ */ #include "opt_atpic.h" @@ -553,7 +553,7 @@ movq TF_R14(%rsp),%r14 movq TF_R15(%rsp),%r15 addq $TF_RIP,%rsp - iretq + jmp doreti_iret ENTRY(fork_trampoline) movq %r12,%rdi /* function */ ==== //depot/projects/usb_buf/src/sys/amd64/amd64/identcpu.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.180 2010/03/11 14:17:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.181 2010/05/05 21:07:47 kib Exp $"); #include "opt_cpu.h" @@ -240,7 +240,7 @@ printf("\n Features2=0x%b", cpu_feature2, "\020" "\001SSE3" /* SSE3 */ - "\002" + "\002PCLMULQDQ" /* Carry-Less Mul Quadword */ "\003DTES64" /* 64-bit Debug Trace */ "\004MON" /* MONITOR/MWAIT Instructions */ "\005DS_CPL" /* CPL Qualified Debug Store */ @@ -264,7 +264,7 @@ "\027MOVBE" "\030POPCNT" "\031" - "\032" + "\032AESNI" /* AES Crypto*/ "\033XSAVE" "\034OSXSAVE" "\035" ==== //depot/projects/usb_buf/src/sys/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.694 2010/04/30 00:46:43 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.697 2010/05/16 23:45:10 alc Exp $"); /* * Manages physical address maps. @@ -2796,7 +2796,7 @@ KASSERT((m->flags & PG_FICTITIOUS) == 0, ("pmap_remove_all: page %p is fictitious", m)); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock_queues(); pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); while ((pv = TAILQ_FIRST(&pvh->pv_list)) != NULL) { pmap = PV_PMAP(pv); @@ -2834,6 +2834,7 @@ PMAP_UNLOCK(pmap); } vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_unlock_queues(); } /* @@ -3138,7 +3139,10 @@ va = trunc_page(va); KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig")); KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS, - ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", va)); + ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", + va)); + KASSERT((m->oflags & VPO_BUSY) != 0, + ("pmap_enter: page %p is not busy", m)); mpte = NULL; @@ -3414,8 +3418,10 @@ pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) { + vm_page_lock_queues(); PMAP_LOCK(pmap); - (void) pmap_enter_quick_locked(pmap, va, m, prot, NULL); + (void)pmap_enter_quick_locked(pmap, va, m, prot, NULL); + vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } @@ -3926,8 +3932,11 @@ count = 0; if ((m->flags & PG_FICTITIOUS) != 0) return (count); + vm_page_lock_queues(); count = pmap_pvh_wired_mappings(&m->md, count); - return (pmap_pvh_wired_mappings(pa_to_pvh(VM_PAGE_TO_PHYS(m)), count)); + count = pmap_pvh_wired_mappings(pa_to_pvh(VM_PAGE_TO_PHYS(m)), count); + vm_page_unlock_queues(); + return (count); } /* @@ -3961,16 +3970,15 @@ boolean_t pmap_page_is_mapped(vm_page_t m) { - struct md_page *pvh; + boolean_t rv; if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0) return (FALSE); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); - if (TAILQ_EMPTY(&m->md.pv_list)) { - pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); - return (!TAILQ_EMPTY(&pvh->pv_list)); - } else - return (TRUE); + vm_page_lock_queues(); + rv = !TAILQ_EMPTY(&m->md.pv_list) || + !TAILQ_EMPTY(&pa_to_pvh(VM_PAGE_TO_PHYS(m))->pv_list); + vm_page_unlock_queues(); + return (rv); } /* @@ -4235,10 +4243,19 @@ pt_entry_t oldpte, *pte; vm_offset_t va; - if ((m->flags & PG_FICTITIOUS) != 0 || + KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + ("pmap_remove_write: page %p is not managed", m)); + + /* + * If the page is not VPO_BUSY, then PG_WRITEABLE cannot be set by + * another thread while the object is locked. Thus, if PG_WRITEABLE + * is clear, no page table entries need updating. + */ + VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); + if ((m->oflags & VPO_BUSY) == 0 && (m->flags & PG_WRITEABLE) == 0) return; - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock_queues(); pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); TAILQ_FOREACH_SAFE(pv, &pvh->pv_list, pv_list, next_pv) { pmap = PV_PMAP(pv); @@ -4269,6 +4286,7 @@ PMAP_UNLOCK(pmap); } vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_unlock_queues(); } /* ==== //depot/projects/usb_buf/src/sys/amd64/amd64/trap.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.342 2010/05/01 13:15:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.343 2010/05/12 10:29:06 kib Exp $"); /* * AMD64 Trap and System call handling @@ -488,22 +488,18 @@ } if (frame->tf_rip == (long)ld_ds) { frame->tf_rip = (long)ds_load_fault; - frame->tf_ds = _udatasel; goto out; } if (frame->tf_rip == (long)ld_es) { frame->tf_rip = (long)es_load_fault; - frame->tf_es = _udatasel; goto out; } if (frame->tf_rip == (long)ld_fs) { frame->tf_rip = (long)fs_load_fault; - frame->tf_fs = _ufssel; goto out; } if (frame->tf_rip == (long)ld_gs) { frame->tf_rip = (long)gs_load_fault; - frame->tf_gs = _ugssel; goto out; } if (frame->tf_rip == (long)ld_gsbase) { ==== //depot/projects/usb_buf/src/sys/amd64/include/specialreg.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.61 2010/03/22 15:08:26 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.62 2010/05/05 21:07:47 kib Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -113,6 +113,7 @@ #define CPUID_PBE 0x80000000 #define CPUID2_SSE3 0x00000001 +#define CPUID2_PCLMULQDQ 0x00000002 #define CPUID2_DTES64 0x00000004 #define CPUID2_MON 0x00000008 #define CPUID2_DS_CPL 0x00000010 @@ -131,6 +132,7 @@ #define CPUID2_X2APIC 0x00200000 #define CPUID2_MOVBE 0x00400000 #define CPUID2_POPCNT 0x00800000 +#define CPUID2_AESNI 0x02000000 /* * Important bits in the AMD extended cpuid flags ==== //depot/projects/usb_buf/src/sys/amd64/include/xen/xenfunc.h#2 (text+ko) ==== @@ -1,6 +1,5 @@ -/* - * - * Copyright (c) 2004,2005 Kip Macy +/*- + * Copyright (c) 2004, 2005 Kip Macy * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,22 +10,22 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (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/sys/amd64/include/xen/xenfunc.h,v 1.2 2010/05/05 20:39:02 joel Exp $ */ - #ifndef _XEN_XENFUNC_H_ #define _XEN_XENFUNC_H_ ==== //depot/projects/usb_buf/src/sys/amd64/include/xen/xenvar.h#2 (text+ko) ==== @@ -1,31 +1,29 @@ -/* +/*- * Copyright (c) 2008 Kip Macy * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (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/sys/amd64/include/xen/xenvar.h,v 1.1 2009/03/11 15:30:12 dfr Exp $ + * $FreeBSD: src/sys/amd64/include/xen/xenvar.h,v 1.2 2010/05/05 20:39:02 joel Exp $ */ #ifndef XENVAR_H_ #define XENVAR_H_ ==== //depot/projects/usb_buf/src/sys/arm/arm/identcpu.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.19 2010/05/04 10:14:05 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.20 2010/05/12 05:50:56 kevlo Exp $"); #include #include #include @@ -220,7 +220,7 @@ generic_steppings }, { CPU_ID_ARM966ESR1, CPU_CLASS_ARM9ES, "ARM966E-S", generic_steppings }, - { CPU_ID_FA526, CPU_CLASS_ARM9, "FA526", + { CPU_ID_FA526, CPU_CLASS_ARM9TDMI, "FA526", generic_steppings }, { CPU_ID_FA626TE, CPU_CLASS_ARM9ES, "FA626TE", generic_steppings }, @@ -322,7 +322,6 @@ { "ARM7", "CPU_ARM7" }, /* CPU_CLASS_ARM7 */ { "ARM7TDMI", "CPU_ARM7TDMI" }, /* CPU_CLASS_ARM7TDMI */ { "ARM8", "CPU_ARM8" }, /* CPU_CLASS_ARM8 */ - { "ARM9", "CPU_ARM9" }, /* CPU_CLASS_ARM9 */ { "ARM9TDMI", "CPU_ARM9TDMI" }, /* CPU_CLASS_ARM9TDMI */ { "ARM9E-S", "CPU_ARM9E" }, /* CPU_CLASS_ARM9ES */ { "ARM9EJ-S", "CPU_ARM9E" }, /* CPU_CLASS_ARM9EJS */ ==== //depot/projects/usb_buf/src/sys/arm/arm/pmap.c#3 (text+ko) ==== @@ -140,7 +140,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.121 2010/04/30 00:46:43 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.123 2010/05/16 23:45:10 alc Exp $"); #include #include #include @@ -3118,18 +3118,11 @@ pmap_t curpm; int flags = 0; -#if defined(PMAP_DEBUG) - /* - * XXX This makes pmap_remove_all() illegal for non-managed pages! - */ - if (m->flags & PG_FICTITIOUS) { - panic("pmap_remove_all: illegal for unmanaged page, va: 0x%x", VM_PAGE_TO_PHYS(m)); - } -#endif - + KASSERT((m->flags & PG_FICTITIOUS) == 0, + ("pmap_remove_all: page %p is fictitious", m)); if (TAILQ_EMPTY(&m->md.pv_list)) return; - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock_queues(); pmap_remove_write(m); curpm = vmspace_pmap(curproc->p_vmspace); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { @@ -3180,6 +3173,7 @@ pmap_tlb_flushD(curpm); } vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_unlock_queues(); } @@ -3324,6 +3318,8 @@ u_int oflags; vm_paddr_t pa; + KASSERT((m->oflags & VPO_BUSY) != 0 || (flags & M_NOWAIT) != 0, + ("pmap_enter_locked: page %p is not busy", m)); PMAP_ASSERT_LOCKED(pmap); mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (va == vector_page) { @@ -3615,9 +3611,11 @@ pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) { + vm_page_lock_queues(); PMAP_LOCK(pmap); pmap_enter_locked(pmap, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE), FALSE, M_NOWAIT); + vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } @@ -4450,10 +4448,11 @@ count = 0; if ((m->flags & PG_FICTITIOUS) != 0) return (count); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock_queues(); TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) if ((pv->pv_flags & PVF_WIRED) != 0) count++; + vm_page_unlock_queues(); return (count); } @@ -4530,8 +4529,21 @@ pmap_remove_write(vm_page_t m) { - if (m->flags & PG_WRITEABLE) + KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + ("pmap_remove_write: page %p is not managed", m)); + + /* + * If the page is not VPO_BUSY, then PG_WRITEABLE cannot be set by + * another thread while the object is locked. Thus, if PG_WRITEABLE + * is clear, no page table entries need updating. + */ + VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); + if ((m->oflags & VPO_BUSY) != 0 || + (m->flags & PG_WRITEABLE) != 0) { + vm_page_lock_queues(); pmap_clearbit(m, PVF_WRITE); + vm_page_unlock_queues(); + } } ==== //depot/projects/usb_buf/src/sys/arm/include/disassem.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * * Define the interface structure required by the disassembler. * - * $FreeBSD: src/sys/arm/include/disassem.h,v 1.2 2005/01/05 21:58:48 imp Exp $ + * $FreeBSD: src/sys/arm/include/disassem.h,v 1.3 2010/05/14 00:00:19 cognet Exp $ */ #ifndef _MACHINE_DISASSEM_H_ @@ -43,7 +43,7 @@ typedef struct { u_int (*di_readword)(u_int); void (*di_printaddr)(u_int); - void (*di_printf)(const char *, ...) __printflike(1, 2); + int (*di_printf)(const char *, ...) __printflike(1, 2); } disasm_interface_t; /* Prototypes for callable functions */ ==== //depot/projects/usb_buf/src/sys/arm/include/md_var.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/md_var.h,v 1.40 2001/07/12 - * $FreeBSD: src/sys/arm/include/md_var.h,v 1.7 2010/02/20 14:54:11 kevlo Exp $ + * $FreeBSD: src/sys/arm/include/md_var.h,v 1.8 2010/05/12 05:50:56 kevlo Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -57,7 +57,6 @@ CPU_CLASS_ARM7, CPU_CLASS_ARM7TDMI, CPU_CLASS_ARM8, - CPU_CLASS_ARM9, CPU_CLASS_ARM9TDMI, CPU_CLASS_ARM9ES, CPU_CLASS_ARM9EJS, ==== //depot/projects/usb_buf/src/sys/boot/common/module.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.29 2009/12/31 12:17:38 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.30 2010/05/10 18:23:00 imp Exp $"); /* * file/module function dispatcher, support, etc. @@ -295,7 +295,8 @@ } static int -file_load_dependencies(struct preloaded_file *base_file) { +file_load_dependencies(struct preloaded_file *base_file) +{ struct file_metadata *md; struct preloaded_file *fp; struct mod_depend *verinfo; ==== //depot/projects/usb_buf/src/sys/boot/forth/loader.conf.5#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/sys/boot/forth/loader.conf.5,v 1.29 2009/11/27 03:55:42 sobomax Exp $ +.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.30 2010/05/13 12:07:55 uqs Exp $ .Dd January 16, 2008 .Dt LOADER.CONF 5 .Os @@ -243,6 +243,14 @@ .Xr boot 8 , .Xr loader 8 , .Xr loader.4th 8 +.Sh HISTORY +The file +.Nm +first appeared in +.Fx 3.2 . +.Sh AUTHORS +This manual page was written by +.An Daniel C. Sobral Aq dcs@FreeBSD.org . .Sh BUGS The .Xr loader 8 @@ -253,11 +261,3 @@ .Dq Va hw.ata.ata_dma Ns "=0" ) should precede any experimental additions to .Nm . -.Sh HISTORY -The file -.Nm -first appeared in -.Fx 3.2 . -.Sh AUTHORS -This manual page was written by -.An Daniel C. Sobral Aq dcs@FreeBSD.org . ==== //depot/projects/usb_buf/src/sys/cam/scsi/scsi_sg.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.17 2010/03/17 18:53:58 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.19 2010/05/11 22:51:13 mjacob Exp $"); #include #include @@ -303,7 +303,14 @@ softc->dev = make_dev(&sg_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); - (void)make_dev_alias(softc->dev, "sg%c", 'a' + periph->unit_number); + if (periph->unit_number < 26) { + (void)make_dev_alias(softc->dev, "sg%c", + periph->unit_number + 'a'); + } else { + (void)make_dev_alias(softc->dev, "sg%c%c", + ((periph->unit_number / 26) - 1) + 'a', + (periph->unit_number % 26) + 'a'); + } cam_periph_lock(periph); softc->dev->si_drv1 = periph; ==== //depot/projects/usb_buf/src/sys/cddl/boot/zfs/zfsimpl.h#4 (text+ko) ==== @@ -66,7 +66,7 @@ #define P2ROUNDUP(x, align) (-(-(x) & -(align))) #define P2END(x, align) (-(~(x) & -(align))) #define P2PHASEUP(x, align, phase) ((phase) - (((phase) - (x)) & -(align))) -#define P2CROSS(x, y, align) (((x) ^ (y)) > (align) - 1) +#define P2BOUNDARY(off, len, align) (((off) ^ ((off) + (len) - 1)) > (align) - 1) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 17 04:32:36 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 151571065680; Mon, 17 May 2010 04:32:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CDAC9106566C for ; Mon, 17 May 2010 04:32:35 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A25EE8FC17 for ; Mon, 17 May 2010 04:32:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4H4WZC7042265 for ; Mon, 17 May 2010 04:32:35 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4H4WZfB042263 for perforce@freebsd.org; Mon, 17 May 2010 04:32:35 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 17 May 2010 04:32:35 GMT Message-Id: <201005170432.o4H4WZfB042263@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178367 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 04:32:36 -0000 http://p4web.freebsd.org/@@178367?ac=10 Change 178367 by gcooper@starr-bastion on 2010/05/17 04:32:35 Add some initial python tests for libpkg using ctypes. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/lib/libpkg/tests/__init__.py#1 add .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/lib/libpkg/tests/test_unpack.py#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon May 17 07:40:02 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD9D31065676; Mon, 17 May 2010 07:40:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A37021065674 for ; Mon, 17 May 2010 07:40:01 +0000 (UTC) (envelope-from x1user@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 751A88FC13 for ; Mon, 17 May 2010 07:40:01 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4H7e1eb072862 for ; Mon, 17 May 2010 07:40:01 GMT (envelope-from x1user@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4H7e1Pq072860 for perforce@freebsd.org; Mon, 17 May 2010 07:40:01 GMT (envelope-from x1user@FreeBSD.org) Date: Mon, 17 May 2010 07:40:01 GMT Message-Id: <201005170740.o4H7e1Pq072860@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to x1user@FreeBSD.org using -f From: Stanislav Uzunchev To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178369 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 07:40:02 -0000 http://p4web.freebsd.org/@@178369?ac=10 Change 178369 by x1user@scylla on 2010/05/17 07:39:26 Affected files ... .. //depot/projects/soc2010/bsnmp/Milestones#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon May 17 09:20:52 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 170E01065673; Mon, 17 May 2010 09:20:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CFFB5106566B for ; Mon, 17 May 2010 09:20:51 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BD6048FC0A for ; Mon, 17 May 2010 09:20:51 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4H9Kpth093011 for ; Mon, 17 May 2010 09:20:51 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4H9Kpdf093009 for perforce@freebsd.org; Mon, 17 May 2010 09:20:51 GMT (envelope-from lz@FreeBSD.org) Date: Mon, 17 May 2010 09:20:51 GMT Message-Id: <201005170920.o4H9Kpdf093009@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178372 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 09:20:52 -0000 http://p4web.freebsd.org/@@178372?ac=10 Change 178372 by lz@gnehzuil-freebsd on 2010/05/17 09:20:22 Fix a bug when call ext2_mapsearch() function. * When calling ext2_mapsearch() fucntion, Cylinder group maybe does not have a free block Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#11 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#11 (text+ko) ==== @@ -65,7 +65,7 @@ static void ext2_add_rsv_win(struct m_ext2fs *, struct ext2_rsv_win *); static u_long ext2_alloc_blk(struct m_ext2fs *, struct inode *, int cg, struct buf *, int32_t, struct ext2_rsv_win *); -static int ext2_alloc_new_rsv_win(struct inode *, struct ext2_rsv_win *, int32_t, +static u_long ext2_alloc_new_rsv_win(struct inode *, struct ext2_rsv_win *, int32_t, struct m_ext2fs *, int, struct buf *); static int ext2_find_next_rsv_win(struct ext2_rsv_win *, struct ext2_rsv_win *, struct m_ext2fs *, int32_t, int); @@ -179,7 +179,7 @@ if (prev->rw_start > bpref) prev = RB_PREV(ext2_rsv_win_tree, root, prev); - return next; + return prev; } /* @@ -203,6 +203,7 @@ if (cur <= rsv->rw_end) cur = rsv->rw_end + 1; + /* TODO: need to be improved */ if (dtog(fs, cur) != cg) return -1; @@ -232,7 +233,7 @@ /* * Try to allocate a new reservation window. */ -static int +static u_long ext2_alloc_new_rsv_win(struct inode *ip, struct ext2_rsv_win *rp, int32_t bpref, struct m_ext2fs *fs, int cg, struct buf *bp) { @@ -255,7 +256,7 @@ * So try to allocate it in other group. */ if (dtog(fs, bpref) != cg) - return 0; + bpref = 0; if (bpref != 0) { bpref = dtogd(fs, bpref); if (isclr(bbp, bpref)) @@ -280,7 +281,10 @@ } } - bpref = ext2_mapsearch(fs, bbp, bpref); + EXT2_LOCK(ump); + if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) + bpref = ext2_mapsearch(fs, bbp, bpref); + EXT2_UNLOCK(ump); if (bpref < 0) return 0; goto allocated1; @@ -293,7 +297,10 @@ ext2_remove_rsv_win(fs, rp); mtx_unlock_spin(&fs->e2fs_rsv_lock); - bpref = ext2_mapsearch(fs, bbp, bpref); + EXT2_LOCK(ump); + if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) + bpref = ext2_mapsearch(fs, bbp, bpref); + EXT2_UNLOCK(ump); if (bpref < 0) return 0; goto allocated1; @@ -321,7 +328,10 @@ ext2_remove_rsv_win(fs, rp); mtx_unlock_spin(&fs->e2fs_rsv_lock); - bpref = ext2_mapsearch(fs, bbp, bpref); + EXT2_LOCK(ump); + if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) + bpref = ext2_mapsearch(fs, bbp, bpref); + EXT2_UNLOCK(ump); if (bpref < 0) return 0; goto allocated1; @@ -359,7 +369,7 @@ struct ext2mount *ump; u_long start; char *bbp; - u_long bno; + daddr_t bno = -1; ump = ip->i_ump; bbp = (char *)bp->b_data; @@ -377,7 +387,10 @@ ext2_remove_rsv_win(fs, rp); mtx_unlock_spin(&fs->e2fs_rsv_lock); - bno = ext2_mapsearch(fs, bbp, bpref); + EXT2_LOCK(ump); + if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) + bno = ext2_mapsearch(fs, bbp, bpref); + EXT2_UNLOCK(ump); if (bno < 0) return 0; goto allocated; @@ -411,7 +424,7 @@ */ if (rp->rw_end == EXT2_RWI_NOT_ALLOCATED) { return ext2_alloc_new_rsv_win(ip, rp, bpref, fs, cg, bp); - } else if (rp->rw_start + rp->rw_alloc_hit - 1 == rp->rw_end) { + } else if (rp->rw_start + rp->rw_alloc_hit > rp->rw_end) { return ext2_alloc_new_rsv_win(ip, rp, rp->rw_end, fs, cg, bp); } @@ -481,7 +494,7 @@ /* Read block bitmap from buffer */ EXT2_UNLOCK(ump); error = bread(ip->i_devvp, - fsbtodb(fs, fs->e2fs_gd[i].ext2bgd_b_bitmap), + fsbtodb(fs, fs->e2fs_gd[cg].ext2bgd_b_bitmap), (int)fs->e2fs_bsize, NOCRED, &bp); if (error) { brelse(bp); @@ -489,7 +502,7 @@ } EXT2_IRSV_LOCK(ip); - bno = ext2_rsvalloc(fs, ip, i, bp, bpref, size); + bno = ext2_rsvalloc(fs, ip, cg, bp, bpref, size); EXT2_IRSV_UNLOCK(ip); if (bno > 0) goto allocated; @@ -511,16 +524,16 @@ return (0); } -ioerror: - ext2_fserr(fs, cred->cr_uid, "file system IO error"); - uprintf("\n%s: write failed, file system IO error\n", fs->e2fs_fsmnt); - return EIO; - nospace: EXT2_UNLOCK(ump); ext2_fserr(fs, cred->cr_uid, "file system full"); uprintf("\n%s: write failed, file system is full\n", fs->e2fs_fsmnt); return (ENOSPC); + +ioerror: + ext2_fserr(fs, cred->cr_uid, "file system IO error"); + uprintf("\n%s: write failed, file system IO error\n", fs->e2fs_fsmnt); + return EIO; } /* From owner-p4-projects@FreeBSD.ORG Mon May 17 09:35:08 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC2F41065675; Mon, 17 May 2010 09:35:07 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AFFB5106566B for ; Mon, 17 May 2010 09:35:07 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9CAB08FC2B for ; Mon, 17 May 2010 09:35:07 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4H9Z7vs094042 for ; Mon, 17 May 2010 09:35:07 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4H9Z7G2094040 for perforce@freebsd.org; Mon, 17 May 2010 09:35:07 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 17 May 2010 09:35:07 GMT Message-Id: <201005170935.o4H9Z7G2094040@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178374 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 09:35:08 -0000 http://p4web.freebsd.org/@@178374?ac=10 Change 178374 by gcooper@gcooper-bayonetta on 2010/05/17 09:35:04 Get rid of all references to cleanup within fileGetUrl(). Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/url.c#2 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/url.c#2 (text+ko) ==== @@ -35,137 +35,149 @@ const char * fileGetURL(const char *base, const char *spec, int keep_package) { - const char *rp; - char *cp, *tmp; - char fname[FILENAME_MAX]; - char pen[FILENAME_MAX]; - char pkg[FILENAME_MAX]; - char buf[8192]; - FILE *ftp; - pid_t tpid; - int pfd[2], pstat, r, w = 0; - char *hint; - int fd, pkgfd = 0; + FILE *ftp = NULL; + const char *rp = NULL; + char *cp, *hint, *tmp; + char fname[FILENAME_MAX]; + char pen[FILENAME_MAX]; + char pkg[FILENAME_MAX]; + char buf[8192]; + int fd = -1, pkgfd = -1; + int pfd[2], pstat, r, w = 0; + pid_t tpid; + + rp = NULL; + /* Special tip that sysinstall left for us */ + hint = getenv("PKG_ADD_BASE"); + if (!isURL(spec)) { + /* + * We've been given an existing URL (that's known-good) and now + * we need to construct a composite one out of that and the + * basename we were handed as a dependency. + */ + if (base != NULL) { + + strcpy(fname, base); + + /* + * Advance back two slashes to get to the root of the + * package hierarchy + */ + cp = strrchr(fname, '/'); + if (cp) { + *cp = '\0'; /* chop name */ + cp = strrchr(fname, '/'); + } + if (cp != NULL) { + *(cp + 1) = '\0'; + strcat(cp, "All/"); + strcat(cp, spec); + strcat(cp, ".tbz"); + } + else + return NULL; + } + else if (hint != NULL) { + /* + * Otherwise, we've been given an environment variable + * hinting at the right location from sysinstall + */ + strcpy(fname, hint); + strcat(fname, spec); + strcat(fname, ".tbz"); + + } + else + return NULL; - rp = NULL; - /* Special tip that sysinstall left for us */ - hint = getenv("PKG_ADD_BASE"); - if (!isURL(spec)) { - if (!base && !hint) - return NULL; - /* - * We've been given an existing URL (that's known-good) and now we need - * to construct a composite one out of that and the basename we were - * handed as a dependency. - */ - if (base) { - strcpy(fname, base); - /* - * Advance back two slashes to get to the root of the package - * hierarchy - */ - cp = strrchr(fname, '/'); - if (cp) { - *cp = '\0'; /* chop name */ - cp = strrchr(fname, '/'); - } - if (cp) { - *(cp + 1) = '\0'; - strcat(cp, "All/"); - strcat(cp, spec); - strcat(cp, ".tbz"); - } - else - return NULL; } - else { - /* - * Otherwise, we've been given an environment variable hinting - * at the right location from sysinstall - */ - strcpy(fname, hint); - strcat(fname, spec); - strcat(fname, ".tbz"); + else + strcpy(fname, spec); + + if (keep_package) { + + tmp = getenv("PKGDIR"); + strlcpy(pkg, tmp ? tmp : ".", sizeof(pkg)); + tmp = basename(fname); + strlcat(pkg, "/", sizeof(pkg)); + strlcat(pkg, tmp, sizeof(pkg)); + + if ((pkgfd = open(pkg, O_WRONLY|O_CREAT|O_TRUNC, 0644)) == -1) { + warn("Error: Unable to open %s", pkg); + return NULL; + } + } - } - else - strcpy(fname, spec); - if (keep_package) { - tmp = getenv("PKGDIR"); - strlcpy(pkg, tmp ? tmp : ".", sizeof(pkg)); - tmp = basename(fname); - strlcat(pkg, "/", sizeof(pkg)); - strlcat(pkg, tmp, sizeof(pkg)); - if ((pkgfd = open(pkg, O_WRONLY|O_CREAT|O_TRUNC, 0644)) == -1) { - printf("Error: Unable to open %s\n", pkg); - perror("open"); - return NULL; + fetchDebug = (Verbose > 0); + if ((ftp = fetchGetURL(fname, Verbose ? "v" : NULL)) == NULL) { + warnx("Error: Unable to get %s: %s\n", fname, + fetchLastErrString); + /* If the fetch fails, yank the package. */ + if (keep_package && unlink(pkg) < 0) { + warnx("failed to remove partially fetched package: %s", + pkg); + } + return NULL; } - } - fetchDebug = (Verbose > 0); - if ((ftp = fetchGetURL(fname, Verbose ? "v" : NULL)) == NULL) { - printf("Error: Unable to get %s: %s\n", - fname, fetchLastErrString); - /* If the fetch fails, yank the package. */ - if (keep_package && unlink(pkg) < 0) { - warnx("failed to remove partially fetched package: %s", pkg); + if (isatty(0) || Verbose) { + printf("Fetching %s...", fname); + fflush(stdout); } - return NULL; - } + pen[0] = '\0'; + if ((rp = make_playpen(pen, 0)) == NULL) + warn("Error: Unable to construct a new playpen for FTP!"); + else if (pipe(pfd) == -1) + warn("pipe()"); + else + switch ((tpid = fork())) { + case -1: + warn("fork()"); + break; + case 0: + dup2(pfd[0], 0); + for (fd = getdtablesize() - 1; fd >= 3; --fd) + close(fd); + execl("/usr/bin/tar", "tar", + Verbose ? "-xpjvf" : "-xpjf", "-", (char *)0); + _exit(2); + default: + close(pfd[0]); + + for (;;) { + + if ((r = fread(buf, 1, sizeof(buf), ftp)) < 1) + break; + if ((w = write(pfd[1], buf, r)) != r) + break; + if (keep_package) + if ((w = write(pkgfd, buf, r)) != r) + break; + + } + if (w == -1) + warn("warning: error writing to tar"); + if (ferror(ftp)) + warn("warning: error reading from server"); + + close(pfd[1]); + tpid = waitpid(tpid, &pstat, 0); + if (Verbose) + printf("tar command returned %d status\n", + WEXITSTATUS(pstat)); + if (rp != NULL && (isatty(0) || Verbose)) + printf(" Done.\n"); + break; + } + + if (0 < fd) + close(fd); + if (ftp != NULL) + fclose(ftp); + if (0 < pkgfd) + close(pkgfd); + + return rp; - if (isatty(0) || Verbose) - printf("Fetching %s...", fname), fflush(stdout); - pen[0] = '\0'; - if ((rp = make_playpen(pen, 0)) == NULL) { - printf("Error: Unable to construct a new playpen for FTP!\n"); - fclose(ftp); - return NULL; - } - if (pipe(pfd) == -1) { - warn("pipe()"); - cleanup(0); - exit(2); - } - if ((tpid = fork()) == -1) { - warn("pipe()"); - cleanup(0); - exit(2); - } - if (!tpid) { - dup2(pfd[0], 0); - for (fd = getdtablesize() - 1; fd >= 3; --fd) - close(fd); - execl("/usr/bin/tar", "tar", - Verbose ? "-xpjvf" : "-xpjf", - "-", (char *)0); - _exit(2); - } - close(pfd[0]); - for (;;) { - if ((r = fread(buf, 1, sizeof buf, ftp)) < 1) - break; - if ((w = write(pfd[1], buf, r)) != r) - break; - if (keep_package) { - if ((w = write(pkgfd, buf, r)) != r) - break; - } - } - if (ferror(ftp)) - warn("warning: error reading from server"); - fclose(ftp); - if (keep_package) { - close(pkgfd); - } - close(pfd[1]); - if (w == -1) - warn("warning: error writing to tar"); - tpid = waitpid(tpid, &pstat, 0); - if (Verbose) - printf("tar command returns %d status\n", WEXITSTATUS(pstat)); - if (rp && (isatty(0) || Verbose)) - printf(" Done.\n"); - return rp; } From owner-p4-projects@FreeBSD.ORG Mon May 17 10:03:39 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7AF91065675; Mon, 17 May 2010 10:03:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 73DA41065673 for ; Mon, 17 May 2010 10:03:39 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 61AF98FC1C for ; Mon, 17 May 2010 10:03:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4HA3dbR097156 for ; Mon, 17 May 2010 10:03:39 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4HA3cmS097154 for perforce@freebsd.org; Mon, 17 May 2010 10:03:38 GMT (envelope-from zec@fer.hr) Date: Mon, 17 May 2010 10:03:38 GMT Message-Id: <201005171003.o4HA3cmS097154@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178375 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 10:03:40 -0000 http://p4web.freebsd.org/@@178375?ac=10 Change 178375 by zec@zec_nxlab on 2010/05/17 10:03:22 Whitespace / tab cleanup. Affected files ... .. //depot/projects/vimage/src/sys/net/vnet.c#11 edit .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#31 edit Differences ... ==== //depot/projects/vimage/src/sys/net/vnet.c#11 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#31 (text+ko) ==== @@ -122,7 +122,7 @@ #define M_HASCL(m) ((m)->m_flags & M_EXT) static VNET_DEFINE(uint32_t, last_tv_sec); /* last time we processed this */ -#define V_last_tv_sec VNET(last_tv_sec) +#define V_last_tv_sec VNET(last_tv_sec) static MALLOC_DEFINE(M_MRTABLE, "mroutetbl", "multicast forwarding cache"); @@ -143,24 +143,24 @@ #define MROUTER_LOCK_DESTROY() mtx_destroy(&mrouter_mtx) static VNET_DEFINE(struct mrtstat, mrtstat); -#define V_mrtstat VNET(mrtstat) +#define V_mrtstat VNET(mrtstat) SYSCTL_VNET_STRUCT(_net_inet_ip, OID_AUTO, mrtstat, CTLFLAG_RW, &VNET_NAME(mrtstat), mrtstat, "IPv4 Multicast Forwarding Statistics (struct mrtstat, " "netinet/ip_mroute.h)"); static VNET_DEFINE(u_long, mfchash); -#define V_mfchash VNET(mfchash) -#define MFCHASH(a, g) \ +#define V_mfchash VNET(mfchash) +#define MFCHASH(a, g) \ ((((a).s_addr >> 20) ^ ((a).s_addr >> 10) ^ (a).s_addr ^ \ ((g).s_addr >> 20) ^ ((g).s_addr >> 10) ^ (g).s_addr) & V_mfchash) -#define MFCHASHSIZE 256 +#define MFCHASHSIZE 256 static VNET_DEFINE(u_char*, nexpire); -#define V_nexpire VNET(nexpire) +#define V_nexpire VNET(nexpire) static u_long mfchashsize; /* Hash size */ static VNET_DEFINE(LIST_HEAD(mfchashhdr, mfc)*, mfchashtbl); -#define V_mfchashtbl VNET(mfchashtbl) +#define V_mfchashtbl VNET(mfchashtbl) static struct mtx mfc_mtx; #define MFC_LOCK() mtx_lock(&mfc_mtx) @@ -171,9 +171,9 @@ #define MFC_LOCK_DESTROY() mtx_destroy(&mfc_mtx) static VNET_DEFINE(vifi_t, numvifs); -#define V_numvifs VNET(numvifs) +#define V_numvifs VNET(numvifs) static VNET_DEFINE(struct vif, viftable[MAXVIFS]); -#define V_viftable VNET(viftable) +#define V_viftable VNET(viftable) SYSCTL_VNET_OPAQUE(_net_inet_ip, OID_AUTO, viftable, CTLFLAG_RD, &VNET_NAME(viftable), sizeof(V_viftable), "S,vif[MAXVIFS]", "IPv4 Multicast Interfaces (struct vif[MAXVIFS], netinet/ip_mroute.h)"); @@ -200,25 +200,25 @@ * Pending timeouts are stored in a hash table, the key being the * expiration time. Periodically, the entries are analysed and processed. */ -#define BW_METER_BUCKETS 1024 +#define BW_METER_BUCKETS 1024 static VNET_DEFINE(struct bw_meter*, bw_meter_timers[BW_METER_BUCKETS]); -#define V_bw_meter_timers VNET(bw_meter_timers) +#define V_bw_meter_timers VNET(bw_meter_timers) static struct callout bw_meter_ch; -#define BW_METER_PERIOD (hz) /* periodical handling of bw meters */ +#define BW_METER_PERIOD (hz) /* periodical handling of bw meters */ /* * Pending upcalls are stored in a vector which is flushed when * full, or periodically */ static VNET_DEFINE(struct bw_upcall, bw_upcalls[BW_UPCALLS_MAX]); -#define V_bw_upcalls VNET(bw_upcalls) +#define V_bw_upcalls VNET(bw_upcalls) static VNET_DEFINE(u_int, bw_upcalls_n); /* # of pending upcalls */ -#define V_bw_upcalls_n VNET(bw_upcalls_n) +#define V_bw_upcalls_n VNET(bw_upcalls_n) static struct callout bw_upcalls_ch; #define BW_UPCALLS_PERIOD (hz) /* periodical flush of bw upcalls */ static VNET_DEFINE(struct pimstat, pimstat); -#define V_pimstat VNET(pimstat) +#define V_pimstat VNET(pimstat) SYSCTL_NODE(_net_inet, IPPROTO_PIM, pim, CTLFLAG_RW, 0, "PIM"); SYSCTL_VNET_STRUCT(_net_inet_pim, PIMCTL_STATS, stats, CTLFLAG_RD, @@ -289,9 +289,9 @@ }; static VNET_DEFINE(vifi_t, reg_vif_num) = VIFI_INVALID; -#define V_reg_vif_num VNET(reg_vif_num) +#define V_reg_vif_num VNET(reg_vif_num) static VNET_DEFINE(struct ifnet, multicast_register_if); -#define V_multicast_register_if VNET(multicast_register_if) +#define V_multicast_register_if VNET(multicast_register_if) /* * Private variables. From owner-p4-projects@FreeBSD.ORG Mon May 17 10:08:45 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79C241065673; Mon, 17 May 2010 10:08:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E04D106564A for ; Mon, 17 May 2010 10:08:45 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 116B58FC1B for ; Mon, 17 May 2010 10:08:45 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4HA8iYB097518 for ; Mon, 17 May 2010 10:08:44 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4HA8ifd097516 for perforce@freebsd.org; Mon, 17 May 2010 10:08:44 GMT (envelope-from zec@fer.hr) Date: Mon, 17 May 2010 10:08:44 GMT Message-Id: <201005171008.o4HA8ifd097516@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 10:08:45 -0000 http://p4web.freebsd.org/@@178376?ac=10 Change 178376 by zec@zec_nxlab on 2010/05/17 10:08:16 Remove a redundant MFC_LOCK_ASSERT(). Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#32 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#32 (text+ko) ==== @@ -2077,7 +2077,6 @@ { 0 } }; /* im_dst */ MFC_LOCK_ASSERT(); - MFC_LOCK_ASSERT(); if (V_bw_upcalls_n == 0) return; /* No pending upcalls */ From owner-p4-projects@FreeBSD.ORG Mon May 17 10:16:54 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 645631065674; Mon, 17 May 2010 10:16:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27ED01065670 for ; Mon, 17 May 2010 10:16:54 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1625C8FC16 for ; Mon, 17 May 2010 10:16:54 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4HAGrhu098129 for ; Mon, 17 May 2010 10:16:53 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4HAGr5T098127 for perforce@freebsd.org; Mon, 17 May 2010 10:16:53 GMT (envelope-from zec@fer.hr) Date: Mon, 17 May 2010 10:16:53 GMT Message-Id: <201005171016.o4HAGr5T098127@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178377 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 10:16:54 -0000 http://p4web.freebsd.org/@@178377?ac=10 Change 178377 by zec@zec_nxlab on 2010/05/17 10:16:19 Do not call X_ip_mrouter_done() after FREE()ing V_nexpire, as this would lead to a crash. We must reference V_irtualized timers when attempting to stop them in X_ip_mrouter_done() - did this code ever compile with VIMAGE defined? Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#33 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#33 (text+ko) ==== @@ -752,9 +752,9 @@ EVENTHANDLER_DEREGISTER(ifnet_departure_event, if_detach_event_tag); - callout_stop(&expire_upcalls_ch); - callout_stop(&bw_upcalls_ch); - callout_stop(&bw_meter_ch); + callout_stop(&V_expire_upcalls_ch); + callout_stop(&V_bw_upcalls_ch); + callout_stop(&V_bw_meter_ch); MFC_LOCK(); @@ -2826,14 +2826,9 @@ static void vnet_mroute_uninit(const void *unused __unused) { - /* - callout_stop(&V_expire_upcalls_ch); - callout_stop(&V_bw_upcalls_ch); - callout_stop(&V_bw_meter_ch); - */ + FREE(V_nexpire, M_MRTABLE); V_nexpire = NULL; - X_ip_mrouter_done(); } VNET_SYSUNINIT(vnet_mroute_uninit, SI_SUB_PSEUDO, SI_ORDER_MIDDLE, From owner-p4-projects@FreeBSD.ORG Mon May 17 10:31:10 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64C141065678; Mon, 17 May 2010 10:31:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28FFD1065673 for ; Mon, 17 May 2010 10:31:10 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F1E778FC1F for ; Mon, 17 May 2010 10:31:09 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4HAV92q099209 for ; Mon, 17 May 2010 10:31:09 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4HAV9EX099207 for perforce@freebsd.org; Mon, 17 May 2010 10:31:09 GMT (envelope-from zec@fer.hr) Date: Mon, 17 May 2010 10:31:09 GMT Message-Id: <201005171031.o4HAV9EX099207@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178379 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 10:31:10 -0000 http://p4web.freebsd.org/@@178379?ac=10 Change 178379 by zec@zec_nxlab on 2010/05/17 10:30:56 Add a global counter of all V_ip_mrouter instances, which we consult when making a decission on wheter or not to allow the module to be kldunloaded. Introduce a global flag which we set when starting to kldunload the module, in order to prevent new V_ip_mrouter sockets to become attached. All of this is completely untested. Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#34 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#34 (text+ko) ==== @@ -142,6 +142,9 @@ mtx_init(&mrouter_mtx, "IPv4 multicast forwarding", NULL, MTX_DEF) #define MROUTER_LOCK_DESTROY() mtx_destroy(&mrouter_mtx) +static int ip_mrouter_cnt; /* # of vnets with active mrouters */ +static int ip_mrouter_unloading; /* Allow no more V_ip_mrouter sockets */ + static VNET_DEFINE(struct mrtstat, mrtstat); #define V_mrtstat VNET(mrtstat) SYSCTL_VNET_STRUCT(_net_inet_ip, OID_AUTO, mrtstat, CTLFLAG_RW, @@ -673,6 +676,11 @@ MROUTER_LOCK(); + if (ip_mrouter_unloading) { + MROUTER_UNLOCK(); + return ENOPROTOOPT; + } + if (V_ip_mrouter != NULL) { MROUTER_UNLOCK(); return EADDRINUSE; @@ -694,6 +702,7 @@ callout_reset(&bw_meter_ch, BW_METER_PERIOD, expire_bw_meter_process, curvnet); V_ip_mrouter = so; + ip_mrouter_cnt++; MROUTER_UNLOCK(); @@ -724,6 +733,7 @@ * Detach/disable hooks to the reset of the system. */ V_ip_mrouter = NULL; + ip_mrouter_cnt--; mrt_api_config = 0; VIF_LOCK(); @@ -2890,8 +2900,13 @@ * just loaded and then unloaded w/o starting up a user * process we still need to cleanup. */ - if (V_ip_mrouter != NULL) + MROUTER_LOCK(); + if (ip_mrouter_cnt != 0) { + MROUTER_UNLOCK(); return (EINVAL); + } + ip_mrouter_unloading = 1; + MROUTER_UNLOCK(); if (pim_encap_cookie) { encap_detach(pim_encap_cookie); From owner-p4-projects@FreeBSD.ORG Mon May 17 10:34:13 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB58F1065674; Mon, 17 May 2010 10:34:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7FDEB1065672 for ; Mon, 17 May 2010 10:34:13 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6C55C8FC14 for ; Mon, 17 May 2010 10:34:13 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4HAYDXS099423 for ; Mon, 17 May 2010 10:34:13 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4HAYDDe099421 for perforce@freebsd.org; Mon, 17 May 2010 10:34:13 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 17 May 2010 10:34:13 GMT Message-Id: <201005171034.o4HAYDDe099421@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178380 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 10:34:14 -0000 http://p4web.freebsd.org/@@178380?ac=10 Change 178380 by gcooper@gcooper-bayonetta on 2010/05/17 10:33:23 Remove all references of cleanup in plist.c . style(9)-ize things appropriately. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#3 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#3 (text+ko) ==== @@ -23,9 +23,10 @@ #include #include -#include #include +#include #include +#include #include "pkg.h" @@ -260,160 +261,191 @@ } /* Read a packing list from a file */ -void +int read_plist(Package *pkg, int fd) { - char *cp, pline[FILENAME_MAX]; - int cmd, major, minor; + char *cp, pline[FILENAME_MAX]; + int cmd, major, minor, rc = 0; + size_t len; + + pkg->fmtver_maj = 1; + pkg->fmtver_mnr = 0; + pkg->origin = NULL; + + /* + * XXX (gcooper): BAD BAD BAD -- this can be longer than + * FILENAME_MAX + */ + while (rc == 0 && 0 < read(fd, pline, FILENAME_MAX)) { + len = strlen(pline); + + while (len && isspace(pline[len - 1])) + pline[--len] = '\0'; + if (!len) + continue; + cp = pline; + if (pline[0] != CMD_CHAR) { + cmd = PLIST_FILE; + goto bottom; + } + cmd = plist_cmd(pline + 1, &cp); + if (cmd == FAIL) { + warnx("%s: unknown command '%s' (package tools out of " + "date?)", __func__, pline); + goto bottom; + } + if (*cp == '\0') { + cp = NULL; + if (cmd == PLIST_PKGDEP) { + warnx("corrupted record (pkgdep line without " + "argument), ignoring"); + cmd = FAIL; + } + goto bottom; + } + if (cmd == PLIST_COMMENT && + sscanf(cp, "PKG_FORMAT_REVISION:%d.%d\n", &major, &minor) == + 2) { + + pkg->fmtver_maj = major; + pkg->fmtver_mnr = minor; + + if (verscmp(pkg, PLIST_FMT_VER_MAJOR, + PLIST_FMT_VER_MINOR) <= 0) + goto bottom; + + warnx("plist format revision (%d.%d) is higher than " + "supported (%d.%d)", + pkg->fmtver_maj, pkg->fmtver_mnr, + PLIST_FMT_VER_MAJOR, PLIST_FMT_VER_MINOR); + + if (pkg->fmtver_maj > PLIST_FMT_VER_MAJOR) { + errno = EINVAL; + rc = -1; + } - pkg->fmtver_maj = 1; - pkg->fmtver_mnr = 0; - pkg->origin = NULL; + } - /* XXX (gcooper): BAD BAD BAD -- this can be longer than FILENAME_MAX */ - while (0 < read(fd, pline, FILENAME_MAX)) { - int len = strlen(pline); +bottom: + if (rc == 0) + add_plist(pkg, cmd, cp); - while (len && isspace(pline[len - 1])) - pline[--len] = '\0'; - if (!len) - continue; - cp = pline; - if (pline[0] != CMD_CHAR) { - cmd = PLIST_FILE; - goto bottom; } - cmd = plist_cmd(pline + 1, &cp); - if (cmd == FAIL) { - warnx("%s: unknown command '%s' (package tools out of date?)", - __func__, pline); - goto bottom; - } - if (*cp == '\0') { - cp = NULL; - if (cmd == PLIST_PKGDEP) { - warnx("corrupted record (pkgdep line without argument), ignoring"); - cmd = FAIL; - } - goto bottom; - } - if (cmd == PLIST_COMMENT && sscanf(cp, "PKG_FORMAT_REVISION:%d.%d\n", - &major, &minor) == 2) { - pkg->fmtver_maj = major; - pkg->fmtver_mnr = minor; - if (verscmp(pkg, PLIST_FMT_VER_MAJOR, PLIST_FMT_VER_MINOR) <= 0) - goto bottom; + + return rc; - warnx("plist format revision (%d.%d) is higher than supported" - "(%d.%d)", pkg->fmtver_maj, pkg->fmtver_mnr, - PLIST_FMT_VER_MAJOR, PLIST_FMT_VER_MINOR); - if (pkg->fmtver_maj > PLIST_FMT_VER_MAJOR) { - cleanup(0); - exit(2); - } - } -bottom: - add_plist(pkg, cmd, cp); - } } /* Write a packing list to a file, converting commands to ascii equivs */ -void +int write_plist(Package *pkg, FILE *fp) { - PackingList plist = pkg->head; + PackingList plist; + int rc = 0; + + for (plist = pkg->head; plist != NULL; plist = plist->next) { + + switch(plist->type) { + case PLIST_FILE: + fprintf(fp, "%s\n", plist->name); + break; - while (plist) { - switch(plist->type) { - case PLIST_FILE: - fprintf(fp, "%s\n", plist->name); - break; + case PLIST_CWD: + fprintf(fp, "%ccwd %s\n", + CMD_CHAR, (plist->name == NULL) ? "" : plist->name); + break; - case PLIST_CWD: - fprintf(fp, "%ccwd %s\n", CMD_CHAR, (plist->name == NULL) ? "" : plist->name); - break; + case PLIST_SRC: + fprintf(fp, "%csrcdir %s\n", CMD_CHAR, plist->name); + break; - case PLIST_SRC: - fprintf(fp, "%csrcdir %s\n", CMD_CHAR, plist->name); - break; + case PLIST_CMD: + fprintf(fp, "%cexec %s\n", CMD_CHAR, plist->name); + break; - case PLIST_CMD: - fprintf(fp, "%cexec %s\n", CMD_CHAR, plist->name); - break; + case PLIST_UNEXEC: + fprintf(fp, "%cunexec %s\n", CMD_CHAR, plist->name); + break; - case PLIST_UNEXEC: - fprintf(fp, "%cunexec %s\n", CMD_CHAR, plist->name); - break; + case PLIST_CHMOD: + fprintf(fp, "%cmode %s\n", + CMD_CHAR, plist->name ? plist->name : ""); + break; - case PLIST_CHMOD: - fprintf(fp, "%cmode %s\n", CMD_CHAR, plist->name ? plist->name : ""); - break; + case PLIST_CHOWN: + fprintf(fp, "%cowner %s\n", + CMD_CHAR, plist->name ? plist->name : ""); + break; - case PLIST_CHOWN: - fprintf(fp, "%cowner %s\n", CMD_CHAR, plist->name ? plist->name : ""); - break; + case PLIST_CHGRP: + fprintf(fp, "%cgroup %s\n", + CMD_CHAR, plist->name ? plist->name : ""); + break; - case PLIST_CHGRP: - fprintf(fp, "%cgroup %s\n", CMD_CHAR, plist->name ? plist->name : ""); - break; + case PLIST_COMMENT: + fprintf(fp, "%ccomment %s\n", + CMD_CHAR, plist->name); + break; - case PLIST_COMMENT: - fprintf(fp, "%ccomment %s\n", CMD_CHAR, plist->name); - break; + case PLIST_NOINST: + fprintf(fp, "%cnoinst %s\n", CMD_CHAR, plist->name); + break; - case PLIST_NOINST: - fprintf(fp, "%cnoinst %s\n", CMD_CHAR, plist->name); - break; + case PLIST_IGNORE: + /* FALLTHROUGH */ + /* a one-time non-ignored file */ + case PLIST_IGNORE_INST: + fprintf(fp, "%cignore\n", CMD_CHAR); + break; - case PLIST_IGNORE: - case PLIST_IGNORE_INST: /* a one-time non-ignored file */ - fprintf(fp, "%cignore\n", CMD_CHAR); - break; + case PLIST_NAME: + fprintf(fp, "%cname %s\n", CMD_CHAR, plist->name); + break; - case PLIST_NAME: - fprintf(fp, "%cname %s\n", CMD_CHAR, plist->name); - break; + case PLIST_DISPLAY: + fprintf(fp, "%cdisplay %s\n", CMD_CHAR, plist->name); + break; - case PLIST_DISPLAY: - fprintf(fp, "%cdisplay %s\n", CMD_CHAR, plist->name); - break; + case PLIST_PKGDEP: + fprintf(fp, "%cpkgdep %s\n", CMD_CHAR, plist->name); + break; - case PLIST_PKGDEP: - fprintf(fp, "%cpkgdep %s\n", CMD_CHAR, plist->name); - break; + case PLIST_CONFLICTS: + fprintf(fp, "%cconflicts %s\n", CMD_CHAR, plist->name); + break; - case PLIST_CONFLICTS: - fprintf(fp, "%cconflicts %s\n", CMD_CHAR, plist->name); - break; + case PLIST_MTREE: + fprintf(fp, "%cmtree %s\n", CMD_CHAR, plist->name); + break; - case PLIST_MTREE: - fprintf(fp, "%cmtree %s\n", CMD_CHAR, plist->name); - break; + case PLIST_DIR_RM: + fprintf(fp, "%cdirrm %s\n", CMD_CHAR, plist->name); + break; - case PLIST_DIR_RM: - fprintf(fp, "%cdirrm %s\n", CMD_CHAR, plist->name); - break; + case PLIST_OPTION: + fprintf(fp, "%coption %s\n", CMD_CHAR, plist->name); + break; - case PLIST_OPTION: - fprintf(fp, "%coption %s\n", CMD_CHAR, plist->name); - break; + case PLIST_ORIGIN: + fprintf(fp, "%ccomment ORIGIN:%s\n", + CMD_CHAR, plist->name); + break; - case PLIST_ORIGIN: - fprintf(fp, "%ccomment ORIGIN:%s\n", CMD_CHAR, plist->name); - break; + case PLIST_DEPORIGIN: + fprintf(fp, "%ccomment DEPORIGIN:%s\n", CMD_CHAR, plist->name); + break; - case PLIST_DEPORIGIN: - fprintf(fp, "%ccomment DEPORIGIN:%s\n", CMD_CHAR, plist->name); - break; + default: + warnx("%s: unknown command type %d (%s)", __func__, + plist->type, plist->name); + rc = -1; + break; + } - default: - cleanup(0); - errx(2, "%s: unknown command type %d (%s)", __func__, - plist->type, plist->name); - break; } - plist = plist->next; - } + + return rc; + } /* @@ -473,9 +505,9 @@ char *cp = NULL, buf[33]; /* - * For packing lists whose version is 1.1 or greater, the md5 - * hash for a symlink is calculated on the string returned - * by readlink(). + * For packing lists whose version is 1.1 or greater, the + * md5 hash for a symlink is calculated on the string + * returned by readlink(). */ if (issymlink(tmp) && verscmp(pkg, 1, 0) > 0) { int len; From owner-p4-projects@FreeBSD.ORG Mon May 17 10:35:15 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1794D1065676; Mon, 17 May 2010 10:35:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D05EC1065673 for ; Mon, 17 May 2010 10:35:14 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A4FBE8FC14 for ; Mon, 17 May 2010 10:35:14 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4HAZEKl099552 for ; Mon, 17 May 2010 10:35:14 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4HAZE1F099550 for perforce@freebsd.org; Mon, 17 May 2010 10:35:14 GMT (envelope-from zec@fer.hr) Date: Mon, 17 May 2010 10:35:14 GMT Message-Id: <201005171035.o4HAZE1F099550@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178381 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 10:35:15 -0000 http://p4web.freebsd.org/@@178381?ac=10 Change 178381 by zec@zec_nxlab on 2010/05/17 10:34:24 Style fix. Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#35 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#35 (text+ko) ==== @@ -672,7 +672,7 @@ return EOPNOTSUPP; if (version != 1) - return ENOPROTOOPT; + return (ENOPROTOOPT); MROUTER_LOCK(); From owner-p4-projects@FreeBSD.ORG Mon May 17 10:35:16 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F35C91065771; Mon, 17 May 2010 10:35:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A10D110656E1 for ; Mon, 17 May 2010 10:35:15 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CFCDD8FC1B for ; Mon, 17 May 2010 10:35:14 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4HAZELL099557 for ; Mon, 17 May 2010 10:35:14 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4HAZEYL099555 for perforce@freebsd.org; Mon, 17 May 2010 10:35:14 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 17 May 2010 10:35:14 GMT Message-Id: <201005171035.o4HAZEYL099555@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 10:35:16 -0000 http://p4web.freebsd.org/@@178382?ac=10 Change 178382 by gcooper@gcooper-bayonetta on 2010/05/17 10:35:11 Yank msg.c as the APIs are mostly useless. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/Makefile#3 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/msg.c#2 delete Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/Makefile#3 (text+ko) ==== @@ -12,7 +12,6 @@ file.c \ global.c \ match.c \ - msg.c \ pen.c \ pkgwrap.c \ plist.c \ From owner-p4-projects@FreeBSD.ORG Mon May 17 10:41:22 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D4201065673; Mon, 17 May 2010 10:41:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C5FEC106566C for ; Mon, 17 May 2010 10:41:21 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B459E8FC12 for ; Mon, 17 May 2010 10:41:21 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4HAfLlG000118 for ; Mon, 17 May 2010 10:41:21 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4HAfLiW000116 for perforce@freebsd.org; Mon, 17 May 2010 10:41:21 GMT (envelope-from zec@fer.hr) Date: Mon, 17 May 2010 10:41:21 GMT Message-Id: <201005171041.o4HAfLiW000116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178384 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 10:41:22 -0000 http://p4web.freebsd.org/@@178384?ac=10 Change 178384 by zec@zec_nxlab on 2010/05/17 10:40:26 By looking at the original ip_mroute_modevent(), it seems that X_ip_mrouter_done() should be called in from vnet_mroute_uninit() just in case, even as it should be already automatically invoked at the time V_ip_mroute socket gets closed. NB vnet_mroute_uninit() can never be invoked until V_ip_mroute is closed, so this seems redundant to me, but we keep it to remain 100% compatible with nooptions VIMAGE builds. Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#36 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#36 (text+ko) ==== @@ -2837,6 +2837,7 @@ vnet_mroute_uninit(const void *unused __unused) { + X_ip_mrouter_done(); FREE(V_nexpire, M_MRTABLE); V_nexpire = NULL; } From owner-p4-projects@FreeBSD.ORG Mon May 17 10:43:24 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF7F61065674; Mon, 17 May 2010 10:43:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B9741065673 for ; Mon, 17 May 2010 10:43:24 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 499118FC12 for ; Mon, 17 May 2010 10:43:24 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4HAhNAQ000230 for ; Mon, 17 May 2010 10:43:23 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4HAhNEQ000228 for perforce@freebsd.org; Mon, 17 May 2010 10:43:23 GMT (envelope-from lz@FreeBSD.org) Date: Mon, 17 May 2010 10:43:23 GMT Message-Id: <201005171043.o4HAhNEQ000228@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178385 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 10:43:24 -0000 http://p4web.freebsd.org/@@178385?ac=10 Change 178385 by lz@gnehzuil-freebsd on 2010/05/17 10:43:11 Add two macros to operate tree lock. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#12 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#7 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#12 (text+ko) ==== @@ -247,11 +247,13 @@ bbp = (char *)bp->b_data; size = rp->rw_goal_size; - mtx_lock_spin(&fs->e2fs_rsv_lock); + /*mtx_lock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_LOCK(fs); /* If tree is empty, then try to alloc according to bpref */ if (RB_EMPTY(&fs->e2fs_rsv_tree)) { - mtx_unlock_spin(&fs->e2fs_rsv_lock); + /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_UNLOCK(fs); /* bpref is not in this cylinder group. * So try to allocate it in other group. */ @@ -295,7 +297,8 @@ if (ret < 0) { if (rp->rw_end != EXT2_RWI_NOT_ALLOCATED) ext2_remove_rsv_win(fs, rp); - mtx_unlock_spin(&fs->e2fs_rsv_lock); + /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_UNLOCK(fs); EXT2_LOCK(ump); if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) @@ -305,7 +308,8 @@ return 0; goto allocated1; } - mtx_unlock_spin(&fs->e2fs_rsv_lock); + /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_UNLOCK(fs); if (isclr(bbp, bpref) && bpref >= rp->rw_start && @@ -324,9 +328,11 @@ } if (loc == end) { - mtx_lock_spin(&fs->e2fs_rsv_lock); + /*mtx_lock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_LOCK(fs); ext2_remove_rsv_win(fs, rp); - mtx_unlock_spin(&fs->e2fs_rsv_lock); + /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_UNLOCK(fs); EXT2_LOCK(ump); if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) @@ -342,9 +348,11 @@ rp->rw_start = bpref + cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock; rp->rw_end = rp->rw_start + size - 1; rp->rw_alloc_hit = 0; - mtx_lock_spin(&fs->e2fs_rsv_lock); + /*mtx_lock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_LOCK(fs); ext2_add_rsv_win(fs, rp); - mtx_unlock_spin(&fs->e2fs_rsv_lock); + /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_UNLOCK(fs); allocated: rp->rw_alloc_hit = bpref - rp->rw_start + 1; @@ -383,9 +391,11 @@ goto gotit; } - mtx_lock_spin(&fs->e2fs_rsv_lock); + /*mtx_lock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_LOCK(fs); ext2_remove_rsv_win(fs, rp); - mtx_unlock_spin(&fs->e2fs_rsv_lock); + /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/ + EXT2_TREE_UNLOCK(fs); EXT2_LOCK(ump); if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#7 (text+ko) ==== @@ -38,6 +38,9 @@ #define EXT2_IRSV_LOCK(ip) mtx_lock(&ip->i_rsv_lock) #define EXT2_IRSV_UNLOCK(ip) mtx_unlock(&ip->i_rsv_lock) +#define EXT2_TREE_LOCK(fs) mtx_lock_spin(&fs->e2fs_rsv_lock); +#define EXT2_TREE_UNLOCK(fs) mtx_unlock_spin(&fs->e2fs_rsv_lock); + /* * Reservation window entry */ From owner-p4-projects@FreeBSD.ORG Mon May 17 10:48:30 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F339F1065675; Mon, 17 May 2010 10:48:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B701B106566C for ; Mon, 17 May 2010 10:48:29 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A2C598FC1B for ; Mon, 17 May 2010 10:48:29 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4HAmTQv000579 for ; Mon, 17 May 2010 10:48:29 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4HAmTvw000577 for perforce@freebsd.org; Mon, 17 May 2010 10:48:29 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 17 May 2010 10:48:29 GMT Message-Id: <201005171048.o4HAmTvw000577@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178386 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 10:48:30 -0000 http://p4web.freebsd.org/@@178386?ac=10 Change 178386 by gcooper@gcooper-bayonetta on 2010/05/17 10:47:46 1. Remove all remaining references to cleanup in libpkg and shove all cleanup calls to individual pkg_install applications. 2. Remove all unused functions. 3. Better style(9)-ize the headers and prototypes. 1. is required so I can test via ctypes and so others can load libpkg without defining cleanup as an external function. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#14 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pen.c#2 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#8 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/lib/libpkg/tests/test_unpack.py#2 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/extract.c#3 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/perform.c#11 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#27 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/pl.c#3 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/delete/perform.c#5 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/info/perform.c#6 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/info/show.c#3 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/updating/main.c#8 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/perform.c#10 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#14 (text+ko) ==== @@ -184,32 +184,41 @@ return NULL; } +/* + * Fetch the metadata for a package contained in +CONTENTS. + * + * Return NULL on failure, or a buffer corresponding to the +CONTENTS file on + * success. + * + * cleanup() should be called if this call fails. + */ char * fileGetContents(const char *fname) { - char *contents; - struct stat sb; - int fd; + struct stat sb; + char *contents = NULL; + int fd = -1; + + if (stat(fname, &sb) == FAIL) { + warn("%s: can't stat '%s'", __func__, fname); + } else { + contents = (char *)malloc(sb.st_size + 1); + fd = open(fname, O_RDONLY, 0); + if (fd == -1) + warn("%s: unable to open '%s' for reading", + __func__, fname); + else if (read(fd, contents, sb.st_size) != sb.st_size) + warn("%s: short read on '%s' - did not get %lld bytes", + __func__, fname, (long long) sb.st_size); + } + + if (0 <= fd) + close(fd); + if (contents != NULL) + contents[sb.st_size] = '\0'; - if (stat(fname, &sb) == FAIL) { - cleanup(0); - errx(2, "%s: can't stat '%s'", __func__, fname); - } + return contents; - contents = (char *)malloc(sb.st_size + 1); - fd = open(fname, O_RDONLY, 0); - if (fd == FAIL) { - cleanup(0); - errx(2, "%s: unable to open '%s' for reading", __func__, fname); - } - if (read(fd, contents, sb.st_size) != sb.st_size) { - cleanup(0); - errx(2, "%s: short read on '%s' - did not get %lld bytes", __func__, - fname, (long long)sb.st_size); - } - close(fd); - contents[sb.st_size] = '\0'; - return contents; } /* @@ -247,96 +256,66 @@ return TRUE; } -/* Write the contents of "str" to a file */ -void +/* + * Write the contents of "str" to a file + * + * Return the number of bytes successfully written out to str or -1 on + * failure. + */ +size_t write_file(const char *name, const char *str) { - FILE *fp; - size_t len; + FILE *fp = NULL; + off_t written_len = -1; + size_t len; - fp = fopen(name, "w"); - if (!fp) { - cleanup(0); - errx(2, "%s: cannot fopen '%s' for writing", __func__, name); - } - len = strlen(str); - if (fwrite(str, 1, len, fp) != len) { - cleanup(0); - errx(2, "%s: short fwrite on '%s', tried to write %ld bytes", - __func__, name, (long)len); - } - if (fclose(fp)) { - cleanup(0); - errx(2, "%s: failure to fclose '%s'", __func__, name); - } -} + errno = 0; -void -copy_file(const char *dir, const char *fname, const char *to) -{ - char cmd[FILENAME_MAX]; + fp = fopen(name, "w"); + if (fp == NULL) + warn("%s: cannot fopen '%s' for writing", __func__, name); + else { + len = strlen(str); + written_len = fwrite(str, 1, len, fp); + if ((len-written_len) != 0) + warn("%s: short fwrite on '%s', tried to write %ld " + "bytes", __func__, name, (long) len); - if (fname[0] == '/') - snprintf(cmd, FILENAME_MAX, "/bin/cp -r %s %s", fname, to); - else - snprintf(cmd, FILENAME_MAX, "/bin/cp -r %s/%s %s", dir, fname, to); - if (vsystem(cmd)) { - cleanup(0); - errx(2, "%s: could not perform '%s'", __func__, cmd); - } -} + if (fp != NULL) + if (fclose(fp) != 0) + warn("%s: failed to close file: '%s'", + __func__, name); + } -void -move_file(const char *dir, const char *fname, const char *tdir) -{ - char from[FILENAME_MAX]; - char to[FILENAME_MAX]; - - if (fname[0] == '/') - strncpy(from, fname, FILENAME_MAX); - else - snprintf(from, FILENAME_MAX, "%s/%s", dir, fname); + return (size_t) (errno == 0 && written_len > 0 ? written_len : -1); - snprintf(to, FILENAME_MAX, "%s/%s", tdir, fname); - - if (rename(from, to) == -1) { - if (vsystem("/bin/mv %s %s", from, to)) { - cleanup(0); - errx(2, "%s: could not move '%s' to '%s'", __func__, from, to); - } - } } /* - * Copy a hierarchy (possibly from dir) to the current directory, or - * if "to" is TRUE, from the current directory to a location someplace - * else. + * From a path specified by `from' to the path denoted as `to'. * - * Though slower, using tar to copy preserves symlinks and everything - * without me having to write some big hairy routine to do it. + * Returns 0 on success, -1 on failure. */ -void -copy_hierarchy(const char *dir, const char *fname, Boolean to) +int +move_file(const char *dir, const char *fname, const char *tdir) { - char cmd[FILENAME_MAX * 3]; + char from[FILENAME_MAX]; + char to[FILENAME_MAX]; + int rc; + + if (fname[0] == '/') + strncpy(from, fname, sizeof(from)); + else + snprintf(from, sizeof(from), "%s/%s", dir, fname); + + snprintf(to, FILENAME_MAX, "%s/%s", tdir, fname); + + if (rename(from, to) == 0 || vsystem("/bin/mv %s %s", from, to) == 0) + rc = 0; + else + rc = -1; - if (!to) { - /* If absolute path, use it */ - if (*fname == '/') - dir = "/"; - snprintf(cmd, FILENAME_MAX * 3, "/usr/bin/tar cf - -C %s %s | /usr/bin/tar xpf -", - dir, fname); - } - else - snprintf(cmd, FILENAME_MAX * 3, "/usr/bin/tar cf - %s | /usr/bin/tar xpf - -C %s", - fname, dir); -#ifdef DEBUG - printf("Using '%s' to copy trees.\n", cmd); -#endif - if (system(cmd)) { - cleanup(0); - errx(2, "%s: could not perform '%s'", __func__, cmd); - } + return rc; } #define EXTRACT_ARCHIVE_FLAGS (ARCHIVE_EXTRACT_OWNER |ARCHIVE_EXTRACT_PERM| \ ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pen.c#2 (text+ko) ==== @@ -21,13 +21,15 @@ #include __FBSDID("$FreeBSD: src/lib/libpkg/pen.c,v 1.1 2010/04/23 11:07:43 flz Exp $"); -#include "pkg.h" +#include +#include +#include #include +#include #include #include -#include -#include -#include + +#include "pkg.h" /* For keeping track of where we are */ static char PenLocation[FILENAME_MAX]; @@ -42,33 +44,30 @@ static char * find_play_pen(char *pen, off_t sz) { - char *cp; - struct stat sb; - char humbuf[6]; + char *cp; + struct stat sb; - if (pen[0] && isdir(dirname(pen)) == TRUE && (min_free(dirname(pen)) >= sz)) + if (pen[0] != '\0' && isdir(dirname(pen)) == TRUE && + (min_free(dirname(pen)) >= sz)) + return pen; + else if ((cp = getenv("PKG_TMPDIR")) != NULL && stat(cp, &sb) == 0 && + (min_free(cp) >= sz)) + sprintf(pen, "%s/instmp.XXXXXX", cp); + else if ((cp = getenv("TMPDIR")) != NULL && stat(cp, &sb) == 0 && + (min_free(cp) >= sz)) + sprintf(pen, "%s/instmp.XXXXXX", cp); + else if (stat("/var/tmp", &sb) == 0 && min_free("/var/tmp") >= sz) + strcpy(pen, "/var/tmp/instmp.XXXXXX"); + else if (stat("/tmp", &sb) == 0 && min_free("/tmp") >= sz) + strcpy(pen, "/tmp/instmp.XXXXXX"); + else if ((stat("/usr/tmp", &sb) == 0 || + mkdir("/usr/tmp", 01777) == SUCCESS) && min_free("/usr/tmp") >= sz) + strcpy(pen, "/usr/tmp/instmp.XXXXXX"); + else { + errno = ENOSPC; + return NULL; + } return pen; - else if ((cp = getenv("PKG_TMPDIR")) != NULL && stat(cp, &sb) != FAIL && (min_free(cp) >= sz)) - sprintf(pen, "%s/instmp.XXXXXX", cp); - else if ((cp = getenv("TMPDIR")) != NULL && stat(cp, &sb) != FAIL && (min_free(cp) >= sz)) - sprintf(pen, "%s/instmp.XXXXXX", cp); - else if (stat("/var/tmp", &sb) != FAIL && min_free("/var/tmp") >= sz) - strcpy(pen, "/var/tmp/instmp.XXXXXX"); - else if (stat("/tmp", &sb) != FAIL && min_free("/tmp") >= sz) - strcpy(pen, "/tmp/instmp.XXXXXX"); - else if ((stat("/usr/tmp", &sb) == SUCCESS || mkdir("/usr/tmp", 01777) == SUCCESS) && min_free("/usr/tmp") >= sz) - strcpy(pen, "/usr/tmp/instmp.XXXXXX"); - else { - cleanup(0); - humanize_number(humbuf, sizeof humbuf, sz, "", HN_AUTOSCALE, - HN_NOSPACE); - errx(2, -"%s: can't find enough temporary space to extract the files, please set your\n" -"PKG_TMPDIR environment variable to a location with at least %s bytes\n" -"free", __func__, humbuf); - return NULL; - } - return pen; } #define MAX_STACK 20 @@ -103,67 +102,61 @@ const char * make_playpen(char *pen, off_t sz) { - char humbuf[6]; - char cwd[FILENAME_MAX]; + char cwd[FILENAME_MAX]; + const char *pen_location = NULL; - if (!find_play_pen(pen, sz)) - return NULL; + if (find_play_pen(pen, sz) != NULL && mkdtemp(pen) == 0) { - if (!mkdtemp(pen)) { - cleanup(0); - errx(2, "%s: can't mktemp '%s'", __func__, pen); - } + if (min_free(pen) < sz) { + rmdir(pen); + errno = ENOSPC; + } + else if (getcwd(cwd, FILENAME_MAX) == 0 && chdir(pen) == 0) { + strcpy(PenLocation, pen); + pen_location = pushPen(cwd); + } - humanize_number(humbuf, sizeof humbuf, sz, "", HN_AUTOSCALE, HN_NOSPACE); + } - if (min_free(pen) < sz) { - rmdir(pen); - cleanup(0); - errx(2, "%s: not enough free space to create '%s'.\n" - "Please set your PKG_TMPDIR environment variable to a location\n" - "with at least %s and try the command again", - __func__, humbuf, pen); - } + return pen_location; - if (!getcwd(cwd, FILENAME_MAX)) { - upchuck("getcwd"); - return NULL; - } - - if (chdir(pen) == FAIL) { - cleanup(0); - errx(2, "%s: can't chdir to '%s'", __func__, pen); - } - - strcpy(PenLocation, pen); - return pushPen(cwd); } /* Convenience routine for getting out of playpen */ int leave_playpen() { - static char left[FILENAME_MAX]; - void (*oldsig)(int); + void (*oldsig)(int); + static char left[FILENAME_MAX]; + int rc = -1; + + if (PenLocation[0] == '\0') + rc = 0; + else { + + /* Don't interrupt while we're cleaning up */ + oldsig = signal(SIGINT, SIG_IGN); + strcpy(left, PenLocation); + popPen(PenLocation); + + if (chdir(PenLocation) == 0) { + + if (left[0] == '/' && + vsystem("/bin/rm -rf %s", left)) { + warnx("couldn't remove temporary dir '%s'", + left); + } + + rc = 1; - if (!PenLocation[0]) - return 0; + } - /* Don't interrupt while we're cleaning up */ - oldsig = signal(SIGINT, SIG_IGN); - strcpy(left, PenLocation); - popPen(PenLocation); + signal(SIGINT, oldsig); - if (chdir(PenLocation) == FAIL) { - cleanup(0); - errx(2, "%s: can't chdir back to '%s'", __func__, PenLocation); - } + } - if (left[0] == '/' && vsystem("/bin/rm -rf %s", left)) - warnx("couldn't remove temporary dir '%s'", left); - signal(SIGINT, oldsig); + return rc; - return 1; } off_t ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#8 (text+ko) ==== @@ -155,7 +155,6 @@ /* Misc */ int vsystem(const char *, ...); char *vpipe(const char *, ...); -void cleanup(int); const char *make_playpen(char *, off_t); char *where_playpen(void); int leave_playpen(void); @@ -183,22 +182,15 @@ const char *fileGetURL(const char *, const char *, int); char *fileFindByPath(const char *, const char *); char *fileGetContents(const char *); -void write_file(const char *, const char *); -void copy_file(const char *, const char *, const char *); -void move_file(const char *, const char *, const char *); -void copy_hierarchy(const char *, const char *, Boolean); +size_t write_file(const char *, const char *); +int move_file(const char *, const char *, const char *); int delete_hierarchy(const char *, Boolean, Boolean); char* unpack_to_buffer(const char *, const char *); int unpack_to_disk(const char *, const char *); int unpack_to_fd(const char *, const char *); -void format_cmd(char *, int, const char *, const char *, const char *); +void format_cmd(char *, int, const char *, const char *, + const char *); -/* Msg */ -void upchuck(const char *); -void barf(const char *, ...); -void whinge(const char *, ...); -Boolean y_or_n(Boolean, const char *, ...); - /* Packing list */ PackingList new_plist_entry(void); PackingList last_plist(Package *); @@ -211,8 +203,8 @@ void add_plist(Package *, plist_t, const char *); void add_plist_top(Package *, plist_t, const char *); void delete_plist(Package *pkg, Boolean all, plist_t type, const char *name); -void write_plist(Package *, FILE *); -void read_plist(Package *, int); +int write_plist(Package *, FILE *); +int read_plist(Package *, int); int plist_cmd(const char *, char **); int delete_package(Boolean, Boolean, Package *); Boolean make_preserve_name(char *, int, const char *, const char *); ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/lib/libpkg/tests/test_unpack.py#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/usr/bin/env python import ctypes -#from nose import import tarfile import tempfile import tests ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/extract.c#3 (text+ko) ==== @@ -26,6 +26,7 @@ #include #include "add.h" +extern void cleanup(int); #define STARTSTRING "/usr/bin/tar cf -" #define TOOBIG(str) \ ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/perform.c#11 (text+ko) ==== @@ -30,10 +30,12 @@ #include #include -static int pkg_do(char *); -static int sanity_check(char *); -static char LogDir[FILENAME_MAX]; -static int zapLogDir; /* Should we delete LogDir? */ +void cleanup(int); +static int pkg_do(char *); +static int sanity_check(char *); + +static char LogDir[FILENAME_MAX]; +static int zapLogDir; /* Should we delete LogDir? */ int pkg_perform(char **pkgs) @@ -74,6 +76,7 @@ int cfile; int code; int inPlace, conflictsfound, errcode; + int rc; /* support for separate pre/post install scripts */ int new_m = 0; int fd; @@ -95,7 +98,8 @@ warnx("pkg_add in SLAVE mode can't chdir to %s", playpen); return 1; } - read_plist(&Plist, fileno(stdin)); + if (read_plist(&Plist, fileno(stdin)) != 0) + return 1; where_to = playpen; } /* Nope - do it now */ @@ -104,6 +108,7 @@ if (isURL(pkg)) { if (!(where_to = fileGetURL(NULL, pkg, KeepPackage))) { warnx("unable to fetch '%s' by URL", pkg); + cleanup(0); return 1; } cfile = open(CONTENTS_FNAME, O_RDONLY); @@ -113,8 +118,10 @@ CONTENTS_FNAME); goto bomb; } - read_plist(&Plist, cfile); + rc = read_plist(&Plist, cfile); close(cfile); + if (rc != 0) + goto bomb; } else { @@ -133,7 +140,7 @@ goto bomb; } } - if (!(where_to = make_playpen(playpen, sb.st_size * 4))) + if ((where_to = make_playpen(playpen, sb.st_size * 4)) == NULL) errx(1, "unable to make playpen for %lld bytes", (long long)sb.st_size * 4); /* Since we can call ourselves recursively, keep notes on where we came from */ if (!getenv("_TOP")) @@ -155,8 +162,10 @@ CONTENTS_FNAME); goto bomb; } - read_plist(&Plist, cfile); + rc = read_plist(&Plist, cfile); close(cfile); + if (rc != 0) + goto bomb; /* Extract directly rather than moving? Oh goodie! */ if (find_plist_option(&Plist, "extract-in-place")) { @@ -217,7 +226,8 @@ /* If we're running in MASTER mode, just output the plist and return */ if (AddMode == MASTER) { printf("%s\n", where_playpen()); - write_plist(&Plist, stdout); + if (write_plist(&Plist, stdout) != 0) + return 1; return 0; } } @@ -369,26 +379,37 @@ ++code; } } - else if ((cp = fileGetURL(pkg, p->name, KeepPackage)) != NULL) { - if (Verbose) - printf("Finished loading %s via a URL\n", p->name); - if (!fexists(CONTENTS_FNAME)) { - warnx("autoloaded package %s has no %s file?", + else { + + if ((cp = fileGetURL(pkg, p->name, KeepPackage)) == NULL) { + cleanup(0); + warnx("Getting pkg '%s' by URL failed", pkg); + goto bomb; + } else { + + if (Verbose) + printf("Finished loading %s via a URL\n", p->name); + if (!fexists(CONTENTS_FNAME)) { + warnx("autoloaded package %s has no %s file?", p->name, CONTENTS_FNAME); - if (!Force) - ++code; - } - else if (vsystem("(pwd; /bin/cat " CONTENTS_FNAME ") | %s %s %s %s -S", PkgAddCmd, Verbose ? "-v" : "", PrefixRecursive ? prefixArg : "", KeepPackage ? "-K" : "")) { - warnx("pkg_add of dependency '%s' failed%s", + if (!Force) + ++code; + } + else if (vsystem("(pwd; /bin/cat " CONTENTS_FNAME ") | %s %s %s %s -S", PkgAddCmd, Verbose ? "-v" : "", PrefixRecursive ? prefixArg : "", KeepPackage ? "-K" : "")) { + warnx("pkg_add of dependency '%s' failed%s", p->name, Force ? " (proceeding anyway)" : "!"); - if (!Force) - ++code; + if (!Force) + ++code; + } + else if (Verbose) + printf("\t'%s' loaded successfully.\n", p->name); + /* Nuke the temporary playpen */ + leave_playpen(); + } - else if (Verbose) - printf("\t'%s' loaded successfully.\n", p->name); - /* Nuke the temporary playpen */ - leave_playpen(); + } + } else { if (Verbose) @@ -491,10 +512,10 @@ /* Time to record the deed? */ if (!NoRecord && !Fake) { + FILE *contfile; char contents[FILENAME_MAX]; char **depnames = NULL, **deporigins = NULL, ***depmatches; - int i, dep_count = 0; - FILE *contfile; + int i, dep_count = 0, rc; if (getuid() != 0) warnx("not running as root - trying to record install anyway"); @@ -510,26 +531,38 @@ goto success; /* close enough for government work */ } /* Make sure pkg_info can read the entry */ + + /* XXX (gcooper) fix return code checks. */ fd = open(LogDir, O_RDWR); fstat(fd, &sb); fchmod(fd, sb.st_mode | S_IRALL | S_IXALL); /* be sure, chmod a+rx */ close(fd); - move_file(".", DESC_FNAME, LogDir); + if (move_file(".", DESC_FNAME, LogDir) == -1) { + cleanup(0); + errx(EXIT_FAILURE, "failed to move %s to %s", DESC_FNAME, LogDir); + } move_file(".", COMMENT_FNAME, LogDir); - if (fexists(INSTALL_FNAME)) - move_file(".", INSTALL_FNAME, LogDir); - if (fexists(POST_INSTALL_FNAME)) - move_file(".", POST_INSTALL_FNAME, LogDir); - if (fexists(DEINSTALL_FNAME)) - move_file(".", DEINSTALL_FNAME, LogDir); - if (fexists(POST_DEINSTALL_FNAME)) - move_file(".", POST_DEINSTALL_FNAME, LogDir); - if (fexists(REQUIRE_FNAME)) - move_file(".", REQUIRE_FNAME, LogDir); - if (fexists(DISPLAY_FNAME)) - move_file(".", DISPLAY_FNAME, LogDir); - if (fexists(MTREE_FNAME)) - move_file(".", MTREE_FNAME, LogDir); + +#define MOVE_IF_PRESENT(file) \ + do { \ + if (fexists(file)) { \ + if (move_file(".", file, LogDir) == -1) { \ + cleanup(0); \ + errx(EXIT_FAILURE, \ + "failed to move '%s' to '%s'", \ + file, LogDir); \ + } \ + } \ + } while (0) + + MOVE_IF_PRESENT(INSTALL_FNAME); + MOVE_IF_PRESENT(POST_INSTALL_FNAME); + MOVE_IF_PRESENT(POST_INSTALL_FNAME); + MOVE_IF_PRESENT(DEINSTALL_FNAME); + MOVE_IF_PRESENT(POST_DEINSTALL_FNAME); + MOVE_IF_PRESENT(REQUIRE_FNAME); + MOVE_IF_PRESENT(DISPLAY_FNAME); + MOVE_IF_PRESENT(MTREE_FNAME); sprintf(contents, "%s/%s", LogDir, CONTENTS_FNAME); contfile = fopen(contents, "w"); if (!contfile) { @@ -537,8 +570,10 @@ contents); goto success; /* can't log, but still keep pkg */ } - write_plist(&Plist, contfile); + rc = write_plist(&Plist, contfile); fclose(contfile); + if (rc != 0) + goto fail; for (p = Plist.head; p ; p = p->next) { char *deporigin; ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#27 (text+ko) ==== @@ -46,12 +46,14 @@ #include #include "create.h" -static void sanity_check(void); +void cleanup(int); + +static void sanity_check(void); static const char* add_file(struct archive *, const char *, const char *, const int); -static void make_dist(const char *, const char *, const char *, Package *); -static int create_from_installed_recursive(const char *, const char *); -static int create_from_installed(const char *, const char *, const char *); +static void make_dist(const char *, const char *, const char *, Package *); +static int create_from_installed_recursive(const char *, const char *); +static int create_from_installed(const char *, const char *, const char *); int pkg_perform(char **pkgs) @@ -63,6 +65,7 @@ char *cp; int len; int pkg_in; + int rc; const char *suf; /* Preliminary setup */ @@ -219,7 +222,10 @@ } /* Slurp in the packing list */ - read_plist(&plist, pkg_in); + if (read_plist(&plist, pkg_in) != 0) { + close(pkg_in); + return FALSE; + } /* Prefix should add an @cwd to the packing list */ if (Prefix) @@ -250,12 +256,14 @@ */ if (PlistOnly) { check_list(home, &plist); - write_plist(&plist, stdout); - exit(0); + exit(write_plist(&plist, stdout) == 0 ? 0 : 1); } /* Make a directory to stomp around in */ - home = make_playpen(PlayPen, 0); + if ((home = make_playpen(PlayPen, 0)) == NULL) { + cleanup(0); + errx(EXIT_FAILURE, "failed to create a playpen"); + } signal(SIGINT, cleanup); signal(SIGHUP, cleanup); @@ -272,14 +280,24 @@ if (Prefix == NULL) add_plist(&plist, PLIST_CWD, "."); - write_file(COMMENT_FNAME, Comment); - add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, COMMENT_FNAME); - add_cksum(&plist, plist.tail, COMMENT_FNAME); - write_file(DESC_FNAME, Desc); - add_plist(&plist, PLIST_IGNORE, NULL); - add_plist(&plist, PLIST_FILE, DESC_FNAME); - add_cksum(&plist, plist.tail, DESC_FNAME); + if (write_file(COMMENT_FNAME, Comment) == 0) { + add_plist(&plist, PLIST_IGNORE, NULL); + add_plist(&plist, PLIST_FILE, COMMENT_FNAME); + add_cksum(&plist, plist.tail, COMMENT_FNAME); + } + else { + cleanup(0); + err(EXIT_FAILURE, "failed to write comment file"); + } + if (write_file(DESC_FNAME, Desc) == 0) { + add_plist(&plist, PLIST_IGNORE, NULL); + add_plist(&plist, PLIST_FILE, DESC_FNAME); + add_cksum(&plist, plist.tail, DESC_FNAME); + } + else { + cleanup(0); + err(EXIT_FAILURE, "failed to write description file"); + } if (Install != NULL) { add_plist(&plist, PLIST_IGNORE, NULL); @@ -323,12 +341,15 @@ fp = fopen(CONTENTS_FNAME, "w"); if (!fp) { cleanup(0); - err(2, "%s: can't open file %s for writing", __func__, CONTENTS_FNAME); + errx(2, "%s: can't open file %s for writing", __func__, CONTENTS_FNAME); } - write_plist(&plist, fp); + rc = write_plist(&plist, fp); if (fclose(fp)) { cleanup(0); - err(2, "%s: error occurred when closing %s", __func__, CONTENTS_FNAME); + errx(2, "%s: error occurred when closing %s", __func__, CONTENTS_FNAME); + } else if (rc != 0) { + cleanup(0); + errx(2, "%s: couldn't write to %s", __func__, CONTENTS_FNAME); } /* And stick it into a tarball */ @@ -775,82 +796,96 @@ Package plist; PackingList p; char tmp[PATH_MAX]; - int fd; - int rval; + int fd, rc; + int rval = FALSE; if (!create_from_installed(InstalledPkg, pkg, suf)) - return FALSE; + return rval; snprintf(tmp, sizeof(tmp), "%s/%s/%s", LOG_DIR, InstalledPkg, CONTENTS_FNAME); if (!fexists(tmp)) { warnx("can't find package '%s' installed!", InstalledPkg); - return FALSE; + return rval; } /* Suck in the contents list */ plist.head = plist.tail = NULL; fd = open(tmp, O_RDONLY); if (fd == -1) { warn("unable to open %s file", tmp); - return FALSE; + return rval; } - read_plist(&plist, fd); + rc = read_plist(&plist, fd); close(fd); - rval = TRUE; - for (p = plist.head; p != NULL && rval == TRUE; p = p->next) { - if (p->type == PLIST_PKGDEP) { - if (Verbose) - printf("Creating package %s\n", p->name); - if (!create_from_installed(p->name, p->name, suf)) - rval = FALSE; + if (rc == 0) { + + rval = TRUE; + + for (p = plist.head; p != NULL && rval == TRUE; p = p->next) { + + if (p->type == PLIST_PKGDEP) { + if (Verbose) + printf("Creating package %s\n", + p->name); + if (!create_from_installed(p->name, p->name, + suf)) + rval = FALSE; + } + } + + free_plist(&plist); + } - free_plist(&plist); + return rval; } static int create_from_installed(const char *ipkg, const char *pkg, const char *suf) { - int fd; - Package plist; - char homedir[MAXPATHLEN], log_dir[FILENAME_MAX]; + Package plist; + int fd, rc; + char homedir[MAXPATHLEN], log_dir[FILENAME_MAX]; + + snprintf(log_dir, sizeof(log_dir), "%s/%s", LOG_DIR, ipkg); + if (!fexists(log_dir)) { + warnx("can't find package '%s' installed!", ipkg); + return FALSE; + } + getcwd(homedir, sizeof(homedir)); + if (chdir(log_dir) == FAIL) { + warnx("can't change directory to '%s'!", log_dir); + return FALSE; + } + /* Suck in the contents list */ + plist.head = plist.tail = NULL; + fd = open(CONTENTS_FNAME, O_RDONLY); + if (fd == -1) { + warnx("unable to open %s file", CONTENTS_FNAME); + return FALSE; + } + rc = read_plist(&plist, fd); + (void) close(fd); - snprintf(log_dir, sizeof(log_dir), "%s/%s", LOG_DIR, ipkg); - if (!fexists(log_dir)) { - warnx("can't find package '%s' installed!", ipkg); - return FALSE; - } - getcwd(homedir, sizeof(homedir)); - if (chdir(log_dir) == FAIL) { - warnx("can't change directory to '%s'!", log_dir); - return FALSE; - } - /* Suck in the contents list */ - plist.head = plist.tail = NULL; - fd = open(CONTENTS_FNAME, O_RDONLY); - if (fd == -1) { - warnx("unable to open %s file", CONTENTS_FNAME); - return FALSE; - } - read_plist(&plist, fd); - (void) close(fd); + if (rc != 0) + return FALSE; - Install = isfile(INSTALL_FNAME) ? (char *)INSTALL_FNAME : NULL; - PostInstall = isfile(POST_INSTALL_FNAME) ? - (char *)POST_INSTALL_FNAME : NULL; - DeInstall = isfile(DEINSTALL_FNAME) ? (char *)DEINSTALL_FNAME : NULL; - PostDeInstall = isfile(POST_DEINSTALL_FNAME) ? - (char *)POST_DEINSTALL_FNAME : NULL; - Require = isfile(REQUIRE_FNAME) ? (char *)REQUIRE_FNAME : NULL; - Display = isfile(DISPLAY_FNAME) ? (char *)DISPLAY_FNAME : NULL; - Mtree = isfile(MTREE_FNAME) ? (char *)MTREE_FNAME : NULL; + Install = isfile(INSTALL_FNAME) ? (char *)INSTALL_FNAME : NULL; + PostInstall = isfile(POST_INSTALL_FNAME) ? + (char *)POST_INSTALL_FNAME : NULL; + DeInstall = isfile(DEINSTALL_FNAME) ? (char *)DEINSTALL_FNAME : NULL; + PostDeInstall = isfile(POST_DEINSTALL_FNAME) ? + (char *)POST_DEINSTALL_FNAME : NULL; + Require = isfile(REQUIRE_FNAME) ? (char *)REQUIRE_FNAME : NULL; + Display = isfile(DISPLAY_FNAME) ? (char *)DISPLAY_FNAME : NULL; + Mtree = isfile(MTREE_FNAME) ? (char *)MTREE_FNAME : NULL; - make_dist(homedir, pkg, suf, &plist); + make_dist(homedir, pkg, suf, &plist); - free_plist(&plist); - if (chdir(homedir) == FAIL) { - warnx("can't change directory to '%s'!", homedir); - return FALSE; - } - return TRUE; + free_plist(&plist); + if (chdir(homedir) == FAIL) { + warnx("can't change directory to '%s'!", homedir); + return FALSE; + } + return TRUE; } ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/pl.c#3 (text+ko) ==== @@ -21,11 +21,15 @@ #include __FBSDID("$FreeBSD: src/usr.sbin/pkg_install/create/pl.c,v 1.29 2010/04/23 11:07:43 flz Exp $"); -#include -#include "create.h" +#include #include #include #include +#include + +#include "create.h" + +extern void cleanup(int); /* Add an MD5 checksum entry for a file or link */ void ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/delete/perform.c#5 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 17 11:00:43 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 850461065672; Mon, 17 May 2010 11:00:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 30F71106564A for ; Mon, 17 May 2010 11:00:43 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1D2E08FC15 for ; Mon, 17 May 2010 11:00:43 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4HB0hHD001526 for ; Mon, 17 May 2010 11:00:43 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4HB0gY5001524 for perforce@freebsd.org; Mon, 17 May 2010 11:00:42 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 17 May 2010 11:00:42 GMT Message-Id: <201005171100.o4HB0gY5001524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178387 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 11:00:43 -0000 http://p4web.freebsd.org/@@178387?ac=10 Change 178387 by gcooper@gcooper-bayonetta on 2010/05/17 10:59:57 The semantic of PASS / FAIL has multiple meanings with multiple C apis, so let's use the appropriate return codes instead. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#15 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/match.c#2 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pen.c#3 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#9 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#4 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/extract.c#4 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/futil.c#7 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/perform.c#12 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#28 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/delete/perform.c#6 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/info/perform.c#7 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/perform.c#11 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#15 (text+ko) ==== @@ -51,9 +51,9 @@ { struct stat sb; - if (lstat(fname, &sb) != FAIL && S_ISDIR(sb.st_mode)) + if (lstat(fname, &sb) == 0 && S_ISDIR(sb.st_mode)) return TRUE; - else if (lstat(strconcat(fname, "/."), &sb) != FAIL && S_ISDIR(sb.st_mode)) + else if (lstat(strconcat(fname, "/."), &sb) == 0 && S_ISDIR(sb.st_mode)) return TRUE; else return FALSE; @@ -90,7 +90,7 @@ isfile(const char *fname) { struct stat sb; - if (stat(fname, &sb) != FAIL && S_ISREG(sb.st_mode)) + if (stat(fname, &sb) == 0 && S_ISREG(sb.st_mode)) return TRUE; return FALSE; } @@ -104,7 +104,7 @@ isemptyfile(const char *fname) { struct stat sb; - if (stat(fname, &sb) != FAIL && S_ISREG(sb.st_mode)) { + if (stat(fname, &sb) == 0 && S_ISREG(sb.st_mode)) { if (sb.st_size != 0) return FALSE; } @@ -116,7 +116,7 @@ issymlink(const char *fname) { struct stat sb; - if (lstat(fname, &sb) != FAIL && S_ISLNK(sb.st_mode)) + if (lstat(fname, &sb) == 0 && S_ISLNK(sb.st_mode)) return TRUE; return FALSE; } @@ -199,7 +199,7 @@ char *contents = NULL; int fd = -1; - if (stat(fname, &sb) == FAIL) { + if (stat(fname, &sb) == -1) { warn("%s: can't stat '%s'", __func__, fname); } else { contents = (char *)malloc(sb.st_size + 1); ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/match.c#2 (text+ko) ==== @@ -379,14 +379,14 @@ asprintf(&buf, "%s/%s", LOG_DIR, name); if (buf == NULL) goto errout; - if (!isdir(buf) || access(buf, R_OK) == FAIL) { + if (!isdir(buf) || access(buf, R_OK) == -1) { result = 0; } else { asprintf(&buf2, "%s/%s", buf, CONTENTS_FNAME); if (buf2 == NULL) goto errout; - if (!isfile(buf2) || access(buf2, R_OK) == FAIL) + if (!isfile(buf2) || access(buf2, R_OK) == -1) result = -1; else result = 1; ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pen.c#3 (text+ko) ==== @@ -61,7 +61,7 @@ else if (stat("/tmp", &sb) == 0 && min_free("/tmp") >= sz) strcpy(pen, "/tmp/instmp.XXXXXX"); else if ((stat("/usr/tmp", &sb) == 0 || - mkdir("/usr/tmp", 01777) == SUCCESS) && min_free("/usr/tmp") >= sz) + mkdir("/usr/tmp", 01777) == 0) && min_free("/usr/tmp") >= sz) strcpy(pen, "/usr/tmp/instmp.XXXXXX"); else { errno = ENOSPC; ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#9 (text+ko) ==== @@ -42,8 +42,6 @@ #include /* Macros */ -#define SUCCESS (0) -#define FAIL (-1) #ifndef TRUE #define TRUE (1) ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#4 (text+ko) ==== @@ -257,7 +257,7 @@ else if (!strcmp(cmd, "option")) return PLIST_OPTION; else - return FAIL; + return -1; } /* Read a packing list from a file */ @@ -289,7 +289,7 @@ goto bottom; } cmd = plist_cmd(pline + 1, &cp); - if (cmd == FAIL) { + if (cmd == -1) { warnx("%s: unknown command '%s' (package tools out of " "date?)", __func__, pline); goto bottom; @@ -299,7 +299,7 @@ if (cmd == PLIST_PKGDEP) { warnx("corrupted record (pkgdep line without " "argument), ignoring"); - cmd = FAIL; + cmd = -1; } goto bottom; } @@ -459,7 +459,7 @@ { PackingList p; const char *Where = ".", *last_file = ""; - Boolean fail = SUCCESS; + Boolean fail = FALSE; Boolean preserve; char tmp[FILENAME_MAX], *name = NULL; char *prefix = NULL; @@ -489,7 +489,7 @@ printf("Execute '%s'\n", tmp); if (!Fake && system(tmp)) { warnx("unexec command for '%s' failed", tmp); - fail = FAIL; + fail = -1; } break; @@ -524,7 +524,7 @@ warnx("'%s' fails original MD5 checksum - %s", tmp, Force ? "deleted anyway." : "not deleted."); if (!Force) { - fail = FAIL; + fail = -1; continue; } } @@ -534,7 +534,7 @@ printf("Delete file %s\n", tmp); if (!Fake) { if (delete_hierarchy(tmp, ign_err, nukedirs)) - fail = FAIL; + fail = -1; if (preserve && name) { char tmp2[FILENAME_MAX]; @@ -561,7 +561,7 @@ printf("Delete directory %s\n", tmp); if (!Fake && delete_hierarchy(tmp, ign_err, FALSE)) { warnx("unable to completely remove directory '%s'", tmp); - fail = FAIL; + fail = -1; } } last_file = p->name; ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/extract.c#4 (text+ko) ==== @@ -226,7 +226,7 @@ printf("extract: CWD to %s\n", p->name); PUSHOUT(Directory); if (strcmp(p->name, ".")) { - if (!Fake && make_hierarchy(p->name) == FAIL) { + if (!Fake && make_hierarchy(p->name) == -1) { cleanup(0); errx(2, "%s: unable to cwd to '%s'", __func__, p->name); } ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/futil.c#7 (text+ko) ==== @@ -46,14 +46,14 @@ if (!isdir(dir)) { if (cp2) *cp2 = '/'; - return FAIL; + return -1; } } else { if (mkdir(dir, 0777) < 0) { if (cp2) *cp2 = '/'; - return FAIL; + return -1; } apply_perms(NULL, dir); } @@ -63,7 +63,7 @@ cp1 = cp2 + 1; } } - return SUCCESS; + return 0; } /* Using permission defaults, apply them as necessary */ ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/perform.c#12 (text+ko) ==== @@ -94,7 +94,7 @@ if (!pkg) { fgets(playpen, FILENAME_MAX, stdin); playpen[strlen(playpen) - 1] = '\0'; /* pesky newline! */ - if (chdir(playpen) == FAIL) { + if (chdir(playpen) == -1) { warnx("pkg_add in SLAVE mode can't chdir to %s", playpen); return 1; } @@ -135,7 +135,7 @@ extract_whole_archive_from_stdin = TRUE; sb.st_size = 100000; /* Make up a plausible average size */ } else { - if (stat(pkg, &sb) == FAIL) { + if (stat(pkg, &sb) == -1) { warnx("can't stat package file '%s'", pkg); goto bomb; } ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#28 (text+ko) ==== @@ -853,7 +853,7 @@ return FALSE; } getcwd(homedir, sizeof(homedir)); - if (chdir(log_dir) == FAIL) { + if (chdir(log_dir) == -1) { warnx("can't change directory to '%s'!", log_dir); return FALSE; } @@ -883,7 +883,7 @@ make_dist(homedir, pkg, suf, &plist); free_plist(&plist); - if (chdir(homedir) == FAIL) { + if (chdir(homedir) == -1) { warnx("can't change directory to '%s'!", homedir); return FALSE; } ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/delete/perform.c#6 (text+ko) ==== @@ -172,7 +172,7 @@ errx(2, "%s: unable to get current working directory!", __func__); } - if (chdir(LogDir) == FAIL) { + if (chdir(LogDir) == -1) { warnx("unable to change directory to %s! deinstall failed", LogDir); return 1; } @@ -313,7 +313,7 @@ } } - if (chdir(home) == FAIL) { + if (chdir(home) == -1) { cleanup(0); errx(2, "%s: unable to return to working directory %s!", __func__, home); @@ -323,12 +323,12 @@ * Some packages aren't packed right, so we need to just ignore * delete_package()'s status. Ugh! :-( */ - if (delete_package(FALSE, CleanDirs, &Plist) == FAIL) + if (delete_package(FALSE, CleanDirs, &Plist) == -1) warnx( "couldn't entirely delete package (perhaps the packing list is\n" "incorrectly specified?)"); - if (chdir(LogDir) == FAIL) { + if (chdir(LogDir) == -1) { warnx("unable to change directory to %s! deinstall failed", LogDir); return 1; } @@ -348,7 +348,7 @@ } } - if (chdir(home) == FAIL) { + if (chdir(home) == -1) { cleanup(0); errx(2, "%s: unable to return to working directory %s!", __func__, home); @@ -409,7 +409,7 @@ STAILQ_FOREACH(rb_entry, rb_list, link) if (strcmp(rb_entry->pkgname, pkgname)) /* no match */ fputs(rb_entry->pkgname, fpwr), putc('\n', fpwr); - if (fchmod(s, 0644) == FAIL) { + if (fchmod(s, 0644) == -1) { warnx("error changing permission of temp file '%s'", ftmp); fclose(fpwr); goto cleanexit; ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/info/perform.c#7 (text+ko) ==== @@ -136,7 +136,7 @@ * compress an average of 75%, but we're only unpacking the + files * to be very optimistic. */ - if (stat(fname, &sb) == FAIL) { + if (stat(fname, &sb) == -1) { warnx("can't stat package file '%s'", fname); code = 1; goto bail; @@ -166,7 +166,7 @@ return 1; } sprintf(log_dir, "%s/%s", LOG_DIR, pkg); - if (chdir(log_dir) == FAIL) { + if (chdir(log_dir) == -1) { warnx("can't change directory to '%s'!", log_dir); return 1; } ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/perform.c#11 (text+ko) ==== @@ -176,7 +176,7 @@ */ if (plist.origin != NULL && !UseINDEXOnly) { snprintf(tmp, PATH_MAX, "%s/%s", PORTS_DIR, plist.origin); - if (isdir(tmp) && chdir(tmp) != FAIL && isfile("Makefile")) { + if (isdir(tmp) && chdir(tmp) == 0 && isfile("Makefile")) { if ((latest = vpipe("/usr/bin/make -V PKGNAME", tmp)) == NULL) warnx("Failed to get PKGNAME from %s/Makefile!", tmp); else From owner-p4-projects@FreeBSD.ORG Mon May 17 13:20:16 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53FD81065737; Mon, 17 May 2010 13:20:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 187BE106572E for ; Mon, 17 May 2010 13:20:16 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 064BE8FC1C for ; Mon, 17 May 2010 13:20:16 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4HDKFYt025623 for ; Mon, 17 May 2010 13:20:15 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4HDKFYk025621 for perforce@freebsd.org; Mon, 17 May 2010 13:20:15 GMT (envelope-from zec@fer.hr) Date: Mon, 17 May 2010 13:20:15 GMT Message-Id: <201005171320.o4HDKFYk025621@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178390 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 13:20:16 -0000 http://p4web.freebsd.org/@@178390?ac=10 Change 178390 by zec@zec_nxlab on 2010/05/17 13:20:11 Virtualize ip_mrouting timers. The current code couldn't work properly because with each vnet it was stomping over same global callout handlers. Eventhandler for ifnet_departure_event must be registered and deregistered only once in modevent handler, not once for each vnet. Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#37 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#37 (text+ko) ==== @@ -191,7 +191,9 @@ static eventhandler_tag if_detach_event_tag = NULL; -static struct callout expire_upcalls_ch; +static VNET_DEFINE(struct callout, expire_upcalls_ch); +#define V_expire_upcalls_ch VNET(expire_upcalls_ch) + #define EXPIRE_TIMEOUT (hz / 4) /* 4x / second */ #define UPCALL_EXPIRE 6 /* number of timeouts */ @@ -206,7 +208,8 @@ #define BW_METER_BUCKETS 1024 static VNET_DEFINE(struct bw_meter*, bw_meter_timers[BW_METER_BUCKETS]); #define V_bw_meter_timers VNET(bw_meter_timers) -static struct callout bw_meter_ch; +static VNET_DEFINE(struct callout, bw_meter_ch); +#define V_bw_meter_ch VNET(bw_meter_ch) #define BW_METER_PERIOD (hz) /* periodical handling of bw meters */ /* @@ -217,7 +220,9 @@ #define V_bw_upcalls VNET(bw_upcalls) static VNET_DEFINE(u_int, bw_upcalls_n); /* # of pending upcalls */ #define V_bw_upcalls_n VNET(bw_upcalls_n) -static struct callout bw_upcalls_ch; +static VNET_DEFINE(struct callout, bw_upcalls_ch); +#define V_bw_upcalls_ch VNET(bw_upcalls_ch) + #define BW_UPCALLS_PERIOD (hz) /* periodical flush of bw upcalls */ static VNET_DEFINE(struct pimstat, pimstat); @@ -605,12 +610,12 @@ pim_assert_enabled = 0; mrt_api_config = 0; - callout_init(&expire_upcalls_ch, CALLOUT_MPSAFE); + callout_init(&V_expire_upcalls_ch, CALLOUT_MPSAFE); V_bw_upcalls_n = 0; - bzero((caddr_t)V_bw_meter_timers, sizeof(V_bw_meter_timers)); - callout_init(&bw_upcalls_ch, CALLOUT_MPSAFE); - callout_init(&bw_meter_ch, CALLOUT_MPSAFE); + bzero(V_bw_meter_timers, sizeof(V_bw_meter_timers)); + callout_init(&V_bw_upcalls_ch, CALLOUT_MPSAFE); + callout_init(&V_bw_meter_ch, CALLOUT_MPSAFE); } static void @@ -686,20 +691,14 @@ return EADDRINUSE; } - if_detach_event_tag = EVENTHANDLER_REGISTER(ifnet_departure_event, - if_detached_event, NULL, EVENTHANDLER_PRI_ANY); - if (if_detach_event_tag == NULL) { - MROUTER_UNLOCK(); - return (ENOMEM); - } - V_mfchashtbl = hashinit_flags(mfchashsize, M_MRTABLE, &V_mfchash, HASH_NOWAIT); - callout_reset(&expire_upcalls_ch, EXPIRE_TIMEOUT, expire_upcalls, curvnet); - - callout_reset(&bw_upcalls_ch, BW_UPCALLS_PERIOD, - expire_bw_upcalls_send, curvnet); - callout_reset(&bw_meter_ch, BW_METER_PERIOD, expire_bw_meter_process, curvnet); + callout_reset(&V_expire_upcalls_ch, EXPIRE_TIMEOUT, expire_upcalls, + curvnet); + callout_reset(&V_bw_upcalls_ch, BW_UPCALLS_PERIOD, expire_bw_upcalls_send, + curvnet); + callout_reset(&V_bw_meter_ch, BW_METER_PERIOD, expire_bw_meter_process, + curvnet); V_ip_mrouter = so; ip_mrouter_cnt++; @@ -760,8 +759,6 @@ VIF_UNLOCK(); - EVENTHANDLER_DEREGISTER(ifnet_departure_event, if_detach_event_tag); - callout_stop(&V_expire_upcalls_ch); callout_stop(&V_bw_upcalls_ch); callout_stop(&V_bw_meter_ch); @@ -1496,7 +1493,8 @@ MFC_UNLOCK(); - callout_reset(&expire_upcalls_ch, EXPIRE_TIMEOUT, expire_upcalls, curvnet); + callout_reset(&V_expire_upcalls_ch, EXPIRE_TIMEOUT, expire_upcalls, + curvnet); CURVNET_RESTORE(); } @@ -2308,8 +2306,8 @@ bw_upcalls_send(); MFC_UNLOCK(); - callout_reset(&bw_upcalls_ch, BW_UPCALLS_PERIOD, - expire_bw_upcalls_send, curvnet); + callout_reset(&V_bw_upcalls_ch, BW_UPCALLS_PERIOD, expire_bw_upcalls_send, + curvnet); CURVNET_RESTORE(); } @@ -2325,7 +2323,8 @@ if (mrt_api_config & MRT_MFC_BW_UPCALL) bw_meter_process(); - callout_reset(&bw_meter_ch, BW_METER_PERIOD, expire_bw_meter_process, curvnet); + callout_reset(&V_bw_meter_ch, BW_METER_PERIOD, expire_bw_meter_process, + curvnet); CURVNET_RESTORE(); } @@ -2852,6 +2851,15 @@ switch (type) { case MOD_LOAD: MROUTER_LOCK_INIT(); + + if_detach_event_tag = EVENTHANDLER_REGISTER(ifnet_departure_event, + if_detached_event, NULL, EVENTHANDLER_PRI_ANY); + if (if_detach_event_tag == NULL) { + printf("ip_mroute: unable to ifnet_deperture_even handler\n"); + MROUTER_LOCK_DESTROY(); + return (EINVAL); + } + MFC_LOCK_INIT(); VIF_LOCK_INIT(); @@ -2909,6 +2917,8 @@ ip_mrouter_unloading = 1; MROUTER_UNLOCK(); + EVENTHANDLER_DEREGISTER(ifnet_departure_event, if_detach_event_tag); + if (pim_encap_cookie) { encap_detach(pim_encap_cookie); pim_encap_cookie = NULL; From owner-p4-projects@FreeBSD.ORG Mon May 17 13:29:26 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 764EC1065674; Mon, 17 May 2010 13:29:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3AB161065676 for ; Mon, 17 May 2010 13:29:26 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 28A0C8FC15 for ; Mon, 17 May 2010 13:29:26 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4HDTQvM026239 for ; Mon, 17 May 2010 13:29:26 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4HDTQN3026237 for perforce@freebsd.org; Mon, 17 May 2010 13:29:26 GMT (envelope-from zec@fer.hr) Date: Mon, 17 May 2010 13:29:26 GMT Message-Id: <201005171329.o4HDTQN3026237@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178391 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 13:29:26 -0000 http://p4web.freebsd.org/@@178391?ac=10 Change 178391 by zec@zec_nxlab on 2010/05/17 13:29:06 V_irtualize variables mrt_api_config and pim_assert_enabled, as it looks like they both may be modified on per-vnet basis. NB I have no clue whatsoever what is the purpose of those vars. Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#38 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#38 (text+ko) ==== @@ -367,9 +367,10 @@ MRT_MFC_FLAGS_BORDER_VIF | MRT_MFC_RP | MRT_MFC_BW_UPCALL); -static uint32_t mrt_api_config = 0; - -static int pim_assert_enabled; +static VNET_DEFINE(uint32_t, mrt_api_config); +#define V_mrt_api_config VNET(mrt_api_config) +static VNET_DEFINE(int, pim_assert_enabled); +#define V_pim_assert_enabled VNET(pim_assert_enabled) static struct timeval pim_assert_interval = { 3, 0 }; /* Rate limit */ /* @@ -442,7 +443,7 @@ * select data size depending on API version. */ if (sopt->sopt_name == MRT_ADD_MFC && - mrt_api_config & MRT_API_FLAGS_ALL) { + V_mrt_api_config & MRT_API_FLAGS_ALL) { error = sooptcopyin(sopt, &mfc, sizeof(struct mfcctl2), sizeof(struct mfcctl2)); } else { @@ -507,8 +508,8 @@ break; case MRT_ASSERT: - error = sooptcopyout(sopt, &pim_assert_enabled, - sizeof pim_assert_enabled); + error = sooptcopyout(sopt, &V_pim_assert_enabled, + sizeof V_pim_assert_enabled); break; case MRT_API_SUPPORT: @@ -516,7 +517,7 @@ break; case MRT_API_CONFIG: - error = sooptcopyout(sopt, &mrt_api_config, sizeof mrt_api_config); + error = sooptcopyout(sopt, &V_mrt_api_config, sizeof V_mrt_api_config); break; default: @@ -607,8 +608,8 @@ ip_mrouter_reset(void) { - pim_assert_enabled = 0; - mrt_api_config = 0; + V_pim_assert_enabled = 0; + V_mrt_api_config = 0; callout_init(&V_expire_upcalls_ch, CALLOUT_MPSAFE); @@ -733,7 +734,7 @@ */ V_ip_mrouter = NULL; ip_mrouter_cnt--; - mrt_api_config = 0; + V_mrt_api_config = 0; VIF_LOCK(); @@ -755,7 +756,7 @@ } bzero((caddr_t)V_viftable, sizeof(V_viftable)); V_numvifs = 0; - pim_assert_enabled = 0; + V_pim_assert_enabled = 0; VIF_UNLOCK(); @@ -804,7 +805,7 @@ if ((i != 1) && (i != 0)) return EINVAL; - pim_assert_enabled = i; + V_pim_assert_enabled = i; return 0; } @@ -828,7 +829,7 @@ *apival = 0; return EPERM; } - if (pim_assert_enabled) { + if (V_pim_assert_enabled) { *apival = 0; return EPERM; } @@ -844,8 +845,8 @@ MFC_UNLOCK(); - mrt_api_config = *apival & mrt_api_support; - *apival = mrt_api_config; + V_mrt_api_config = *apival & mrt_api_support; + *apival = V_mrt_api_config; return 0; } @@ -1012,11 +1013,11 @@ rt->mfc_parent = mfccp->mfcc_parent; for (i = 0; i < V_numvifs; i++) { rt->mfc_ttls[i] = mfccp->mfcc_ttls[i]; - rt->mfc_flags[i] = mfccp->mfcc_flags[i] & mrt_api_config & + rt->mfc_flags[i] = mfccp->mfcc_flags[i] & V_mrt_api_config & MRT_MFC_FLAGS_ALL; } /* set the RP address */ - if (mrt_api_config & MRT_MFC_RP) + if (V_mrt_api_config & MRT_MFC_RP) rt->mfc_rp = mfccp->mfcc_rp; else rt->mfc_rp.s_addr = INADDR_ANY; @@ -1541,7 +1542,8 @@ * can complete the SPT switch, regardless of the type * of the iif (broadcast media, GRE tunnel, etc). */ - if (pim_assert_enabled && (vifi < V_numvifs) && V_viftable[vifi].v_ifp) { + if (V_pim_assert_enabled && (vifi < V_numvifs) && + V_viftable[vifi].v_ifp) { if (ifp == &V_multicast_register_if) PIMSTAT_INC(pims_rcv_registers_wrongiif); @@ -1784,7 +1786,7 @@ struct bw_meter *x; uint32_t flags; - if (!(mrt_api_config & MRT_MFC_BW_UPCALL)) + if (!(V_mrt_api_config & MRT_MFC_BW_UPCALL)) return EOPNOTSUPP; /* Test if the flags are valid */ @@ -1872,7 +1874,7 @@ struct mfc *mfc; struct bw_meter *x; - if (!(mrt_api_config & MRT_MFC_BW_UPCALL)) + if (!(V_mrt_api_config & MRT_MFC_BW_UPCALL)) return EOPNOTSUPP; MFC_LOCK(); @@ -2320,7 +2322,7 @@ { CURVNET_SET((struct vnet *) arg); - if (mrt_api_config & MRT_MFC_BW_UPCALL) + if (V_mrt_api_config & MRT_MFC_BW_UPCALL) bw_meter_process(); callout_reset(&V_bw_meter_ch, BW_METER_PERIOD, expire_bw_meter_process, @@ -2346,7 +2348,7 @@ * Do not send IGMP_WHOLEPKT notifications to userland, if the * rendezvous point was unspecified, and we were told not to. */ - if (pim_squelch_wholepkt != 0 && (mrt_api_config & MRT_MFC_RP) && + if (pim_squelch_wholepkt != 0 && (V_mrt_api_config & MRT_MFC_RP) && in_nullhost(rt->mfc_rp)) return 0; @@ -2364,7 +2366,7 @@ mm = m_pullup(mm, sizeof(struct ip)); if (mm != NULL) { ip = mtod(mm, struct ip *); - if ((mrt_api_config & MRT_MFC_RP) && !in_nullhost(rt->mfc_rp)) { + if ((V_mrt_api_config & MRT_MFC_RP) && !in_nullhost(rt->mfc_rp)) { pim_register_send_rp(ip, vifp, mm, rt); } else { pim_register_send_upcall(ip, vifp, mm, rt); @@ -2532,7 +2534,7 @@ + sizeof(pim_encap_iphdr)); *pimhdr = pim_encap_pimhdr; /* If the iif crosses a border, set the Border-bit */ - if (rt->mfc_flags[vifi] & MRT_MFC_FLAGS_BORDER_VIF & mrt_api_config) + if (rt->mfc_flags[vifi] & MRT_MFC_FLAGS_BORDER_VIF & V_mrt_api_config) pimhdr->flags |= htonl(PIM_BORDER_REGISTER); mb_first->m_data += sizeof(pim_encap_iphdr); From owner-p4-projects@FreeBSD.ORG Mon May 17 13:43:42 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C12821065674; Mon, 17 May 2010 13:43:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85D801065670 for ; Mon, 17 May 2010 13:43:42 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 741788FC0A for ; Mon, 17 May 2010 13:43:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4HDhgRF027299 for ; Mon, 17 May 2010 13:43:42 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4HDhgrV027297 for perforce@freebsd.org; Mon, 17 May 2010 13:43:42 GMT (envelope-from zec@fer.hr) Date: Mon, 17 May 2010 13:43:42 GMT Message-Id: <201005171343.o4HDhgrV027297@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178392 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 13:43:43 -0000 http://p4web.freebsd.org/@@178392?ac=10 Change 178392 by zec@zec_nxlab on 2010/05/17 13:43:30 More untested guesswork: it seems that for SYSCTL_VNET_OPAQUE we need to use vnet_sysctl_handle_opaque, not sysctl_handle_opaque. Affected files ... .. //depot/projects/vimage/src/sys/net/vnet.h#38 edit Differences ... ==== //depot/projects/vimage/src/sys/net/vnet.h#38 (text+ko) ==== @@ -258,7 +258,7 @@ descr) \ SYSCTL_OID(parent, nbr, name, \ CTLTYPE_OPAQUE|CTLFLAG_VNET|(access), ptr, len, \ - sysctl_handle_opaque, fmt, descr) + vnet_sysctl_handle_opaque, fmt, descr) #define SYSCTL_VNET_UINT(parent, nbr, name, access, ptr, val, descr) \ SYSCTL_OID(parent, nbr, name, \ CTLTYPE_UINT|CTLFLAG_MPSAFE|CTLFLAG_VNET|(access), \ From owner-p4-projects@FreeBSD.ORG Mon May 17 17:16:36 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7158E106567F; Mon, 17 May 2010 17:16:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3415E106567C for ; Mon, 17 May 2010 17:16:36 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1FE9F8FC1E for ; Mon, 17 May 2010 17:16:36 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4HHGaNA057691 for ; Mon, 17 May 2010 17:16:36 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4HHGZnd057678 for perforce@freebsd.org; Mon, 17 May 2010 17:16:35 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 17 May 2010 17:16:35 GMT Message-Id: <201005171716.o4HHGZnd057678@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 17:16:36 -0000 http://p4web.freebsd.org/@@178396?ac=10 Change 178396 by gcooper@gcooper-bayonetta on 2010/05/17 17:16:28 IFC Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ObsoleteFiles.inc#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/UPDATING#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/expand.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/cmd/ztest/ztest.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/ipfilter/man/ipmon.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/csh.login#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/defaults/rc.conf#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/devd.conf#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/mtree/BSD.include.dist#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/network.subr#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/periodic/daily/310.accounting#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/periodic/daily/440.status-mailq#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/periodic/weekly/330.catman#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/profile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/bluetooth#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/bridge#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/cleanvar#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/defaultroute#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/geli#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/geli2#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/ipfw#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/mdconfig#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/mdconfig2#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/nscd#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/rfcomm_pppd_server#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/stf#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/syscons#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.d/ubthidhci#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.firewall#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/rc.initdiskless#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/regdomain.xml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/services#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/lib/libgcc/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/lib/libstdc++/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/lib/libsupc++/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/cc/Makefile.inc#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/cc/cc_tools/freebsd-native.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/cc/include/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libarchive/Makefile#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libarchive/cpio.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/gen/fmtcheck.3#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/gen/glob.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/locale/isblank.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/posix1e/acl_branding.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/posix1e/acl_perm.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/stdio/fgets.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/stdio/fopen.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/stdio/printf.3#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/stdio/tmpnam.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/stdio/wprintf.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/stdlib/realpath.3#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/stdlib/strtod.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/string/strcat.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/string/strcpy.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/sys/access.2#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/sys/execve.2#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/sys/ioctl.2#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/sys/setuid.2#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libelf/elf.3#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/liblzma/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/liblzma/Symbol.map#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/liblzma/Versions.def#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpmc/pmc.mips.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpmc/pmc.xscale.3#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libusb/libusb.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libusb/libusb10.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libusb/libusb10_desc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libusb/libusb10_io.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libusb/libusb20_compat01.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libusbhid/data.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libusbhid/usbhid.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/msun/man/fenv.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/msun/man/hypot.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsirand/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsirand/fsirand.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsirand/fsirand.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/geom/class/part/geom_part.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/hastctl/hastctl.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/hastd/hast.conf.5#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/hastd/hastd.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/kldstat/kldstat.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/mksnap_ffs/mksnap_ffs.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/mount/mount.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/mount_msdosfs/mount_msdosfs.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/mount_ntfs/mount_ntfs.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/mount_reiserfs/mount_reiserfs.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/mount_std/mount_std.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/rcorder/rcorder.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/restore/symtab.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man3/fpgetround.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ae.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ahb.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/amdtemp.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ataraid.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/cmx.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/cpuctl.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ed.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ef.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/em.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/en.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/fpa.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/fxp.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/geom_fox.4#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/harp.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/hatm.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/hifn.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/hwpmc.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/igb.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/inet.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/kbdmux.4#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ksyms.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.i386/cs.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.i386/ie.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.i386/mse.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.i386/pnp.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.i386/pnpbios.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.i386/vx.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.i386/wl.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.powerpc/snd_ai2s.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.powerpc/snd_davbus.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.sparc64/clkbrd.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.sparc64/creator.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.sparc64/machfb.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.sparc64/ofw_console.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.sparc64/openfirm.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/man4.sparc64/openprom.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/mfi.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/mpt.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/natm.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/nve.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/patm.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/psm.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/run.4#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/splash.4#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/syscons.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/twa.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ucom.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/uhso.4#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/vkbd.4#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/wpi.4#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man5/boot.config.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man5/fdescfs.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man5/linsysfs.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man5/make.conf.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man5/reiserfs.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man5/xfs.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/fail.9#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/mbpool.9#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/namei.9#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/uio.9#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/misc/mdoc.template#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/arm/include/disassem.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/arm/include/md_var.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/boot/zfs/zfsimpl.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/files#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/files.powerpc#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/options#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/contrib/dev/run/rt2870.fw.uu#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ddb/db_output.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ddb/ddb.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ata/chipsets/ata-serverworks.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/bwn/if_bwn.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/if_em.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/if_igb.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/e1000/if_lem.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ixgbe/ixgbe.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/ofw_if.m#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/ofw_standard.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/pci/pci.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/controller/ehci.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/input/ums.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/net/uhso.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/quirk/usb_quirk.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/serial/u3g.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/serial/uftdi.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usb_dev.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usb_device.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usb_device.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usb_generic.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usb_hid.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usb_hub.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usb_request.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usbhid.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/wlan/if_run.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/wlan/if_runreg.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/wlan/if_runvar.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/geom/multipath/g_multipath.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/geode.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/xen/pmap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/sched_ule.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_smp.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_witness.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/vfs_default.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/vnode_if.src#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/adm5120/if_admsw.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/conf/XLR#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/locore.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/param.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/smp.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/cpu.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/machdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/mp_machdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/mpboot.S#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/pmap.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/dev/xlr/rge.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/files.xlr#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/interrupt.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/intr_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/iodi.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/on_chip.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/pic.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/xlr_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/xlr_pci.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/xlrconfig.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/Makefile#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/cas/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/mvs/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net/flowtable.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net/flowtable.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net/vnet.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_bsd_addr.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_constants.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/sctputil.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/mmu_oea64.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/ofw_machdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/cpufreq/pcr.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/ofw/ofw_pcibus.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/ofw/ofw_real.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/ata_kauai.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/cpcht.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/cpchtvar.h#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/smu.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/uninorth.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/uninorthpci.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powermac/uninorthvar.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/pci/schizo.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/pci/schizoreg.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/pci/schizovar.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/eventhandler.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/lock.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/vnode.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_object.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_page.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_page.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/expansion/pathname1.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/expansion/pathname2.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/tools/vimage/vimage.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/ar/Makefile#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/ar/acpyacc.y#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/ar/ar.1#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/ar/ar.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/ar/ar.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/ar/read.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/ar/write.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/bsdiff/bsdiff/bsdiff.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/bsdiff/bspatch/bspatch.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/calendar/calendars/calendar.history#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/chpass/chpass.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/killall/killall.1#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/make/make.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/setchannel/setchannel.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/tar/bsdtar.1#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/wc/wc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/wtmpcvt/wtmpcvt.1#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/adduser/adduser.conf.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/apmd/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/apmd/apmd.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/apmd/apmd.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/apmd/apmd.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/apmd/apmdlex.l#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/apmd/contrib/pccardq.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/bluetooth/bthidd/bthidd.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/bluetooth/btpand/btpand.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/cpucontrol/cpucontrol.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/cron/crontab/crontab.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/crunch/crunchgen/crunchgen.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/daemon/daemon.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/extattr/rmextattr.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/fifolog/lib/fifolog_reader.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/mergemaster/mergemaster.sh#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/mount_portalfs/mount_portalfs.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/moused/moused.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/mptutil/mptutil.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/mtree/mtree.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/mtree/mtree.8#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/newsyslog/newsyslog.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/updating/pkg_updating.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/rtadvd/rtadvd.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/rtprio/rtprio.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/rtsold/rtsold.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/sa/sa.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/uathload/uathload.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#3 integrate Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.234 2010/04/17 01:17:31 jmallett Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.236 2010/05/14 20:40:37 delphij Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,29 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100514: library version bump for versioned symbols for liblzma +OLD_LIBS+=usr/lib/liblzma.so.0 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/liblzma.so.0 +.endif +# 20100511: move GCC-specific headers to /usr/include/gcc +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/include/emmintrin.h +OLD_FILES+=usr/include/mm_malloc.h +OLD_FILES+=usr/include/pmmintrin.h +OLD_FILES+=usr/include/xmmintrin.h +.endif +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "arm" +OLD_FILES+=usr/include/mmintrin.h +.endif +.if ${TARGET_ARCH} == "ia64" +OLD_FILES+=usr/include/ia64intrin.h +.endif +.if ${TARGET_ARCH} == "powerpc" +OLD_FILES+=usr/include/altivec.h +OLD_FILES+=usr/include/ppc-asm.h +OLD_FILES+=usr/include/spe.h +.endif # 20100416: [mips] removed .if ${TARGET_ARCH} == "mips" OLD_FILES+=usr/include/machine/psl.h ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/UPDATING#4 (text+ko) ==== @@ -83,6 +83,9 @@ The meanings correspond to the relevant IPv4 variables. +20091125: + 8.0-RELEASE. + 20091113: The default terminal emulation for syscons(4) has been changed from cons25 to xterm on all platforms except pc98. This means @@ -1138,4 +1141,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.658 2010/04/30 00:46:43 kmacy Exp $ +$FreeBSD: src/UPDATING,v 1.659 2010/05/12 21:20:04 brueffer Exp $ ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/setfacl/setfacl.1#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/bin/setfacl/setfacl.1,v 1.21 2010/03/07 07:59:05 joel Exp $ +.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.22 2010/05/13 16:46:23 trasz Exp $ .\" -.Dd September 5, 2009 +.Dd May 13, 2010 .Dt SETFACL 1 .Os .Sh NAME @@ -453,8 +453,13 @@ .Tn TrustedBSD Project and introduced in .Fx 5.0 . +NFSv4 ACL support was introduced in +.Fx 8.1 . .Sh AUTHORS +.An -nosplit The .Nm utility was written by .An Chris D. Faulhaber Aq jedgar@fxp.org . +NFSv4 ACL support was implemented by +.An Edward Tomasz Napierala Aq trasz@FreeBSD.org . ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/expand.c#4 (text+ko) ==== @@ -1,6 +1,8 @@ /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. + * Copyright (c) 1997-2005 + * Herbert Xu . All rights reserved. * * This code is derived from software contributed to Berkeley by * Kenneth Almquist. @@ -36,7 +38,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.63 2010/04/25 20:43:19 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.64 2010/05/11 23:19:28 jilles Exp $"); #include #include @@ -1150,10 +1152,11 @@ struct dirent *dp; int atend; int matchdot; + int esc; metaflag = 0; start = name; - for (p = name ; ; p++) { + for (p = name; esc = 0, *p; p += esc + 1) { if (*p == '*' || *p == '?') metaflag = 1; else if (*p == '[') { @@ -1178,12 +1181,14 @@ break; else if (*p == CTLQUOTEMARK) continue; - else if (*p == CTLESC) - p++; - if (*p == '/') { - if (metaflag) - break; - start = p + 1; + else { + if (*p == CTLESC) + esc++; + if (p[esc] == '/') { + if (metaflag) + break; + start = p + esc + 1; + } } } if (metaflag == 0) { /* we've reached the end of the file name */ @@ -1229,7 +1234,8 @@ atend = 1; } else { atend = 0; - *endname++ = '\0'; + *endname = '\0'; + endname += esc + 1; } matchdot = 0; p = start; @@ -1257,7 +1263,7 @@ } closedir(dirp); if (! atend) - endname[-1] = '/'; + endname[-esc - 1] = esc ? CTLESC : '/'; } ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 (text+ko) ==== @@ -50,6 +50,7 @@ #include #include #include +#include #undef ZFS_MAXNAMELEN #undef verify #include @@ -62,8 +63,6 @@ extern void dump_intent_log(zilog_t *); uint64_t *zopt_object = NULL; int zopt_objects = 0; -int zdb_advance = ADVANCE_PRE; -zbookmark_t zdb_noread = { 0, 0, ZB_NO_LEVEL, 0 }; libzfs_handle_t *g_zfs; boolean_t zdb_sig_user_data = B_TRUE; int zdb_sig_cksumalg = ZIO_CHECKSUM_SHA256; @@ -88,8 +87,8 @@ usage(void) { (void) fprintf(stderr, - "Usage: %s [-udibcsvL] [-U cachefile_path] [-O order] " - "[-B os:obj:level:blkid] [-S user:cksumalg] " + "Usage: %s [-udibcsv] [-U cachefile_path] " + "[-S user:cksumalg] " "dataset [object...]\n" " %s -C [pool]\n" " %s -l dev\n" @@ -109,13 +108,8 @@ "dump blkptr signatures\n"); (void) fprintf(stderr, " -v verbose (applies to all others)\n"); (void) fprintf(stderr, " -l dump label contents\n"); - (void) fprintf(stderr, " -L live pool (allows some errors)\n"); - (void) fprintf(stderr, " -O [!] " - "visitation order\n"); (void) fprintf(stderr, " -U cachefile_path -- use alternate " "cachefile\n"); - (void) fprintf(stderr, " -B objset:object:level:blkid -- " - "simulate bad block\n"); (void) fprintf(stderr, " -R read and display block from a " "device\n"); (void) fprintf(stderr, " -e Pool is exported/destroyed/" @@ -138,7 +132,7 @@ va_end(ap); (void) fprintf(stderr, "\n"); - exit(1); + abort(); } static void @@ -571,7 +565,7 @@ } static uint64_t -blkid2offset(dnode_phys_t *dnp, int level, uint64_t blkid) +blkid2offset(const dnode_phys_t *dnp, int level, uint64_t blkid) { if (level < 0) return (blkid); @@ -602,115 +596,104 @@ (u_longlong_t)bp->blk_birth); } -/* ARGSUSED */ -static int -zdb_indirect_cb(traverse_blk_cache_t *bc, spa_t *spa, void *a) +static void +print_indirect(blkptr_t *bp, const zbookmark_t *zb, + const dnode_phys_t *dnp) { - zbookmark_t *zb = &bc->bc_bookmark; - blkptr_t *bp = &bc->bc_blkptr; - void *data = bc->bc_data; - dnode_phys_t *dnp = bc->bc_dnode; - char blkbuf[BP_SPRINTF_LEN + 80]; + char blkbuf[BP_SPRINTF_LEN]; int l; - if (bc->bc_errno) { - (void) sprintf(blkbuf, - "Error %d reading <%llu, %llu, %lld, %llu>: ", - bc->bc_errno, - (u_longlong_t)zb->zb_objset, - (u_longlong_t)zb->zb_object, - (u_longlong_t)zb->zb_level, - (u_longlong_t)zb->zb_blkid); - goto out; - } + ASSERT3U(BP_GET_TYPE(bp), ==, dnp->dn_type); + ASSERT3U(BP_GET_LEVEL(bp), ==, zb->zb_level); - if (zb->zb_level == -1) { - ASSERT3U(BP_GET_TYPE(bp), ==, DMU_OT_OBJSET); - ASSERT3U(BP_GET_LEVEL(bp), ==, 0); - } else { - ASSERT3U(BP_GET_TYPE(bp), ==, dnp->dn_type); - ASSERT3U(BP_GET_LEVEL(bp), ==, zb->zb_level); - } + (void) printf("%16llx ", + (u_longlong_t)blkid2offset(dnp, zb->zb_level, zb->zb_blkid)); - if (zb->zb_level > 0) { - uint64_t fill = 0; - blkptr_t *bpx, *bpend; + ASSERT(zb->zb_level >= 0); - for (bpx = data, bpend = bpx + BP_GET_LSIZE(bp) / sizeof (*bpx); - bpx < bpend; bpx++) { - if (bpx->blk_birth != 0) { - fill += bpx->blk_fill; - } else { - ASSERT(bpx->blk_fill == 0); - } + for (l = dnp->dn_nlevels - 1; l >= -1; l--) { + if (l == zb->zb_level) { + (void) printf("L%llx", (u_longlong_t)zb->zb_level); + } else { + (void) printf(" "); } - ASSERT3U(fill, ==, bp->blk_fill); } - if (zb->zb_level == 0 && dnp->dn_type == DMU_OT_DNODE) { + sprintf_blkptr_compact(blkbuf, bp, dump_opt['d'] > 5 ? 1 : 0); + (void) printf("%s\n", blkbuf); +} + +#define SET_BOOKMARK(zb, objset, object, level, blkid) \ +{ \ + (zb)->zb_objset = objset; \ + (zb)->zb_object = object; \ + (zb)->zb_level = level; \ + (zb)->zb_blkid = blkid; \ +} + +static int +visit_indirect(spa_t *spa, const dnode_phys_t *dnp, + blkptr_t *bp, const zbookmark_t *zb) +{ + int err; + + if (bp->blk_birth == 0) + return (0); + + print_indirect(bp, zb, dnp); + + if (BP_GET_LEVEL(bp) > 0) { + uint32_t flags = ARC_WAIT; + int i; + blkptr_t *cbp; + int epb = BP_GET_LSIZE(bp) >> SPA_BLKPTRSHIFT; + arc_buf_t *buf; uint64_t fill = 0; - dnode_phys_t *dnx, *dnend; - for (dnx = data, dnend = dnx + (BP_GET_LSIZE(bp)>>DNODE_SHIFT); - dnx < dnend; dnx++) { - if (dnx->dn_type != DMU_OT_NONE) - fill++; - } - ASSERT3U(fill, ==, bp->blk_fill); - } + err = arc_read_nolock(NULL, spa, bp, arc_getbuf_func, &buf, + ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, zb); + if (err) + return (err); - (void) sprintf(blkbuf, "%16llx ", - (u_longlong_t)blkid2offset(dnp, zb->zb_level, zb->zb_blkid)); + /* recursively visit blocks below this */ + cbp = buf->b_data; + for (i = 0; i < epb; i++, cbp++) { + zbookmark_t czb; - ASSERT(zb->zb_level >= 0); - - for (l = dnp->dn_nlevels - 1; l >= -1; l--) { - if (l == zb->zb_level) { - (void) sprintf(blkbuf + strlen(blkbuf), "L%llx", - (u_longlong_t)zb->zb_level); - } else { - (void) sprintf(blkbuf + strlen(blkbuf), " "); + SET_BOOKMARK(&czb, zb->zb_objset, zb->zb_object, + zb->zb_level - 1, + zb->zb_blkid * epb + i); + err = visit_indirect(spa, dnp, cbp, &czb); + if (err) + break; + fill += cbp->blk_fill; } + ASSERT3U(fill, ==, bp->blk_fill); + (void) arc_buf_remove_ref(buf, &buf); } -out: - if (bp->blk_birth == 0) { - (void) sprintf(blkbuf + strlen(blkbuf), ""); - (void) printf("%s\n", blkbuf); - } else { - sprintf_blkptr_compact(blkbuf + strlen(blkbuf), bp, - dump_opt['d'] > 5 ? 1 : 0); - (void) printf("%s\n", blkbuf); - } - - return (bc->bc_errno ? ERESTART : 0); + return (err); } /*ARGSUSED*/ static void -dump_indirect(objset_t *os, uint64_t object, void *data, size_t size) +dump_indirect(dnode_t *dn) { - traverse_handle_t *th; - uint64_t objset = dmu_objset_id(os); - int advance = zdb_advance; + dnode_phys_t *dnp = dn->dn_phys; + int j; + zbookmark_t czb; (void) printf("Indirect blocks:\n"); - if (object == 0) - advance |= ADVANCE_DATA; - - th = traverse_init(dmu_objset_spa(os), zdb_indirect_cb, NULL, advance, - ZIO_FLAG_CANFAIL); - th->th_noread = zdb_noread; - - traverse_add_dnode(th, 0, -1ULL, objset, object); - - while (traverse_more(th) == EAGAIN) - continue; + SET_BOOKMARK(&czb, dmu_objset_id(&dn->dn_objset->os), + dn->dn_object, dnp->dn_nlevels - 1, 0); + for (j = 0; j < dnp->dn_nblkptr; j++) { + czb.zb_blkid = j; + (void) visit_indirect(dmu_objset_spa(&dn->dn_objset->os), dnp, + &dnp->dn_blkptr[j], &czb); + } (void) printf("\n"); - - traverse_fini(th); } /*ARGSUSED*/ @@ -1093,7 +1076,7 @@ } if (verbosity >= 5) - dump_indirect(os, object, NULL, 0); + dump_indirect(dn); if (verbosity >= 5) { /* @@ -1458,18 +1441,17 @@ #define DMU_OT_DEFERRED DMU_OT_NONE #define DMU_OT_TOTAL DMU_OT_NUMTYPES -#define ZB_TOTAL ZB_MAXLEVEL +#define ZB_TOTAL DN_MAX_LEVELS typedef struct zdb_cb { zdb_blkstats_t zcb_type[ZB_TOTAL + 1][DMU_OT_TOTAL + 1]; uint64_t zcb_errors[256]; - traverse_blk_cache_t *zcb_cache; int zcb_readfails; int zcb_haderrors; } zdb_cb_t; static void -zdb_count_block(spa_t *spa, zdb_cb_t *zcb, blkptr_t *bp, int type) +zdb_count_block(spa_t *spa, zdb_cb_t *zcb, blkptr_t *bp, dmu_object_type_t type) { for (int i = 0; i < 4; i++) { int l = (i < 2) ? BP_GET_LEVEL(bp) : ZB_TOTAL; @@ -1485,7 +1467,7 @@ if (dump_opt['S']) { boolean_t print_sig; - print_sig = !zdb_sig_user_data || (BP_GET_LEVEL(bp) == 0 && + print_sig = !zdb_sig_user_data || (BP_GET_LEVEL(bp) == 0 && BP_GET_TYPE(bp) == DMU_OT_PLAIN_FILE_CONTENTS); if (BP_GET_CHECKSUM(bp) < zdb_sig_cksumalg) @@ -1507,56 +1489,55 @@ } } - if (!dump_opt['L']) - VERIFY(zio_wait(zio_claim(NULL, spa, spa_first_txg(spa), bp, - NULL, NULL, ZIO_FLAG_MUSTSUCCEED)) == 0); + VERIFY(zio_wait(zio_claim(NULL, spa, spa_first_txg(spa), bp, + NULL, NULL, ZIO_FLAG_MUSTSUCCEED)) == 0); } static int -zdb_blkptr_cb(traverse_blk_cache_t *bc, spa_t *spa, void *arg) +zdb_blkptr_cb(spa_t *spa, blkptr_t *bp, const zbookmark_t *zb, + const dnode_phys_t *dnp, void *arg) { - zbookmark_t *zb = &bc->bc_bookmark; zdb_cb_t *zcb = arg; - blkptr_t *bp = &bc->bc_blkptr; - dmu_object_type_t type = BP_GET_TYPE(bp); char blkbuf[BP_SPRINTF_LEN]; - int error = 0; + + if (bp == NULL) + return (0); + + zdb_count_block(spa, zcb, bp, BP_GET_TYPE(bp)); - ASSERT(!BP_IS_HOLE(bp)); + if (dump_opt['c'] || dump_opt['S']) { + int ioerr, size; + void *data; - zdb_count_block(spa, zcb, bp, type); + size = BP_GET_LSIZE(bp); + data = malloc(size); + ioerr = zio_wait(zio_read(NULL, spa, bp, data, size, + NULL, NULL, ZIO_PRIORITY_ASYNC_READ, + ZIO_FLAG_CANFAIL | ZIO_FLAG_SCRUB, zb)); + free(data); - if (bc->bc_errno) { - if (zcb->zcb_readfails++ < 10 && dump_opt['L']) { - uberblock_t ub; - vdev_uberblock_load(NULL, spa->spa_root_vdev, &ub); - if (ub.ub_txg != 0) - spa->spa_ubsync = ub; - error = EAGAIN; - } else { + /* We expect io errors on intent log */ + if (ioerr && BP_GET_TYPE(bp) != DMU_OT_INTENT_LOG) { zcb->zcb_haderrors = 1; - zcb->zcb_errors[bc->bc_errno]++; - error = ERESTART; - } + zcb->zcb_errors[ioerr]++; - if (dump_opt['b'] >= 3 || (dump_opt['b'] >= 2 && bc->bc_errno)) - sprintf_blkptr(blkbuf, BP_SPRINTF_LEN, bp); - else - blkbuf[0] = '\0'; + if (dump_opt['b'] >= 2) + sprintf_blkptr(blkbuf, BP_SPRINTF_LEN, bp); + else + blkbuf[0] = '\0'; - if (!dump_opt['S']) { - (void) printf("zdb_blkptr_cb: Got error %d reading " - "<%llu, %llu, %lld, %llx> %s -- %s\n", - bc->bc_errno, - (u_longlong_t)zb->zb_objset, - (u_longlong_t)zb->zb_object, - (u_longlong_t)zb->zb_level, - (u_longlong_t)zb->zb_blkid, - blkbuf, - error == EAGAIN ? "retrying" : "skipping"); + if (!dump_opt['S']) { + (void) printf("zdb_blkptr_cb: " + "Got error %d reading " + "<%llu, %llu, %lld, %llx> %s -- skipping\n", + ioerr, + (u_longlong_t)zb->zb_objset, + (u_longlong_t)zb->zb_object, + (u_longlong_t)zb->zb_level, + (u_longlong_t)zb->zb_blkid, + blkbuf); + } } - - return (error); } zcb->zcb_readfails = 0; @@ -1566,8 +1547,8 @@ (void) printf("objset %llu object %llu offset 0x%llx %s\n", (u_longlong_t)zb->zb_objset, (u_longlong_t)zb->zb_object, - (u_longlong_t)blkid2offset(bc->bc_dnode, - zb->zb_level, zb->zb_blkid), blkbuf); + (u_longlong_t)blkid2offset(dnp, zb->zb_level, zb->zb_blkid), + blkbuf); } return (0); @@ -1576,23 +1557,13 @@ static int dump_block_stats(spa_t *spa) { - traverse_handle_t *th; zdb_cb_t zcb = { 0 }; - traverse_blk_cache_t dummy_cache = { 0 }; zdb_blkstats_t *zb, *tzb; uint64_t alloc, space, logalloc; vdev_t *rvd = spa->spa_root_vdev; int leaks = 0; - int advance = zdb_advance; - int c, e, flags; - - zcb.zcb_cache = &dummy_cache; - - if (dump_opt['c'] || dump_opt['S']) - advance |= ADVANCE_DATA; + int c, e; - advance |= ADVANCE_PRUNE | ADVANCE_ZIL; - if (!dump_opt['S']) { (void) printf("\nTraversing all blocks to %sverify" " nothing leaked ...\n", @@ -1607,8 +1578,7 @@ * it's not part of any space map) is a double allocation, * reference to a freed block, or an unclaimed log block. */ - if (!dump_opt['L']) - zdb_leak_init(spa); + zdb_leak_init(spa); /* * If there's a deferred-free bplist, process that first. @@ -1634,23 +1604,8 @@ bplist_close(bpl); } - /* - * Now traverse the pool. If we're reading all data to verify - * checksums, do a scrubbing read so that we validate all copies. - */ - flags = ZIO_FLAG_CANFAIL; - if (advance & ADVANCE_DATA) - flags |= ZIO_FLAG_SCRUB; - th = traverse_init(spa, zdb_blkptr_cb, &zcb, advance, flags); - th->th_noread = zdb_noread; + zcb.zcb_haderrors |= traverse_pool(spa, zdb_blkptr_cb, &zcb); - traverse_add_pool(th, 0, spa_first_txg(spa) + TXG_CONCURRENT_STATES); - - while (traverse_more(th) == EAGAIN) - continue; - - traverse_fini(th); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 17 21:25:42 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E6091065673; Mon, 17 May 2010 21:25:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB790106564A for ; Mon, 17 May 2010 21:25:41 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 90D6B8FC0A for ; Mon, 17 May 2010 21:25:41 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4HLPfnx001565 for ; Mon, 17 May 2010 21:25:41 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4HLPeu4001563 for perforce@freebsd.org; Mon, 17 May 2010 21:25:40 GMT (envelope-from zec@fer.hr) Date: Mon, 17 May 2010 21:25:40 GMT Message-Id: <201005172125.o4HLPeu4001563@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178403 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2010 21:25:42 -0000 http://p4web.freebsd.org/@@178403?ac=10 Change 178403 by zec@zec_nxlab on 2010/05/17 21:25:06 Provide a SYSCTL_VNET_OPAQUE() variant for nooptions VIMAGE builds. This ubreaks GENERIC kernel build. While here, move the existing #define for SYSCTL_VNET_OPAQUE() so that it is alphabetically sorted with other SYSCTL_VNET_* stuff. Affected files ... .. //depot/projects/vimage/src/sys/net/vnet.h#39 edit Differences ... ==== //depot/projects/vimage/src/sys/net/vnet.h#39 (text+ko) ==== @@ -245,6 +245,11 @@ fmt, descr) \ SYSCTL_OID(parent, nbr, name, CTLFLAG_VNET|(access), ptr, arg, \ handler, fmt, descr) +#define SYSCTL_VNET_OPAQUE(parent, nbr, name, access, ptr, len, fmt, \ + descr) \ + SYSCTL_OID(parent, nbr, name, \ + CTLTYPE_OPAQUE|CTLFLAG_VNET|(access), ptr, len, \ + vnet_sysctl_handle_opaque, fmt, descr) #define SYSCTL_VNET_STRING(parent, nbr, name, access, arg, len, descr) \ SYSCTL_OID(parent, nbr, name, \ CTLTYPE_STRING|CTLFLAG_VNET|(access), \ @@ -254,11 +259,6 @@ CTLTYPE_OPAQUE|CTLFLAG_VNET|(access), ptr, \ sizeof(struct type), vnet_sysctl_handle_opaque, "S," #type, \ descr) -#define SYSCTL_VNET_OPAQUE(parent, nbr, name, access, ptr, len, fmt, \ - descr) \ - SYSCTL_OID(parent, nbr, name, \ - CTLTYPE_OPAQUE|CTLFLAG_VNET|(access), ptr, len, \ - vnet_sysctl_handle_opaque, fmt, descr) #define SYSCTL_VNET_UINT(parent, nbr, name, access, ptr, val, descr) \ SYSCTL_OID(parent, nbr, name, \ CTLTYPE_UINT|CTLFLAG_MPSAFE|CTLFLAG_VNET|(access), \ @@ -403,6 +403,9 @@ fmt, descr) \ SYSCTL_PROC(parent, nbr, name, access, ptr, arg, handler, fmt, \ descr) +#define SYSCTL_VNET_OPAQUE(parent, nbr, name, access, ptr, len, fmt, \ + descr) \ + SYSCTL_OPAQUE(parent, nbr, name, access, ptr, len, fmt, descr) #define SYSCTL_VNET_STRING(parent, nbr, name, access, arg, len, descr) \ SYSCTL_STRING(parent, nbr, name, access, arg, len, descr) #define SYSCTL_VNET_STRUCT(parent, nbr, name, access, ptr, type, descr) \ From owner-p4-projects@FreeBSD.ORG Tue May 18 01:04:02 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E12B6106566C; Tue, 18 May 2010 01:04:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A46411065674 for ; Tue, 18 May 2010 01:04:01 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9128C8FC08 for ; Tue, 18 May 2010 01:04:01 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4I141Cv032777 for ; Tue, 18 May 2010 01:04:01 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4I141R6032775 for perforce@freebsd.org; Tue, 18 May 2010 01:04:01 GMT (envelope-from gcooper@FreeBSD.org) Date: Tue, 18 May 2010 01:04:01 GMT Message-Id: <201005180104.o4I141R6032775@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178411 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2010 01:04:02 -0000 http://p4web.freebsd.org/@@178411?ac=10 Change 178411 by gcooper@gcooper-bioshock on 2010/05/18 01:03:47 - Convert S_I*ALL into their symbolic forms. - Remove NO / YES macros (unused). - Fix indentation. - Rename header guard macro to match the header. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#10 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#10 (text+ko) ==== @@ -20,8 +20,8 @@ * */ -#ifndef _INST_LIB_LIB_H_ -#define _INST_LIB_LIB_H_ +#ifndef _LIBPKG_PKG_H_ +#define _LIBPKG_PKG_H_ #ifndef YES_I_KNOW_THE_API_IS_RUBBISH_AND_IS_DOOMED_TO_CHANGE #error "You obviously have no idea what you're doing." @@ -51,13 +51,10 @@ #define FALSE (0) #endif -#define YES 2 -#define NO 1 - /* Some more stat macros. */ -#define S_IRALL 0000444 -#define S_IWALL 0000222 -#define S_IXALL 0000111 +#define S_IRALL (S_IRUSR | S_IRGRP | S_IROTH) +#define S_IWALL (S_IWUSR | S_IWGRP | S_IWOTH) +#define S_IXALL (S_IXUSR | S_IXGRP | S_IXOTH) /* Usually "rm", but often "echo" during debugging! */ #define REMOVE_CMD "/bin/rm" @@ -68,9 +65,9 @@ /* Where the ports lives by default */ #define DEF_PORTS_DIR "/usr/ports" /* just in case we change the environment variable name */ -#define PORTSDIR "PORTSDIR" +#define PORTSDIR "PORTSDIR" /* macro to get name of directory where the ports lives */ -#define PORTS_DIR (getenv(PORTSDIR) ? getenv(PORTSDIR) : DEF_PORTS_DIR) +#define PORTS_DIR (getenv(PORTSDIR) ? getenv(PORTSDIR) : DEF_PORTS_DIR) /* Where we put logging information by default, else ${PKG_DBDIR} if set */ #define DEF_LOG_DIR "/var/db/pkg" @@ -109,43 +106,41 @@ #define PLIST_FMT_VER_MAJOR 1 #define PLIST_FMT_VER_MINOR 1 -enum _plist_t { - PLIST_FILE, PLIST_CWD, PLIST_CMD, PLIST_CHMOD, - PLIST_CHOWN, PLIST_CHGRP, PLIST_COMMENT, PLIST_IGNORE, - PLIST_NAME, PLIST_UNEXEC, PLIST_SRC, PLIST_DISPLAY, - PLIST_PKGDEP, PLIST_CONFLICTS, PLIST_MTREE, PLIST_DIR_RM, - PLIST_IGNORE_INST, PLIST_OPTION, PLIST_ORIGIN, PLIST_DEPORIGIN, - PLIST_NOINST -}; -typedef enum _plist_t plist_t; +typedef enum _plist_t { + PLIST_FILE, PLIST_CWD, PLIST_CMD, PLIST_CHMOD, + PLIST_CHOWN, PLIST_CHGRP, PLIST_COMMENT, PLIST_IGNORE, + PLIST_NAME, PLIST_UNEXEC, PLIST_SRC, PLIST_DISPLAY, + PLIST_PKGDEP, PLIST_CONFLICTS, PLIST_MTREE, PLIST_DIR_RM, + PLIST_IGNORE_INST, PLIST_OPTION, PLIST_ORIGIN, PLIST_DEPORIGIN, + PLIST_NOINST +} plist_t; -enum _match_t { - MATCH_ALL, MATCH_EXACT, MATCH_GLOB, MATCH_NGLOB, MATCH_EREGEX, MATCH_REGEX -}; -typedef enum _match_t match_t; +typedef enum _match_t { + MATCH_ALL, MATCH_EXACT, MATCH_GLOB, MATCH_NGLOB, MATCH_EREGEX, + MATCH_REGEX +} match_t; -/* Types */ +/* Custom types */ typedef unsigned int Boolean; struct _plist { - struct _plist *prev, *next; - char *name; - Boolean marked; - plist_t type; + struct _plist *prev, *next; + char *name; + Boolean marked; + plist_t type; }; typedef struct _plist *PackingList; -struct _pack { - struct _plist *head, *tail; - const char *name; - const char *origin; - int fmtver_maj, fmtver_mnr; -}; -typedef struct _pack Package; +typedef struct _pack { + struct _plist *head, *tail; + const char *name; + const char *origin; + int fmtver_maj, fmtver_mnr; +} Package; struct reqr_by_entry { - STAILQ_ENTRY(reqr_by_entry) link; - char pkgname[PATH_MAX]; + STAILQ_ENTRY(reqr_by_entry) link; + char pkgname[PATH_MAX]; }; STAILQ_HEAD(reqr_by_head, reqr_by_entry); @@ -193,14 +188,15 @@ PackingList new_plist_entry(void); PackingList last_plist(Package *); PackingList find_plist(Package *, plist_t); -char *find_plist_option(Package *, const char *name); +char* find_plist_option(Package *, const char *name); void plist_delete(Package *, Boolean, plist_t, const char *); void free_plist(Package *); void mark_plist(Package *); void csum_plist_entry(char *, PackingList); void add_plist(Package *, plist_t, const char *); void add_plist_top(Package *, plist_t, const char *); -void delete_plist(Package *pkg, Boolean all, plist_t type, const char *name); +void delete_plist(Package *pkg, Boolean all, plist_t type, + const char *name); int write_plist(Package *, FILE *); int read_plist(Package *, int); int plist_cmd(const char *, char **); @@ -212,16 +208,18 @@ void pkg_wrap(long, char **); /* Query installed packages */ -char **matchinstalled(match_t, char **, int *); -char **matchbyorigin(const char *, int *); -char ***matchallbyorigin(const char **, int *); +char** matchinstalled(match_t, char **, int *); +char** matchbyorigin(const char *, int *); +char*** matchallbyorigin(const char **, int *); int isinstalledpkg(const char *name); -int pattern_match(match_t MatchType, char *pattern, const char *pkgname); +int pattern_match(match_t MatchType, char *pattern, + const char *pkgname); /* Dependencies */ int sortdeps(char **); int chkifdepends(const char *, const char *); -int requiredby(const char *, struct reqr_by_head **, Boolean, Boolean); +int requiredby(const char *, struct reqr_by_head **, Boolean, + Boolean); /* Version */ int libpkg_version(void); From owner-p4-projects@FreeBSD.ORG Tue May 18 01:11:10 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC31C1065679; Tue, 18 May 2010 01:11:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A0E271065675 for ; Tue, 18 May 2010 01:11:09 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8E33C8FC1A for ; Tue, 18 May 2010 01:11:09 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4I1B90p033325 for ; Tue, 18 May 2010 01:11:09 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4I1B9Ch033323 for perforce@freebsd.org; Tue, 18 May 2010 01:11:09 GMT (envelope-from gcooper@FreeBSD.org) Date: Tue, 18 May 2010 01:11:09 GMT Message-Id: <201005180111.o4I1B9Ch033323@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178412 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2010 01:11:10 -0000 http://p4web.freebsd.org/@@178412?ac=10 Change 178412 by gcooper@gcooper-bioshock on 2010/05/18 01:10:59 Add a bit of documentation and all that fun jazz to the package initializer .py file. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/lib/libpkg/tests/__init__.py#2 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/lib/libpkg/tests/__init__.py#2 (text+ko) ==== @@ -1,10 +1,25 @@ +""" +Subroutines common to all libpkg tests. + +$FreeBSD$ +""" + # NOTE (gcooper): keep this up to date with .../lib/libpkg/Makefile . -LIBPKG_S = 'libpkg.so.0' +SHLIB_MAJOR = 0 +# The string which represents the copy of libpkg under test. +LIBPKG_S = 'libpkg.so.%d' % (SHLIB_MAJOR, ) +# The ctypes library handle object for libpkg. LIBPKG = None def setup_package(): - """ Setup ctypes. """ + """ Setup libpkg via ctypes. """ global LIBPKG + LIBPKG = ctypes.CDLL(tests.LIBPKG_S) + +def teardown_package(): + """ Teardown libpkg - LIBPKG = ctypes.CDLL(tests.LIBPKG_S) + XXX (gcooper): do something of value here in the future, maybe... + """ + pass From owner-p4-projects@FreeBSD.ORG Tue May 18 01:13:12 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A61D1065688; Tue, 18 May 2010 01:13:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2A8E1065680 for ; Tue, 18 May 2010 01:13:11 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E04B18FC22 for ; Tue, 18 May 2010 01:13:11 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4I1DBlK033452 for ; Tue, 18 May 2010 01:13:11 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4I1DBsN033450 for perforce@freebsd.org; Tue, 18 May 2010 01:13:11 GMT (envelope-from gcooper@FreeBSD.org) Date: Tue, 18 May 2010 01:13:11 GMT Message-Id: <201005180113.o4I1DBsN033450@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178413 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2010 01:13:12 -0000 http://p4web.freebsd.org/@@178413?ac=10 Change 178413 by gcooper@gcooper-bioshock on 2010/05/18 01:12:19 We aren't necessarily at the test scope, and don't forget to import ctypes. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/lib/libpkg/tests/__init__.py#3 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/lib/libpkg/tests/__init__.py#3 (text+ko) ==== @@ -4,6 +4,8 @@ $FreeBSD$ """ +import ctypes + # NOTE (gcooper): keep this up to date with .../lib/libpkg/Makefile . SHLIB_MAJOR = 0 @@ -15,7 +17,7 @@ def setup_package(): """ Setup libpkg via ctypes. """ global LIBPKG - LIBPKG = ctypes.CDLL(tests.LIBPKG_S) + LIBPKG = ctypes.CDLL(LIBPKG_S) def teardown_package(): """ Teardown libpkg From owner-p4-projects@FreeBSD.ORG Tue May 18 02:27:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9E531065674; Tue, 18 May 2010 02:27:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E4E41065677 for ; Tue, 18 May 2010 02:27:38 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6B43E8FC08 for ; Tue, 18 May 2010 02:27:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4I2Rces040097 for ; Tue, 18 May 2010 02:27:38 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4I2Rc3L040095 for perforce@freebsd.org; Tue, 18 May 2010 02:27:38 GMT (envelope-from thompsa@freebsd.org) Date: Tue, 18 May 2010 02:27:38 GMT Message-Id: <201005180227.o4I2Rc3L040095@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178418 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2010 02:27:39 -0000 http://p4web.freebsd.org/@@178418?ac=10 Change 178418 by thompsa@thompsa_pea on 2010/05/18 02:27:25 Force integration origin to //depot/vendor/freebsd/... since these files originated in this branch. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_runreg.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_runvar.h#7 integrate Differences ... ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#11 (text+ko) ==== @@ -1,5 +1,3 @@ -/* $FreeBSD$ */ - /*- * Copyright (c) 2008,2010 Damien Bergamini * ported to FreeBSD by Akinori Furukoshi @@ -19,7 +17,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_run.c,v 1.9 2010/05/13 00:19:03 thompsa Exp $"); /*- * Ralink Technology RT2700U/RT2800U/RT3000U chipset driver. ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_runreg.h#5 (text+ko) ==== @@ -15,6 +15,8 @@ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * $FreeBSD: src/sys/dev/usb/wlan/if_runreg.h,v 1.3 2010/05/13 00:19:03 thompsa Exp $ */ #ifndef _IF_RUNREG_H_ ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_runvar.h#7 (text+ko) ==== @@ -16,6 +16,8 @@ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * $FreeBSD: src/sys/dev/usb/wlan/if_runvar.h,v 1.5 2010/05/13 00:19:03 thompsa Exp $ */ #ifndef _IF_RUNVAR_H_ From owner-p4-projects@FreeBSD.ORG Tue May 18 02:32:44 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DB7E1065678; Tue, 18 May 2010 02:32:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52262106564A for ; Tue, 18 May 2010 02:32:44 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3B38D8FC19 for ; Tue, 18 May 2010 02:32:44 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4I2WiHg040495 for ; Tue, 18 May 2010 02:32:44 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4I2WiGO040493 for perforce@freebsd.org; Tue, 18 May 2010 02:32:44 GMT (envelope-from thompsa@freebsd.org) Date: Tue, 18 May 2010 02:32:44 GMT Message-Id: <201005180232.o4I2WiGO040493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178420 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2010 02:32:44 -0000 http://p4web.freebsd.org/@@178420?ac=10 Change 178420 by thompsa@thompsa_pea on 2010/05/18 02:32:15 Remove stale directory. Affected files ... .. //depot/projects/usb/src/lib/libusb20/Makefile#5 delete .. //depot/projects/usb/src/lib/libusb20/libusb20.3#9 delete .. //depot/projects/usb/src/lib/libusb20/libusb20.c#17 delete .. //depot/projects/usb/src/lib/libusb20/libusb20.h#12 delete .. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#13 delete .. //depot/projects/usb/src/lib/libusb20/libusb20_compat10.c#4 delete .. //depot/projects/usb/src/lib/libusb20/libusb20_compat10.h#4 delete .. //depot/projects/usb/src/lib/libusb20/libusb20_desc.c#7 delete .. //depot/projects/usb/src/lib/libusb20/libusb20_desc.h#6 delete .. //depot/projects/usb/src/lib/libusb20/libusb20_int.h#10 delete .. //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#16 delete .. //depot/projects/usb/src/lib/libusb20/usb.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue May 18 05:04:34 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E2C6E1065672; Tue, 18 May 2010 05:04:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 984CC106566B for ; Tue, 18 May 2010 05:04:33 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8445E8FC0C for ; Tue, 18 May 2010 05:04:33 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4I54X5W069944 for ; Tue, 18 May 2010 05:04:33 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4I54Xem069942 for perforce@freebsd.org; Tue, 18 May 2010 05:04:33 GMT (envelope-from gcooper@FreeBSD.org) Date: Tue, 18 May 2010 05:04:33 GMT Message-Id: <201005180504.o4I54Xem069942@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178428 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2010 05:04:34 -0000 http://p4web.freebsd.org/@@178428?ac=10 Change 178428 by gcooper@gcooper-bayonetta on 2010/05/18 05:04:16 Remove all user printable code and refactor things so that this file (at least) functions more like a library. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#16 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#16 (text+ko) ==== @@ -197,23 +197,30 @@ { struct stat sb; char *contents = NULL; - int fd = -1; + int fd; + int serrno; + + errno = 0; + + if ((fd = open(fname, O_RDONLY)) >= 0 && fstat(fd, &sb) == 0) { + + if ((contents = (char *)malloc(sb.st_size + 1)) != NULL && + read(fd, contents, sb.st_size) != sb.st_size) { + serrno = errno; + /* free can screw up errno's value. */ + free(contents); + contents = NULL; + errno = serrno; + } - if (stat(fname, &sb) == -1) { - warn("%s: can't stat '%s'", __func__, fname); - } else { - contents = (char *)malloc(sb.st_size + 1); - fd = open(fname, O_RDONLY, 0); - if (fd == -1) - warn("%s: unable to open '%s' for reading", - __func__, fname); - else if (read(fd, contents, sb.st_size) != sb.st_size) - warn("%s: short read on '%s' - did not get %lld bytes", - __func__, fname, (long long) sb.st_size); } - if (0 <= fd) + if (0 <= fd) { + serrno = errno; close(fd); + if (serrno != 0) + errno = serrno; + } if (contents != NULL) contents[sb.st_size] = '\0'; @@ -268,23 +275,23 @@ FILE *fp = NULL; off_t written_len = -1; size_t len; + int serrno; errno = 0; fp = fopen(name, "w"); - if (fp == NULL) - warn("%s: cannot fopen '%s' for writing", __func__, name); - else { + if (fp != NULL) { + len = strlen(str); written_len = fwrite(str, 1, len, fp); - if ((len-written_len) != 0) - warn("%s: short fwrite on '%s', tried to write %ld " - "bytes", __func__, name, (long) len); + + if (fp != NULL) { + serrno = errno; + (void) fclose(fp); + if (serrno != 0) + errno = serrno; + } - if (fp != NULL) - if (fclose(fp) != 0) - warn("%s: failed to close file: '%s'", - __func__, name); } return (size_t) (errno == 0 && written_len > 0 ? written_len : -1); @@ -310,9 +317,14 @@ snprintf(to, FILENAME_MAX, "%s/%s", tdir, fname); - if (rename(from, to) == 0 || vsystem("/bin/mv %s %s", from, to) == 0) + if (rename(from, to) == 0 || vsystem("/bin/mv %s %s", from, to) == 0) { + /* + * Avoid confusing errno values because one of the calls + * passed. + */ + errno = 0; rc = 0; - else + } else rc = -1; return rc; @@ -338,6 +350,7 @@ struct stat sb; char *buf = NULL; int fd; + int serrno; if ((fd = unpack_to_fd(pkg, file)) != -1) { @@ -350,15 +363,23 @@ */ buf = malloc(sb.st_size); if (buf != NULL) { - if (read(fd, buf, sb.st_size) != sb.st_size) + + if (read(fd, buf, sb.st_size) != sb.st_size) { free(buf); + buf = NULL; + } + } } } - if (fd != -1) + if (0 <= fd) { + serrno = errno; close(fd); + if (serrno != 0) + errno = serrno; + } return buf; @@ -381,27 +402,13 @@ Boolean extract_whole_archive = FALSE; const char *entry_pathname = NULL; const char *error = NULL; - const char *pkg_name_humanized; int archive_fd = -1, r; + errno = 0; + if (file_expr == NULL || strcmp("*", file_expr) == 0) extract_whole_archive = TRUE; - if (pkg == NULL || strcmp(pkg, "-") == 0) - pkg_name_humanized = "(stdin)"; - else - pkg_name_humanized = pkg; - - if (Verbose) { - if (extract_whole_archive) - printf("%s: %s - will extract whole archive\n", - pkg_name_humanized, __func__); - else - printf("%s: %s - will extract files that match " - "expression: %s\n", - pkg_name_humanized, __func__, file_expr); - } - if ((archive = archive_read_new()) != NULL) { if (archive_read_support_compression_all(archive) @@ -424,13 +431,8 @@ if (archive_fd != -1 || archive == NULL) ; /* archive(3) failed to open the file descriptor. */ else if (archive_read_open_fd(archive, archive_fd, - ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { - + ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) error = archive_error_string(archive); - warnx("%s: unable to open the package from %s: %s", - __func__, pkg_name_humanized, error); - - } else while (error == NULL && (r = archive_read_next_header(archive, &archive_entry)) == @@ -445,28 +447,21 @@ r = archive_read_extract(archive, archive_entry, EXTRACT_ARCHIVE_FLAGS); - if (r == ARCHIVE_OK) { - if (Verbose) - printf("X - %s\n", - entry_pathname); - } else { + if (r != ARCHIVE_OK) error = archive_error_string(archive); - warnx("%s: extraction for %s failed: " - "%s", __func__, pkg_name_humanized, - error); - } - } else - if (Verbose) - printf("S - %s\n", entry_pathname); + } } +#if 0 + /* + * This should be stored in a global buffer or something similar that's + * retrievable via pkg_error or something of that flavor. + */ if (errno != 0) error = strerror(errno); - if (error != NULL) - warnx("%s: unpacking package - %s - failed: %s", - __func__, pkg_name_humanized, error); +#endif if (archive != NULL) archive_read_finish(archive); @@ -495,20 +490,11 @@ const char *entry_pathname = NULL; const char *error = NULL; - const char *pkg_name_humanized; - int fd = -1; /* int fd = -1; */ int archive_fd = -1, r; - if (pkg == NULL || strcmp(pkg, "-") == 0) - pkg_name_humanized = "(stdin)"; - else - pkg_name_humanized = pkg; - - if (Verbose) - printf("%s: will extract %s from %s\n", - __func__, file, pkg_name_humanized); + errno = 0; if ((archive = archive_read_new()) != NULL) { @@ -532,11 +518,8 @@ if (archive_fd != -1 || archive == NULL) ; /* archive(3) failed to open the file descriptor. */ else if (archive_read_open_fd(archive, archive_fd, - ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { + ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) error = archive_error_string(archive); - warnx("%s: unable to open the package from %s: %s", - __func__, pkg_name_humanized, error); - } else while (error == NULL && found_match == FALSE && (r = archive_read_next_header(archive, &archive_entry)) == @@ -556,29 +539,23 @@ r = archive_read_extract(archive, archive_entry, EXTRACT_ARCHIVE_FLAGS); - if (r == ARCHIVE_OK) { - if (Verbose) - printf("X - %s\n", - entry_pathname); + if (r == ARCHIVE_OK) fd = open(entry_pathname, O_RDONLY); - } else { + else error = archive_error_string(archive); - warnx("%s: extraction for %s failed: " - "%s", __func__, pkg_name_humanized, - error); - } - } else - if (Verbose) - printf("S - %s\n", entry_pathname); + } } +#if 0 + /* + * This should be stored in a global buffer or something similar that's + * retrievable via pkg_error or something of that flavor. + */ if (errno != 0) error = strerror(errno); - if (error != NULL) - warnx("%s: unable to read the file - %s - from package: %s: " - "%s", __func__, file, pkg_name_humanized, error); +#endif if (archive != NULL) archive_read_finish(archive); @@ -607,7 +584,7 @@ char *cp, scratch[FILENAME_MAX * 2]; int l; - while (*fmt && max > 0) { + while (*fmt != '\0' && max > 0) { if (*fmt == '%') { switch (*++fmt) { case 'F': @@ -648,7 +625,12 @@ --max; break; } - ++fmt; + /* + * Avoid cases where malformed strings can be like: 'foobar%'. -- + * this can lead to not so awesome problems, like buffer overruns. + */ + if (fmt != '\0') + fmt++; } else { *buf++ = *fmt++; From owner-p4-projects@FreeBSD.ORG Tue May 18 12:40:00 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 665211065675; Tue, 18 May 2010 12:40:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A8A7106566C for ; Tue, 18 May 2010 12:40:00 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 17E958FC0A for ; Tue, 18 May 2010 12:40:00 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4ICdxln022851 for ; Tue, 18 May 2010 12:39:59 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4ICdxRr022849 for perforce@freebsd.org; Tue, 18 May 2010 12:39:59 GMT (envelope-from anchie@FreeBSD.org) Date: Tue, 18 May 2010 12:39:59 GMT Message-Id: <201005181239.o4ICdxRr022849@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178441 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2010 12:40:00 -0000 http://p4web.freebsd.org/@@178441?ac=10 Change 178441 by anchie@anchie_malimis on 2010/05/18 12:39:09 Resolving conflicts occured while doing IFC. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_var.h#10 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#32 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_var.h#10 (text+ko) ==== @@ -199,12 +199,7 @@ #endif #define V_ip_rsvpd VNET(ip_rsvpd) #define V_ip_mrouter VNET(ip_mrouter) ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/netinet/ip_var.h#62 -extern u_char ip_protox[]; -extern int (*legal_vif_num)(int); -extern u_long (*ip_mcast_src)(int); -extern struct pr_usrreqs rip_usrreqs; #define V_rsvp_on VNET(rsvp_on) #define V_send_so VNET(send_so) ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#32 (text+ko) ==== @@ -1773,7 +1773,7 @@ int error = -1; int flags = 0; int ip6len; - int skip; + int skip = 0; unsigned short *nd_type; ip6 = mtod(m, struct ip6_hdr *); From owner-p4-projects@FreeBSD.ORG Tue May 18 13:43:09 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C94E1065675; Tue, 18 May 2010 13:43:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5FE031065672 for ; Tue, 18 May 2010 13:43:09 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4ABA68FC14 for ; Tue, 18 May 2010 13:43:09 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4IDh9Eo039104 for ; Tue, 18 May 2010 13:43:09 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4IDh8ZG039100 for perforce@freebsd.org; Tue, 18 May 2010 13:43:08 GMT (envelope-from anchie@FreeBSD.org) Date: Tue, 18 May 2010 13:43:08 GMT Message-Id: <201005181343.o4IDh8ZG039100@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178442 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2010 13:43:09 -0000 http://p4web.freebsd.org/@@178442?ac=10 Change 178442 by anchie@anchie_malimis on 2010/05/18 13:42:28 IFC @178439 Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/exception.S#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/identcpu.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/disassem.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/md_var.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/module.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/boot/forth/loader.conf.5#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cam/scsi/scsi_sg.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/boot/zfs/zfsimpl.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/files#11 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/files.powerpc#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/options#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/run/rt2870.fw.uu#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ddb/ddb.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ata/chipsets/ata-serverworks.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/bwn/if_bwn.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_em.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_igb.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_lem.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/fxp/if_fxp.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/isp/isp_freebsd.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/isp/ispvar.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ixgbe/ixgbe.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ofw/ofw_if.m#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ofw/ofw_standard.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ofw/openfirm.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/pci/pci.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/sge/if_sge.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/sge/if_sgereg.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/controller/ehci.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/controller/usb_controller.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/input/ums.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/net/uhso.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/quirk/usb_quirk.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/u3g.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/uftdi.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_dev.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_device.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_device.h#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_generic.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_hid.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_hub.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usb_request.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usbhid.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_run.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_runreg.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_runvar.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clsubs.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clvfsops.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/multipath/g_multipath.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/vinum/geom_vinum.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/vinum/geom_vinum_events.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/vinum/geom_vinum_var.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/zero/g_zero.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/geode.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/xen/pmap.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/sched_ule.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_pcpu.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_smp.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_witness.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_default.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/vnode_if.src#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/adm5120/if_admsw.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/XLR#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/hwfunc.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/locore.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/param.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/smp.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/cpu.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/elf_machdep.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/machdep.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/mp_machdep.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/mpboot.S#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/pmap.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/dev/xlr/rge.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/files.xlr#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/interrupt.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/intr_machdep.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/iodi.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/mpwait.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/on_chip.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/pic.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/xlr_machdep.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/xlr_pci.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/xlrconfig.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/sibyte/sb_machdep.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/Makefile#14 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/cas/Makefile#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/mvs/Makefile#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/zfs/Makefile#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/flowtable.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/flowtable.h#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/if_vlan.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/vnet.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_bsd_addr.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_bsd_addr.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_constants.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_indata.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_input.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_pcb.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_pcb.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_timer.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_usrreq.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctputil.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/ip6_input.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/ip6_output.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/aim/mmu_oea.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/aim/mmu_oea64.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/aim/ofw_machdep.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/booke/pmap.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/cpufreq/pcr.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/ofw/ofw_pcibus.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/ofw/ofw_real.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/powermac/ata_kauai.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/powermac/cpcht.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/powermac/cpchtvar.h#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/powermac/smu.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/powermac/uninorth.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/powermac/uninorthpci.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/powermac/uninorthvar.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/powerpc/openpic.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/pci/schizo.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/pci/schizoreg.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/pci/schizovar.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sun4v/sun4v/pmap.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/eventhandler.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/lock.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/vnode.h#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_object.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_page.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_page.h#4 integrate Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/apic_vector.S#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.113 2010/03/29 19:13:34 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.115 2010/05/13 09:59:10 kib Exp $ */ /* @@ -81,7 +81,7 @@ /* No EOI cycle used here */ - iretq + jmp doreti_iret ISR_VEC(1, apic_isr1) ISR_VEC(2, apic_isr2) @@ -135,7 +135,7 @@ incl smp_tlb_wait popq %rax - iretq + jmp doreti_iret /* * Single page TLB shootdown @@ -155,7 +155,7 @@ incl smp_tlb_wait popq %rax - iretq + jmp doreti_iret /* * Page range TLB shootdown. @@ -181,7 +181,7 @@ popq %rdx popq %rax - iretq + jmp doreti_iret /* * Invalidate cache. @@ -200,7 +200,7 @@ incl smp_tlb_wait popq %rax - iretq + jmp doreti_iret /* * Handler for IPIs sent via the per-cpu IPI bitmap. @@ -247,7 +247,7 @@ call cpususpend_handler POP_FRAME - iretq + jmp doreti_iret /* * Executed by a CPU when it receives a RENDEZVOUS IPI from another CPU. ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/exception.S#6 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.145 2010/05/03 14:30:49 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.146 2010/05/12 10:29:35 kib Exp $ */ #include "opt_atpic.h" @@ -553,7 +553,7 @@ movq TF_R14(%rsp),%r14 movq TF_R15(%rsp),%r15 addq $TF_RIP,%rsp - iretq + jmp doreti_iret ENTRY(fork_trampoline) movq %r12,%rdi /* function */ ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/pmap.c#9 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.696 2010/05/08 20:34:01 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.697 2010/05/16 23:45:10 alc Exp $"); /* * Manages physical address maps. @@ -3139,7 +3139,10 @@ va = trunc_page(va); KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig")); KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS, - ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", va)); + ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)", + va)); + KASSERT((m->oflags & VPO_BUSY) != 0, + ("pmap_enter: page %p is not busy", m)); mpte = NULL; @@ -4240,7 +4243,16 @@ pt_entry_t oldpte, *pte; vm_offset_t va; - if ((m->flags & PG_FICTITIOUS) != 0 || + KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + ("pmap_remove_write: page %p is not managed", m)); + + /* + * If the page is not VPO_BUSY, then PG_WRITEABLE cannot be set by + * another thread while the object is locked. Thus, if PG_WRITEABLE + * is clear, no page table entries need updating. + */ + VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); + if ((m->oflags & VPO_BUSY) == 0 && (m->flags & PG_WRITEABLE) == 0) return; vm_page_lock_queues(); ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/trap.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.342 2010/05/01 13:15:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.343 2010/05/12 10:29:06 kib Exp $"); /* * AMD64 Trap and System call handling @@ -488,22 +488,18 @@ } if (frame->tf_rip == (long)ld_ds) { frame->tf_rip = (long)ds_load_fault; - frame->tf_ds = _udatasel; goto out; } if (frame->tf_rip == (long)ld_es) { frame->tf_rip = (long)es_load_fault; - frame->tf_es = _udatasel; goto out; } if (frame->tf_rip == (long)ld_fs) { frame->tf_rip = (long)fs_load_fault; - frame->tf_fs = _ufssel; goto out; } if (frame->tf_rip == (long)ld_gs) { frame->tf_rip = (long)gs_load_fault; - frame->tf_gs = _ugssel; goto out; } if (frame->tf_rip == (long)ld_gsbase) { ==== //depot/projects/soc2009/anchie_send/src/sys/arm/arm/identcpu.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.19 2010/05/04 10:14:05 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.20 2010/05/12 05:50:56 kevlo Exp $"); #include #include #include @@ -220,7 +220,7 @@ generic_steppings }, { CPU_ID_ARM966ESR1, CPU_CLASS_ARM9ES, "ARM966E-S", generic_steppings }, - { CPU_ID_FA526, CPU_CLASS_ARM9, "FA526", + { CPU_ID_FA526, CPU_CLASS_ARM9TDMI, "FA526", generic_steppings }, { CPU_ID_FA626TE, CPU_CLASS_ARM9ES, "FA626TE", generic_steppings }, @@ -322,7 +322,6 @@ { "ARM7", "CPU_ARM7" }, /* CPU_CLASS_ARM7 */ { "ARM7TDMI", "CPU_ARM7TDMI" }, /* CPU_CLASS_ARM7TDMI */ { "ARM8", "CPU_ARM8" }, /* CPU_CLASS_ARM8 */ - { "ARM9", "CPU_ARM9" }, /* CPU_CLASS_ARM9 */ { "ARM9TDMI", "CPU_ARM9TDMI" }, /* CPU_CLASS_ARM9TDMI */ { "ARM9E-S", "CPU_ARM9E" }, /* CPU_CLASS_ARM9ES */ { "ARM9EJ-S", "CPU_ARM9E" }, /* CPU_CLASS_ARM9EJS */ ==== //depot/projects/soc2009/anchie_send/src/sys/arm/arm/pmap.c#10 (text+ko) ==== @@ -140,7 +140,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.122 2010/05/08 20:34:01 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.123 2010/05/16 23:45:10 alc Exp $"); #include #include #include @@ -3318,6 +3318,8 @@ u_int oflags; vm_paddr_t pa; + KASSERT((m->oflags & VPO_BUSY) != 0 || (flags & M_NOWAIT) != 0, + ("pmap_enter_locked: page %p is not busy", m)); PMAP_ASSERT_LOCKED(pmap); mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (va == vector_page) { @@ -4527,7 +4529,17 @@ pmap_remove_write(vm_page_t m) { - if (m->flags & PG_WRITEABLE) { + KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + ("pmap_remove_write: page %p is not managed", m)); + + /* + * If the page is not VPO_BUSY, then PG_WRITEABLE cannot be set by + * another thread while the object is locked. Thus, if PG_WRITEABLE + * is clear, no page table entries need updating. + */ + VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); + if ((m->oflags & VPO_BUSY) != 0 || + (m->flags & PG_WRITEABLE) != 0) { vm_page_lock_queues(); pmap_clearbit(m, PVF_WRITE); vm_page_unlock_queues(); ==== //depot/projects/soc2009/anchie_send/src/sys/arm/include/disassem.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * * Define the interface structure required by the disassembler. * - * $FreeBSD: src/sys/arm/include/disassem.h,v 1.2 2005/01/05 21:58:48 imp Exp $ + * $FreeBSD: src/sys/arm/include/disassem.h,v 1.3 2010/05/14 00:00:19 cognet Exp $ */ #ifndef _MACHINE_DISASSEM_H_ @@ -43,7 +43,7 @@ typedef struct { u_int (*di_readword)(u_int); void (*di_printaddr)(u_int); - void (*di_printf)(const char *, ...) __printflike(1, 2); + int (*di_printf)(const char *, ...) __printflike(1, 2); } disasm_interface_t; /* Prototypes for callable functions */ ==== //depot/projects/soc2009/anchie_send/src/sys/arm/include/md_var.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/md_var.h,v 1.40 2001/07/12 - * $FreeBSD: src/sys/arm/include/md_var.h,v 1.7 2010/02/20 14:54:11 kevlo Exp $ + * $FreeBSD: src/sys/arm/include/md_var.h,v 1.8 2010/05/12 05:50:56 kevlo Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -57,7 +57,6 @@ CPU_CLASS_ARM7, CPU_CLASS_ARM7TDMI, CPU_CLASS_ARM8, - CPU_CLASS_ARM9, CPU_CLASS_ARM9TDMI, CPU_CLASS_ARM9ES, CPU_CLASS_ARM9EJS, ==== //depot/projects/soc2009/anchie_send/src/sys/boot/common/module.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.29 2009/12/31 12:17:38 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.30 2010/05/10 18:23:00 imp Exp $"); /* * file/module function dispatcher, support, etc. @@ -295,7 +295,8 @@ } static int -file_load_dependencies(struct preloaded_file *base_file) { +file_load_dependencies(struct preloaded_file *base_file) +{ struct file_metadata *md; struct preloaded_file *fp; struct mod_depend *verinfo; ==== //depot/projects/soc2009/anchie_send/src/sys/boot/forth/loader.conf.5#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/sys/boot/forth/loader.conf.5,v 1.29 2009/11/27 03:55:42 sobomax Exp $ +.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.30 2010/05/13 12:07:55 uqs Exp $ .Dd January 16, 2008 .Dt LOADER.CONF 5 .Os @@ -243,6 +243,14 @@ .Xr boot 8 , .Xr loader 8 , .Xr loader.4th 8 +.Sh HISTORY +The file +.Nm +first appeared in +.Fx 3.2 . +.Sh AUTHORS +This manual page was written by +.An Daniel C. Sobral Aq dcs@FreeBSD.org . .Sh BUGS The .Xr loader 8 @@ -253,11 +261,3 @@ .Dq Va hw.ata.ata_dma Ns "=0" ) should precede any experimental additions to .Nm . -.Sh HISTORY -The file -.Nm -first appeared in -.Fx 3.2 . -.Sh AUTHORS -This manual page was written by -.An Daniel C. Sobral Aq dcs@FreeBSD.org . ==== //depot/projects/soc2009/anchie_send/src/sys/cam/scsi/scsi_sg.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.17 2010/03/17 18:53:58 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.19 2010/05/11 22:51:13 mjacob Exp $"); #include #include @@ -303,7 +303,14 @@ softc->dev = make_dev(&sg_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); - (void)make_dev_alias(softc->dev, "sg%c", 'a' + periph->unit_number); + if (periph->unit_number < 26) { + (void)make_dev_alias(softc->dev, "sg%c", + periph->unit_number + 'a'); + } else { + (void)make_dev_alias(softc->dev, "sg%c%c", + ((periph->unit_number / 26) - 1) + 'a', + (periph->unit_number % 26) + 'a'); + } cam_periph_lock(periph); softc->dev->si_drv1 = periph; ==== //depot/projects/soc2009/anchie_send/src/sys/cddl/boot/zfs/zfsimpl.h#3 (text+ko) ==== @@ -66,7 +66,7 @@ #define P2ROUNDUP(x, align) (-(-(x) & -(align))) #define P2END(x, align) (-(~(x) & -(align))) #define P2PHASEUP(x, align, phase) ((phase) - (((phase) - (x)) & -(align))) -#define P2CROSS(x, y, align) (((x) ^ (y)) > (align) - 1) +#define P2BOUNDARY(off, len, align) (((off) ^ ((off) + (len) - 1)) > (align) - 1) /* * General-purpose 32-bit and 64-bit bitfield encodings. ==== //depot/projects/soc2009/anchie_send/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c,v 1.2 2010/04/19 09:03:36 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c,v 1.3 2010/05/16 15:12:34 pjd Exp $"); #include #include @@ -40,12 +40,6 @@ static uma_zone_t taskq_zone; -struct ostask { - struct task ost_task; - task_func_t *ost_func; - void *ost_arg; -}; - taskq_t *system_taskq = NULL; static void @@ -140,3 +134,32 @@ return ((taskqid_t)(void *)task); } + +#define TASKQ_MAGIC 0x74541c + +static void +taskq_run_safe(void *arg, int pending __unused) +{ + struct ostask *task = arg; + + ASSERT(task->ost_magic == TASKQ_MAGIC); + task->ost_func(task->ost_arg); + task->ost_magic = 0; +} + +taskqid_t +taskq_dispatch_safe(taskq_t *tq, task_func_t func, void *arg, + struct ostask *task) +{ + + ASSERT(task->ost_magic != TASKQ_MAGIC); + + task->ost_magic = TASKQ_MAGIC; + task->ost_func = func; + task->ost_arg = arg; + + TASK_INIT(&task->ost_task, 0, taskq_run_safe, task); + taskqueue_enqueue(tq->tq_queue, &task->ost_task); + + return ((taskqid_t)(void *)task); +} ==== //depot/projects/soc2009/anchie_send/src/sys/cddl/compat/opensolaris/sys/dnlc.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/dnlc.h,v 1.4 2008/11/17 20:49:29 pjd Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/dnlc.h,v 1.5 2010/05/11 22:46:36 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_DNLC_H_ @@ -35,6 +35,6 @@ #define dnlc_update(dvp, name, vp) do { } while (0) #define dnlc_remove(dvp, name) do { } while (0) #define dnlc_purge_vfsp(vfsp, count) (0) -#define dnlc_reduce_cache(percent) EVENTHANDLER_INVOKE(vfs_lowvnodes, (int)(intptr_t)(percent)) +#define dnlc_reduce_cache(percent) do { } while (0) #endif /* !_OPENSOLARIS_SYS_DNLC_H_ */ ==== //depot/projects/soc2009/anchie_send/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 (text+ko) ==== @@ -19,7 +19,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/sysmacros.h,v 1.5 2009/02/28 16:21:25 ed Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/sysmacros.h,v 1.6 2010/05/13 20:32:56 mm Exp $ */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ @@ -43,6 +43,10 @@ #define ABS(a) ((a) < 0 ? -(a) : (a)) #endif +#ifndef SIGNOF +#define SIGNOF(a) ((a) < 0 ? -1 : (a) > 0) +#endif + /* * Macro for checking power of 2 address alignment. */ @@ -63,7 +67,7 @@ #define P2ROUNDUP(x, align) (-(-(x) & -(align))) #define P2END(x, align) (-(~(x) & -(align))) #define P2PHASEUP(x, align, phase) ((phase) - (((phase) - (x)) & -(align))) -#define P2CROSS(x, y, align) (((x) ^ (y)) > (align) - 1) +#define P2BOUNDARY(off, len, align) (((off) ^ ((off) + (len) - 1)) > (align) - 1) /* * Determine whether two numbers have the same high-order bit. */ ==== //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#4 (text+ko) ==== @@ -308,20 +308,18 @@ ASSERT3U(db->db.db_offset, ==, db->db_blkid * db->db.db_size); } - if (db->db_level == 0) { - /* we can be momentarily larger in dnode_set_blksz() */ - if (db->db_blkid != DB_BONUS_BLKID && dn) { - ASSERT3U(db->db.db_size, >=, dn->dn_datablksz); - } - if (db->db.db_object == DMU_META_DNODE_OBJECT) { - dbuf_dirty_record_t *dr = db->db_data_pending; - /* - * it should only be modified in syncing - * context, so make sure we only have - * one copy of the data. - */ - ASSERT(dr == NULL || dr->dt.dl.dr_data == db->db_buf); - } + /* + * We can't assert that db_size matches dn_datablksz because it + * can be momentarily different when another thread is doing + * dnode_set_blksz(). + */ + if (db->db_level == 0 && db->db.db_object == DMU_META_DNODE_OBJECT) { + dbuf_dirty_record_t *dr = db->db_data_pending; + /* + * It should only be modified in syncing context, so + * make sure we only have one copy of the data. + */ + ASSERT(dr == NULL || dr->dt.dl.dr_data == db->db_buf); } /* verify db->db_blkptr */ @@ -1917,7 +1915,6 @@ dnode_t *dn = db->db_dnode; objset_impl_t *os = dn->dn_objset; uint64_t txg = tx->tx_txg; - int blksz; ASSERT(dmu_tx_is_syncing(tx)); @@ -2027,23 +2024,24 @@ return; } - blksz = arc_buf_size(*datap); - - if (dn->dn_object != DMU_META_DNODE_OBJECT) { + if (dn->dn_object != DMU_META_DNODE_OBJECT && + refcount_count(&db->db_holds) > 1 && + *datap == db->db_buf) { /* - * If this buffer is currently "in use" (i.e., there are - * active holds and db_data still references it), then make - * a copy before we start the write so that any modifications - * from the open txg will not leak into this write. + * If this buffer is currently "in use" (i.e., there + * are active holds and db_data still references it), + * then make a copy before we start the write so that + * any modifications from the open txg will not leak + * into this write. * - * NOTE: this copy does not need to be made for objects only - * modified in the syncing context (e.g. DNONE_DNODE blocks). + * NOTE: this copy does not need to be made for + * objects only modified in the syncing context (e.g. + * DNONE_DNODE blocks). */ - if (refcount_count(&db->db_holds) > 1 && *datap == db->db_buf) { - arc_buf_contents_t type = DBUF_GET_BUFC_TYPE(db); - *datap = arc_buf_alloc(os->os_spa, blksz, db, type); - bcopy(db->db.db_data, (*datap)->b_data, blksz); - } + int blksz = arc_buf_size(*datap); + arc_buf_contents_t type = DBUF_GET_BUFC_TYPE(db); + *datap = arc_buf_alloc(os->os_spa, blksz, db, type); + bcopy(db->db.db_data, (*datap)->b_data, blksz); } ASSERT(*datap != NULL); ==== //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#5 (text+ko) ==== @@ -1192,6 +1192,7 @@ { dbuf_init(); dnode_init(); + zfetch_init(); arc_init(); l2arc_init(); } @@ -1200,6 +1201,7 @@ dmu_fini(void) { arc_fini(); + zfetch_fini(); dnode_fini(); dbuf_fini(); l2arc_fini(); ==== //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#4 (text+ko) ==== @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include #include #include @@ -172,66 +170,59 @@ (level) * (dnp->dn_indblkshift - SPA_BLKPTRSHIFT))) static int -backup_cb(traverse_blk_cache_t *bc, spa_t *spa, void *arg) +backup_cb(spa_t *spa, blkptr_t *bp, const zbookmark_t *zb, + const dnode_phys_t *dnp, void *arg) { struct backuparg *ba = arg; - uint64_t object = bc->bc_bookmark.zb_object; - int level = bc->bc_bookmark.zb_level; - uint64_t blkid = bc->bc_bookmark.zb_blkid; - blkptr_t *bp = bc->bc_blkptr.blk_birth ? &bc->bc_blkptr : NULL; dmu_object_type_t type = bp ? BP_GET_TYPE(bp) : DMU_OT_NONE; - void *data = bc->bc_data; int err = 0; if (issig(JUSTLOOKING) && issig(FORREAL)) return (EINTR); - ASSERT(data || bp == NULL); - - if (bp == NULL && object == 0) { - uint64_t span = BP_SPAN(bc->bc_dnode, level); - uint64_t dnobj = (blkid * span) >> DNODE_SHIFT; + if (bp == NULL && zb->zb_object == 0) { + uint64_t span = BP_SPAN(dnp, zb->zb_level); + uint64_t dnobj = (zb->zb_blkid * span) >> DNODE_SHIFT; err = dump_freeobjects(ba, dnobj, span >> DNODE_SHIFT); } else if (bp == NULL) { - uint64_t span = BP_SPAN(bc->bc_dnode, level); - err = dump_free(ba, object, blkid * span, span); - } else if (data && level == 0 && type == DMU_OT_DNODE) { - dnode_phys_t *blk = data; + uint64_t span = BP_SPAN(dnp, zb->zb_level); + err = dump_free(ba, zb->zb_object, zb->zb_blkid * span, span); + } else if (zb->zb_level > 0 || type == DMU_OT_OBJSET) { + return (0); + } else if (type == DMU_OT_DNODE) { + dnode_phys_t *blk; int i; int blksz = BP_GET_LSIZE(bp); + uint32_t aflags = ARC_WAIT; + arc_buf_t *abuf; + if (arc_read_nolock(NULL, spa, bp, + arc_getbuf_func, &abuf, ZIO_PRIORITY_ASYNC_READ, + ZIO_FLAG_CANFAIL, &aflags, zb) != 0) + return (EIO); + + blk = abuf->b_data; for (i = 0; i < blksz >> DNODE_SHIFT; i++) { - uint64_t dnobj = - (blkid << (DNODE_BLOCK_SHIFT - DNODE_SHIFT)) + i; + uint64_t dnobj = (zb->zb_blkid << + (DNODE_BLOCK_SHIFT - DNODE_SHIFT)) + i; err = dump_dnode(ba, dnobj, blk+i); if (err) break; } - } else if (level == 0 && - type != DMU_OT_DNODE && type != DMU_OT_OBJSET) { + (void) arc_buf_remove_ref(abuf, &abuf); + } else { /* it's a level-0 block of a regular object */ + uint32_t aflags = ARC_WAIT; + arc_buf_t *abuf; int blksz = BP_GET_LSIZE(bp); - if (data == NULL) { - uint32_t aflags = ARC_WAIT; - arc_buf_t *abuf; - zbookmark_t zb; - zb.zb_objset = ba->os->os->os_dsl_dataset->ds_object; - zb.zb_object = object; - zb.zb_level = level; - zb.zb_blkid = blkid; - (void) arc_read_nolock(NULL, spa, bp, - arc_getbuf_func, &abuf, ZIO_PRIORITY_ASYNC_READ, - ZIO_FLAG_MUSTSUCCEED, &aflags, &zb); + if (arc_read_nolock(NULL, spa, bp, + arc_getbuf_func, &abuf, ZIO_PRIORITY_ASYNC_READ, + ZIO_FLAG_CANFAIL, &aflags, zb) != 0) + return (EIO); - if (abuf) { - err = dump_data(ba, type, object, blkid * blksz, - blksz, abuf->b_data); - (void) arc_buf_remove_ref(abuf, &abuf); - } - } else { - err = dump_data(ba, type, object, blkid * blksz, - blksz, data); - } + err = dump_data(ba, type, zb->zb_object, zb->zb_blkid * blksz, + blksz, abuf->b_data); + (void) arc_buf_remove_ref(abuf, &abuf); } ASSERT(err == 0 || err == EINTR); @@ -311,8 +302,7 @@ return (ba.err); } - err = traverse_dsl_dataset(ds, fromtxg, - ADVANCE_PRE | ADVANCE_HOLES | ADVANCE_DATA | ADVANCE_NOLOCK, + err = traverse_dataset(ds, fromtxg, TRAVERSE_PRE | TRAVERSE_PREFETCH, backup_cb, &ba); if (err) { ==== //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 (text+ko) ==== @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include #include #include @@ -35,510 +33,88 @@ #include #include #include -#include +#include -#define BP_SPAN_SHIFT(level, width) ((level) * (width)) - -#define BP_EQUAL(b1, b2) \ - (DVA_EQUAL(BP_IDENTITY(b1), BP_IDENTITY(b2)) && \ - (b1)->blk_birth == (b2)->blk_birth) - -/* - * Compare two bookmarks. - * - * For ADVANCE_PRE, the visitation order is: - * - * objset 0, 1, 2, ..., ZB_MAXOBJSET. - * object 0, 1, 2, ..., ZB_MAXOBJECT. - * blkoff 0, 1, 2, ... - * level ZB_MAXLEVEL, ..., 2, 1, 0. - * - * where blkoff = blkid << BP_SPAN_SHIFT(level, width), and thus a valid - * ordering vector is: - * - * < objset, object, blkoff, -level > - * - * For ADVANCE_POST, the starting offsets aren't sequential but ending - * offsets [blkoff = (blkid + 1) << BP_SPAN_SHIFT(level, width)] are. - * The visitation order is: - * - * objset 1, 2, ..., ZB_MAXOBJSET, 0. - * object 1, 2, ..., ZB_MAXOBJECT, 0. - * blkoff 1, 2, ... - * level 0, 1, 2, ..., ZB_MAXLEVEL. - * - * and thus a valid ordering vector is: - * - * < objset - 1, object - 1, blkoff, level > - * - * Both orderings can be expressed as: - * - * < objset + bias, object + bias, blkoff, level ^ bias > - * - * where 'bias' is either 0 or -1 (for ADVANCE_PRE or ADVANCE_POST) - * and 'blkoff' is (blkid - bias) << BP_SPAN_SHIFT(level, wshift). - * - * Special case: an objset's osphys is represented as level -1 of object 0. - * It is always either the very first or very last block we visit in an objset. - * Therefore, if either bookmark's level is -1, level alone determines order. - */ -static int -compare_bookmark(zbookmark_t *szb, zbookmark_t *ezb, dnode_phys_t *dnp, - int advance) -{ - int bias = (advance & ADVANCE_PRE) ? 0 : -1; - uint64_t sblkoff, eblkoff; - int slevel, elevel, wshift; - - if (szb->zb_objset + bias < ezb->zb_objset + bias) - return (-1); - - if (szb->zb_objset + bias > ezb->zb_objset + bias) - return (1); - - slevel = szb->zb_level; - elevel = ezb->zb_level; - - if ((slevel | elevel) < 0) - return ((slevel ^ bias) - (elevel ^ bias)); - - if (szb->zb_object + bias < ezb->zb_object + bias) - return (-1); - - if (szb->zb_object + bias > ezb->zb_object + bias) - return (1); - - if (dnp == NULL) - return (0); - - wshift = dnp->dn_indblkshift - SPA_BLKPTRSHIFT; - - sblkoff = (szb->zb_blkid - bias) << BP_SPAN_SHIFT(slevel, wshift); - eblkoff = (ezb->zb_blkid - bias) << BP_SPAN_SHIFT(elevel, wshift); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue May 18 20:13:18 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A94AF106567E; Tue, 18 May 2010 20:13:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C552106567C for ; Tue, 18 May 2010 20:13:18 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 407388FC13 for ; Tue, 18 May 2010 20:13:18 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4IKDIxn086218 for ; Tue, 18 May 2010 20:13:18 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4IKDIPJ086216 for perforce@freebsd.org; Tue, 18 May 2010 20:13:18 GMT (envelope-from gcooper@FreeBSD.org) Date: Tue, 18 May 2010 20:13:18 GMT Message-Id: <201005182013.o4IKDIPJ086216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2010 20:13:18 -0000 http://p4web.freebsd.org/@@178455?ac=10 Change 178455 by gcooper@gcooper-bioshock on 2010/05/18 20:12:28 Remove python code as python appears to be broken on FreeBSD 9-CURRENT. I need a stable base to work with if I'm going to be writing tests. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/lib/libpkg/tests/__init__.py#4 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/lib/libpkg/tests/test_unpack.py#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue May 18 20:14:19 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA03F106566B; Tue, 18 May 2010 20:14:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75B97106567E for ; Tue, 18 May 2010 20:14:19 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 614FA8FC0A for ; Tue, 18 May 2010 20:14:19 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4IKEJmV086286 for ; Tue, 18 May 2010 20:14:19 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4IKEJw3086284 for perforce@freebsd.org; Tue, 18 May 2010 20:14:19 GMT (envelope-from gcooper@FreeBSD.org) Date: Tue, 18 May 2010 20:14:19 GMT Message-Id: <201005182014.o4IKEJw3086284@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178456 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2010 20:14:20 -0000 http://p4web.freebsd.org/@@178456?ac=10 Change 178456 by gcooper@gcooper-bioshock on 2010/05/18 20:13:29 ports doesn't belong in my p4 workspace. Another mismerge apparently. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/.cvsignore#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/CHANGES#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/COPYRIGHT#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/GIDs#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/KNOBS#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/LEGAL#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/MOVED#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Makefile#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.apache.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.autotools.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.cmake.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.commands.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.database.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.destdir.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.efl.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.emacs.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.fpc.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.gcc.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.gecko.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.gnome.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.gnustep.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.gstreamer.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.java.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.kde.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.kde4.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.ldap.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.linux-apps.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.linux-rpm.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.local.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.lua.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.mail.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.ocaml.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.octave.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.openssl.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.perl.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.php.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.port.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.port.options.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.port.post.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.port.pre.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.port.subdir.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.python.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.qt.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.ruby.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.scons.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.sdl.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.sites.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.tcl.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.wx.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.xfce.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Mk/bsd.xorg.mk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/README#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Templates/BSD.local.dist#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Templates/README.category#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Templates/README.port#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Templates/README.top#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Templates/config.guess#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Templates/config.sub#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/make_index#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/make_readmes#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/4/bindist/README#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/4/bindist/delete#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/4/bindist/dirlist#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/4/bindist/files/usr/bin/uname#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/4/mkbindist.conf#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/5/bindist/files/usr/bin/uname#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/5/mkbindist.conf#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/errorlogs/index.shtml#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/mlist#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/portbuild.conf#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/allgohans#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/bothlogs#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/build#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/buildenv#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/buildfailure#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/buildproxy#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/buildproxy-client#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/buildscript#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/buildsuccess#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/checkmachines#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/checkmachines.sh#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/chopindex#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/claim-chroot#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/clean-chroot#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/cleanup-chroots#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/client-metrics#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/comparelogs#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/cpdistfiles#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/cppackages#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/docppackages#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/dodistfiles#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/dologs#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/dopackages#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/dopackages.wrapper#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/dopackages2#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/dopackagestats#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/dosetupnode#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/flushsquid#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/getmachine#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/keeprestr#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/makeduds#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/makeindex#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/makerestr#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/makeworld#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/mkbindist#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/packagebuild#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/pdispatch#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/pnohang.c#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/pollmachine#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/portbuild#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/processfail#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/processlogs#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/processlogs2#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/processonelog#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/prunebad#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/prunefailure#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/prunepkgs#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/ptimeout.c#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/releasemachine#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/reportload#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/reportload.sh#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/setupnode#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/showrunning#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/stats#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/straslivy.py#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/updatesnap#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/updatesnap.ports#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/zbackup#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/zclient#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/zexpire#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/portbuild/scripts/zsync#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/MOVEDlint.awk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/README#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/README.patchtool#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/README.portsearch#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/addport#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/ardiff#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/bad-pkgdescrs.sh#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/bump_revision.pl#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/check-latest-link#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/checkcats.py#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/checknewver.sh#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/checksize.sh#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/checksum.sh#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/chkdepschain.py#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/chkorigin.sh#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/chkversion.pl#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/close-pr#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/consistency-check#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/distclean.sh#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/distinfochecker#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/domakedescribe#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/doportlint#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/explicit_lib_depends.sh#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/getpr#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/gnomedepends.py#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/mark_safe.pl#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/mergebase.sh#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/mkptools/mkpbuild#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/mkptools/mkpclean#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/mkptools/mkpextr#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/mkptools/mkpinstall#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/mkptools/mkpmerge#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/mkptools/mkppackage#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/mkptools/mkpskel#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/modules/Makefile#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/modules/buildmodules.pl#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/modules/modules.head#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/modules/update.sh#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/neededlibs.sh#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/p5-deps.pl#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/parse-kdump.tcl#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/patchtool.py#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/pkg-stash/pkg-list.sh#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/pkg-stash/pkg-stash.pl#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/plist#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/portsearch#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/portsvar.sh#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/prdone#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/prpatch#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/release/Makefile#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/release/README#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/release/checkdeps.pl#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/release/config#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/release/doit.sh#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/release/oneshot.pl#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/release/scrubindex.pl#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/release/setup.sh#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/resolveportsfromlibs.sh#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/rmport#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/security-check.awk#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/splitpatch.pl#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/sunshar.rb#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/sunshar/Makefile#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/sunshar/sunshar.1#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/tindex#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/Tools/scripts/update-patches#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/UIDs#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/ports/UPDATING#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue May 18 20:55:14 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65EF41065672; Tue, 18 May 2010 20:55:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A197106566B for ; Tue, 18 May 2010 20:55:14 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-gx0-f226.google.com (mail-gx0-f226.google.com [209.85.217.226]) by mx1.freebsd.org (Postfix) with ESMTP id D75D68FC13 for ; Tue, 18 May 2010 20:55:13 +0000 (UTC) Received: by gxk26 with SMTP id 26so2377058gxk.13 for ; Tue, 18 May 2010 13:55:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:content-type:content-transfer-encoding; bh=IMiTf/oaUP9k8ky1a1T4Jm8pGOhX8qgZ831Ub8Ei/Lc=; b=XlW95vpf34v7MffCVr9Uhj0RB3VqsQEAr5lYivIrrFKr0iFVTJ77epWhq6IzneZJBR 8cnqDIVVIHY6FgC0jhTsYdNNNE4+D3ld7IGQDpH/+z0m6Zj229+jba/6/yKmSz0C9P1w IoeHnayLHl4dwNpTMW231Sb+j4VXzTM351GUQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:content-type :content-transfer-encoding; b=xPNL//fItRkw3r5VtjMHdf9j18BkUySOM6K0P1dn92P2i9E2mpq6cwpEJnNSHJo6at +gCTqckAdMz9X8NYOEerUALatY1KDMHeinJErEXn62kYoC5fUG3krGe6z78a1NT+X/NV VnYKy8pqZx4LOA2GC8q4ePFWSIkqPB0+ItWjU= MIME-Version: 1.0 Received: by 10.231.149.131 with SMTP id t3mr2479711ibv.55.1274214306461; Tue, 18 May 2010 13:25:06 -0700 (PDT) Sender: yanegomi@gmail.com Received: by 10.231.47.136 with HTTP; Tue, 18 May 2010 13:25:06 -0700 (PDT) In-Reply-To: <201005182013.o4IKDIPJ086216@repoman.freebsd.org> References: <201005182013.o4IKDIPJ086216@repoman.freebsd.org> Date: Tue, 18 May 2010 13:25:06 -0700 X-Google-Sender-Auth: m1Q3KWSjdzxh2yxpRlA4h9x96H0 Message-ID: From: Garrett Cooper To: Perforce Change Reviews Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Subject: Re: PERFORCE change 178455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2010 20:55:14 -0000 On Tue, May 18, 2010 at 1:13 PM, Garrett Cooper wrote= : > http://p4web.freebsd.org/@@178455?ac=3D10 > > Change 178455 by gcooper@gcooper-bioshock on 2010/05/18 20:12:28 > > =A0 =A0 =A0 =A0Remove python code as python appears to be broken on FreeB= SD 9-CURRENT. > =A0 =A0 =A0 =A0I need a stable base to work with if I'm going to be writi= ng tests. > > Affected files ... > > .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/t= ools/regression/lib/libpkg/tests/__init__.py#4 delete > .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/t= ools/regression/lib/libpkg/tests/test_unpack.py#3 delete Adding some context to the issue, the official bug which causes the breakage is Python issue # 8746 (*chflags detection broken on FreeBSD 9-CURRENT). This is required for some of the functional tests I want to perform with libpkg before the unpack APIs get committed. Thanks, -Garrett From owner-p4-projects@FreeBSD.ORG Thu May 20 16:46:31 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2190E1065674; Thu, 20 May 2010 16:46:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D81F11065670 for ; Thu, 20 May 2010 16:46:30 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C3C958FC12 for ; Thu, 20 May 2010 16:46:30 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4KGkUc7051214 for ; Thu, 20 May 2010 16:46:30 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4KGkOD5051206 for perforce@freebsd.org; Thu, 20 May 2010 16:46:24 GMT (envelope-from mav@freebsd.org) Date: Thu, 20 May 2010 16:46:24 GMT Message-Id: <201005201646.o4KGkOD5051206@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178548 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 May 2010 16:46:31 -0000 http://p4web.freebsd.org/@@178548?ac=10 Change 178548 by mav@mav_mavtest on 2010/05/20 16:45:39 IFC Affected files ... .. //depot/projects/scottl-camlock/src/Makefile.inc1#20 integrate .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#28 integrate .. //depot/projects/scottl-camlock/src/UPDATING#31 integrate .. //depot/projects/scottl-camlock/src/bin/setfacl/setfacl.1#5 integrate .. //depot/projects/scottl-camlock/src/bin/sh/eval.c#12 integrate .. //depot/projects/scottl-camlock/src/bin/sh/expand.c#10 integrate .. //depot/projects/scottl-camlock/src/bin/sh/sh.1#11 integrate .. //depot/projects/scottl-camlock/src/bin/sh/var.c#9 integrate .. //depot/projects/scottl-camlock/src/bin/sh/var.h#4 integrate .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#3 integrate .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#4 integrate .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#3 integrate .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#4 integrate .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 integrate .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#3 integrate .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#2 integrate .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ipfilter/man/ipmon.8#3 integrate .. //depot/projects/scottl-camlock/src/contrib/tzcode/zic/private.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/tzdata/northamerica#2 integrate .. //depot/projects/scottl-camlock/src/contrib/tzdata/zone.tab#4 integrate .. //depot/projects/scottl-camlock/src/contrib/xz/AUTHORS#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/COPYING#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/ChangeLog#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/FREEBSD-Xlist#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/FREEBSD-upgrade#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/README#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/THANKS#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/TODO#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/po/LINGUAS#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/po/Makevars#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/po/POTFILES.in#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/po/cs.po#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/common/mythread.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/common/sysdefs.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/common/tuklib_common.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/common/tuklib_config.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/common/tuklib_cpucores.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/common/tuklib_cpucores.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/common/tuklib_exit.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/common/tuklib_exit.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/common/tuklib_gettext.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/common/tuklib_integer.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/common/tuklib_open_stdxxx.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/common/tuklib_open_stdxxx.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/common/tuklib_physmem.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/common/tuklib_physmem.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/common/tuklib_progname.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/common/tuklib_progname.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/api/lzma.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/api/lzma/base.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/api/lzma/bcj.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/api/lzma/block.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/api/lzma/check.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/api/lzma/container.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/api/lzma/delta.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/api/lzma/filter.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/api/lzma/hardware.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/api/lzma/index.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/api/lzma/index_hash.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/api/lzma/lzma.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/api/lzma/stream_flags.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/api/lzma/subblock.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/api/lzma/version.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/api/lzma/vli.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/check/check.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/check/check.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/check/crc32_fast.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/check/crc32_small.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/check/crc32_table.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/check/crc32_table_be.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/check/crc32_table_le.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/check/crc32_tablegen.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/check/crc32_x86.S#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/check/crc64_fast.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/check/crc64_small.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/check/crc64_table.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/check/crc64_table_be.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/check/crc64_table_le.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/check/crc64_tablegen.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/check/crc64_x86.S#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/check/crc_macros.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/check/sha256.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/alone_decoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/alone_decoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/alone_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/auto_decoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/block_buffer_decoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/block_buffer_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/block_decoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/block_decoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/block_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/block_encoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/block_header_decoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/block_header_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/block_util.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/chunk_size.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/common.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/common.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/easy_buffer_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/easy_decoder_memusage.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/easy_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/easy_encoder_memusage.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/easy_preset.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/easy_preset.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/filter_buffer_decoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/filter_buffer_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/filter_common.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/filter_common.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/filter_decoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/filter_decoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/filter_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/filter_encoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/filter_flags_decoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/filter_flags_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/hardware_physmem.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/index.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/index.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/index_decoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/index_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/index_encoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/index_hash.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/stream_buffer_decoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/stream_buffer_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/stream_decoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/stream_decoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/stream_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/stream_encoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/stream_flags_common.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/stream_flags_common.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/stream_flags_decoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/stream_flags_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/vli_decoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/vli_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/common/vli_size.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/delta/delta_common.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/delta/delta_common.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/delta/delta_decoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/delta/delta_decoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/delta/delta_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/delta/delta_encoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/delta/delta_private.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lz/lz_decoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lz/lz_decoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lz/lz_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lz/lz_encoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lz/lz_encoder_hash.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lz/lz_encoder_hash_table.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lz/lz_encoder_mf.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lzma/fastpos.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lzma/fastpos_table.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lzma/fastpos_tablegen.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lzma/lzma2_decoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lzma/lzma2_decoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lzma/lzma2_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lzma/lzma2_encoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lzma/lzma_common.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lzma/lzma_decoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lzma/lzma_decoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lzma/lzma_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lzma/lzma_encoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lzma/lzma_encoder_presets.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/lzma/lzma_encoder_private.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/rangecoder/price.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/rangecoder/price_table.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/rangecoder/price_tablegen.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/rangecoder/range_common.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/rangecoder/range_decoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/rangecoder/range_encoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/simple/arm.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/simple/armthumb.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/simple/ia64.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/simple/powerpc.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/simple/simple_coder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/simple/simple_coder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/simple/simple_decoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/simple/simple_decoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/simple/simple_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/simple/simple_encoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/simple/simple_private.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/simple/sparc.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/simple/x86.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/subblock/subblock_decoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/subblock/subblock_decoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/subblock/subblock_decoder_helper.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/subblock/subblock_decoder_helper.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/subblock/subblock_encoder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/liblzma/subblock/subblock_encoder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/lzmainfo/lzmainfo.1#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/lzmainfo/lzmainfo.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/args.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/args.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/coder.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/coder.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/file_io.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/file_io.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/hardware.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/hardware.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/list.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/list.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/main.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/main.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/message.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/message.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/options.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/options.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/private.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/signals.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/signals.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/suffix.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/suffix.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/util.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/util.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xz/xz.1#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xzdec/xzdec.1#1 branch .. //depot/projects/scottl-camlock/src/contrib/xz/src/xzdec/xzdec.c#1 branch .. //depot/projects/scottl-camlock/src/etc/Makefile#8 integrate .. //depot/projects/scottl-camlock/src/etc/csh.login#2 integrate .. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#21 integrate .. //depot/projects/scottl-camlock/src/etc/devd.conf#5 integrate .. //depot/projects/scottl-camlock/src/etc/mtree/BSD.include.dist#9 integrate .. //depot/projects/scottl-camlock/src/etc/network.subr#13 integrate .. //depot/projects/scottl-camlock/src/etc/periodic/daily/310.accounting#2 integrate .. //depot/projects/scottl-camlock/src/etc/periodic/daily/440.status-mailq#2 integrate .. //depot/projects/scottl-camlock/src/etc/periodic/weekly/330.catman#2 integrate .. //depot/projects/scottl-camlock/src/etc/periodic/weekly/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/etc/profile#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/SERVERS#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/bluetooth#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/bridge#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/cleanvar#5 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ddb#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/defaultroute#5 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/dumpon#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/geli#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/geli2#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/hostid#6 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/hostid_save#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/initrandom#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ipfw#8 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/mdconfig#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/mdconfig2#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/mountcritlocal#4 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/nscd#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/rfcomm_pppd_server#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/savecore#4 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/stf#4 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/syscons#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/sysctl#4 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ubthidhci#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/zvol#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.firewall#10 integrate .. //depot/projects/scottl-camlock/src/etc/rc.initdiskless#3 integrate .. //depot/projects/scottl-camlock/src/etc/regdomain.xml#2 integrate .. //depot/projects/scottl-camlock/src/etc/services#8 integrate .. //depot/projects/scottl-camlock/src/gnu/lib/libgcc/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/gnu/lib/libstdc++/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/gnu/lib/libsupc++/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/cc/Makefile.inc#4 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/cc/cc_tools/freebsd-native.h#4 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/cc/include/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/Makefile#12 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/Makefile#9 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_disk.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_open_fd.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_open_filename.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/config_freebsd.h#5 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/cpio.5#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/alarm.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/fmtcheck.3#5 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/glob.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/isgreater.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/raise.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sem_timedwait.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/setproctitle.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/siginterrupt.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/tcgetsid.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/ualarm.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/locale/isblank.3#5 integrate .. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_branding.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_perm.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdio/fgets.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdio/fopen.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdio/printf.3#6 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdio/tmpnam.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdio/wprintf.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/realpath.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/strtod.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdtime/strptime.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/string/strcat.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/string/strcpy.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/access.2#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/execve.2#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/fcntl.2#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/getitimer.2#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/getrlimit.2#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/getrusage.2#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/ioctl.2#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/quotactl.2#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/setuid.2#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/sigaction.2#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/sigaltstack.2#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/sigprocmask.2#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/sigreturn.2#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/vfork.2#3 integrate .. //depot/projects/scottl-camlock/src/lib/libelf/elf.3#5 integrate .. //depot/projects/scottl-camlock/src/lib/libftpio/ftpio.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/liblzma/Makefile#1 branch .. //depot/projects/scottl-camlock/src/lib/liblzma/Symbol.map#1 branch .. //depot/projects/scottl-camlock/src/lib/liblzma/Versions.def#1 branch .. //depot/projects/scottl-camlock/src/lib/liblzma/config.h#1 branch .. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_krb5/pam_krb5.8#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_krb5/pam_krb5.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.mips.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.xscale.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_get_error.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_get_mech_info.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_get_mechanisms.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_get_principal_name.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_get_versions.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_getcred.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_is_installed.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_max_data_length.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_mech_to_oid.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_oid_to_mech.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_qop_to_num.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_seccreate.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_set_callback.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_set_defaults.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_set_svc_name.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpcsec_gss.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb.h#6 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb10.c#8 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb10_desc.c#6 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb10_io.c#6 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb20_compat01.c#5 integrate .. //depot/projects/scottl-camlock/src/lib/libusbhid/data.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libusbhid/usbhid.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/libutil.h#5 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/quotafile.3#1 branch .. //depot/projects/scottl-camlock/src/lib/libutil/quotafile.c#1 branch .. //depot/projects/scottl-camlock/src/lib/msun/man/fenv.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/msun/man/hypot.3#3 integrate .. //depot/projects/scottl-camlock/src/libexec/rpc.rquotad/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/libexec/rpc.rquotad/rquotad.c#4 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/amd64/reloc.c#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/arm/reloc.c#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/i386/reloc.c#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/powerpc/reloc.c#4 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.c#12 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/sparc64/reloc.c#3 integrate .. //depot/projects/scottl-camlock/src/libexec/tftpd/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/libexec/tftpd/tftp-file.c#1 branch .. //depot/projects/scottl-camlock/src/libexec/tftpd/tftp-file.h#1 branch .. //depot/projects/scottl-camlock/src/libexec/tftpd/tftp-io.c#1 branch .. //depot/projects/scottl-camlock/src/libexec/tftpd/tftp-io.h#1 branch .. //depot/projects/scottl-camlock/src/libexec/tftpd/tftp-options.c#1 branch .. //depot/projects/scottl-camlock/src/libexec/tftpd/tftp-options.h#1 branch .. //depot/projects/scottl-camlock/src/libexec/tftpd/tftp-transfer.c#1 branch .. //depot/projects/scottl-camlock/src/libexec/tftpd/tftp-transfer.h#1 branch .. //depot/projects/scottl-camlock/src/libexec/tftpd/tftp-utils.c#1 branch .. //depot/projects/scottl-camlock/src/libexec/tftpd/tftp-utils.h#1 branch .. //depot/projects/scottl-camlock/src/libexec/tftpd/tftpd.8#4 integrate .. //depot/projects/scottl-camlock/src/libexec/tftpd/tftpd.c#3 integrate .. //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#8 integrate .. //depot/projects/scottl-camlock/src/release/doc/share/misc/dev.archlist.txt#4 integrate .. //depot/projects/scottl-camlock/src/rescue/rescue/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sbin/bsdlabel/bsdlabel.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_ffs/pass2.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_ffs/pass4.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/fsirand/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/fsirand/fsirand.8#2 integrate .. //depot/projects/scottl-camlock/src/sbin/fsirand/fsirand.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/part/geom_part.c#6 integrate .. //depot/projects/scottl-camlock/src/sbin/hastctl/hastctl.8#2 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/hast.conf.5#3 integrate .. //depot/projects/scottl-camlock/src/sbin/hastd/hastd.8#2 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.8#13 integrate .. //depot/projects/scottl-camlock/src/sbin/kldstat/kldstat.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/mksnap_ffs/mksnap_ffs.8#5 integrate .. //depot/projects/scottl-camlock/src/sbin/mount/mount.8#7 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_hpfs/mount_hpfs.8#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_msdosfs/mount_msdosfs.8#4 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_ntfs/mount_ntfs.8#3 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_reiserfs/mount_reiserfs.8#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_std/mount_std.8#2 integrate .. //depot/projects/scottl-camlock/src/sbin/quotacheck/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sbin/quotacheck/preen.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/quotacheck/quotacheck.8#4 integrate .. //depot/projects/scottl-camlock/src/sbin/quotacheck/quotacheck.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/quotacheck/quotacheck.h#2 integrate .. //depot/projects/scottl-camlock/src/sbin/rcorder/rcorder.8#3 integrate .. //depot/projects/scottl-camlock/src/sbin/restore/symtab.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/tunefs/tunefs.c#7 integrate .. //depot/projects/scottl-camlock/src/share/man/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man1/builtin.1#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man3/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man3/fpgetround.3#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man3/pthread_cond_timedwait.3#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man3/pthread_condattr.3#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ae.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ahb.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/amdtemp.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ataraid.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/cas.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/cmx.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/cpuctl.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ed.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ef.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/em.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/en.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/fpa.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/fxp.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/geom_fox.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/harp.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/hatm.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/hifn.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/hwpmc.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/igb.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/inet.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/iscsi_initiator.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/kbdmux.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ksyms.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/malo.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/cs.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/ie.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/mse.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/pnp.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/pnpbios.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/vx.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/wl.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.powerpc/bm.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.powerpc/snd_ai2s.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.powerpc/snd_davbus.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.sparc64/clkbrd.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.sparc64/creator.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.sparc64/machfb.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.sparc64/ofw_console.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.sparc64/openfirm.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.sparc64/openprom.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/md.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mfi.4#8 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mpt.4#6 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/natm.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ng_bridge.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ng_ccatm.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ng_hub.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/nve.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/patm.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/psm.4#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/run.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/sge.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/smp.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/snd_emu10kx.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/splash.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/syscons.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/twa.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/tx.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/u3g.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/uath.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ucom.4#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/uhso.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/usb.4#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/usb2_template.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/vkbd.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/wpi.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/boot.config.5#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/fdescfs.5#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/linsysfs.5#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/make.conf.5#6 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/reiserfs.5#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/src.conf.5#7 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/xfs.5#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/cr_seeothergids.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/cr_seeotheruids.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/fail.9#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/make_dev.9#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/mbpool.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/namei.9#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/p_candebug.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/p_cansee.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/prison_check.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/uio.9#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/usbdi.9#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/watchdog.9#3 integrate .. //depot/projects/scottl-camlock/src/share/misc/bsd-family-tree#9 integrate .. //depot/projects/scottl-camlock/src/share/misc/mdoc.template#2 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.libnames.mk#9 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.own.mk#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/apic_vector.S#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/exception.S#14 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#44 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/apicreg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/atomic.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/specialreg.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/xen/xenfunc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/xen/xenvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_fa526.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_trampoline.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/identcpu.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/if_ate.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/cpuconf.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/cpufunc.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/disassem.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/md_var.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/if_npe.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/module.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#26 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf.5#8 integrate .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/main.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/zfsimpl.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/dnlc.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#76 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.powerpc#20 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#21 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#43 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.arm#18 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/run/rt2870.fw.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_output.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/ddb.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ae/if_ae.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_i810.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/an/if_an.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-serverworks.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#37 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bwi/if_bwi.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bwn/if_bwn.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cas/if_cas.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cas/if_casreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ce/if_ce.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cm/smc90cx6.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cp/if_cp.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cs/if_cs.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ctau/if_ct.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cx/if_cx.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_adapter.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_ioctl.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/sys/mvec.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/sys/uipc_mvec.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/via_dmablit.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_lem.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ep/if_ep.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/esp/esp_sbus.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ex/if_ex.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fe/if_fe.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxp.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxpreg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxpvar.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ie/if_ie.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/if_ic.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipw.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#34 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_pci.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_sbus.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/ispvar.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwi.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwn.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/le/lance.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/malo/if_malo.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/md/md.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#35 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mwl/if_mwl.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/eth_z8e.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/ethp_z8e.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/rss_eth_z8e.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/rss_ethp_z8e.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/my/if_my.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nxge/if_nxge.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_if.m#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_standard.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ofw/openfirm.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ofw/openfirm.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pdq/pdq_ifsubr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/if_plip.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sbni/if_sbni.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sge/if_sge.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sge/if_sgereg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/smc/if_smc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sn/if_sn.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/snc/dp83932.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/buffer.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/buffer.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ti/if_ti.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/usb_controller.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ums.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/uhso.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/usb_ethernet.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uftdi.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dev.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_generic.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hid.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hub.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_request.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#48 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbhid.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rum.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_run.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_runreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_runvar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_uath.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_upgt.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_ural.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_urtw.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_zyd.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/vx/if_vx.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wi.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wl/if_wl.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wpi/if_wpi.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xe/if_xe.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xen/netfront/netfront.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_devs.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_int.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/ext2_readwrite.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_vnops.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonkrpc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfskpiport.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsport.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clbio.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clsubs.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvfsops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nullfs/null_vnops.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_io.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs_ctl.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_io.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vnops.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_subr.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/geom/multipath/g_multipath.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_apm.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_events.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_var.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/geom/zero/g_zero.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/geode.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#48 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/apicreg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/atomic.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/specialreg.h#20 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/xen/xenfunc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/xen/xenvar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/ia64_cpu.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/pmap.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/runq.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/sal.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/vmparam.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_conf.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exec.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mutex.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_proc.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_resource.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_thread.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_bufring.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_pcpu.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_smp.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_uio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_witness.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_pipe.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_cow.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#37 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_bio.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_default.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#33 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_vnops.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vnode_if.src#15 integrate .. //depot/projects/scottl-camlock/src/sys/mips/adm5120/if_admsw.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/mips/atheros/if_arge.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/XLR#6 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/hwfunc.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/locore.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/param.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/pmap.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/smp.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/cpu.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/db_trace.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/elf_machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/mp_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/mpboot.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/xlr/rge.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/files.xlr#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/interrupt.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/intr_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/iodi.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/mpwait.S#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/on_chip.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/pic.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlr_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlr_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlrconfig.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#52 integrate .. //depot/projects/scottl-camlock/src/sys/modules/cas/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/zfs/Makefile#11 integrate .. //depot/projects/scottl-camlock/src/sys/net/bpf_zerocopy.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/net/flowtable.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/net/flowtable.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.c#47 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ef.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_gif.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_gre.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_stf.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/net/vnet.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_base.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_bridge.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_bridge.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_eiface.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_fec.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_hub.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_hub.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_iface.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ksocket.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_socket.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_tty.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_bsd_addr.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_bsd_addr.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_constants.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_input.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_lock_bsd.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_structs.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_timer.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_usrreq.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#34 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_proto.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_input.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_output.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/udp6_usrreq.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/key.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_bio.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_rl.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/ofw_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/pmap.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/cpufreq/pcr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/intr_machdep.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/pmap.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/ofw/ofw_pcibus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/ofw/ofw_real.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_kauai.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/cpcht.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/cpchtvar.h#2 delete .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/smu.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/uninorth.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/uninorthpci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/uninorthvar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/openpic.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/asi.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/cache.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/mcntl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/schizo.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/schizoreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/schizovar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/cache.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/cheetah.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/identcpu.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/machdep.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/mp_locore.S#7 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/mp_machdep.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/pmap.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/tick.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/zeus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/pmap.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/sys/buf_ring.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/conf.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/sys/endian.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/eventhandler.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/sys/lock.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mbuf.h#21 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#44 integrate .. //depot/projects/scottl-camlock/src/sys/sys/proc.h#33 integrate .. //depot/projects/scottl-camlock/src/sys/sys/resource.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/resourcevar.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/sys/vmmeter.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/vnode.h#26 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_snapshot.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_softdep.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_vfsops.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_vnops.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/softdep.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/quota.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_quota.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_vfsops.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufsmount.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/vm/device_pager.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/vm/phys_pager.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/vm/sg_pager.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/vm/swap_pager.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/vm/uma_core.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_contig.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#35 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_glue.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_kern.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_object.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_page.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_pageout.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_pageout.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vnode_pager.c#19 integrate .. //depot/projects/scottl-camlock/src/tools/build/options/WITHOUT_MAN_UTILS#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/case2.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/case3.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/locale1.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/var-assign2.0#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/errors/assignment-error1.0#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/expansion/pathname1.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/expansion/pathname2.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/parser/case1.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/parser/case2.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/parser/heredoc3.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/gen/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/gen/test-fnmatch.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/tools/ether_reflect/ether_reflect.1#2 integrate .. //depot/projects/scottl-camlock/src/tools/tools/vimage/vimage.8#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/Makefile#10 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ar/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ar/acpyacc.y#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ar/ar.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ar/ar.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ar/ar.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ar/read.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ar/write.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/bsdiff/bsdiff/bsdiff.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/bsdiff/bspatch/bspatch.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.history#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/calendar/io.c#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/calendar/parsedata.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/chpass/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/chpass/chpass.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cpio/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cpio/bsdcpio.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cpio/cmdline.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cpio/config_freebsd.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cpio/cpio.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cpio/cpio.h#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cpio/cpio_platform.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cpio/err.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cpio/err.h#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/cpio/line_reader.c#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/cpio/line_reader.h#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/cpio/matching.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cpio/matching.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cpio/pathmatch.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cpio/pathmatch.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cpio/test/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/csup/cpasswd.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/csup/csup.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/find.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/function.c#8 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/ls.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/main.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/misc.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/operator.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/option.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/killall/killall.1#7 integrate .. //depot/projects/scottl-camlock/src/usr.bin/lastcomm/lastcomm.1#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/less/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/less/lesspipe.sh#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/lzmainfo/Makefile#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/make/make.1#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/mkuzip/mkuzip.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/quota/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/quota/quota.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/rpcgen/rpc_cout.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/setchannel/setchannel.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/Makefile#8 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/bsdtar.1#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/config_freebsd.h#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/test/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tftp/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tftp/main.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tftp/tftp.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tftp/tftp.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tftp/tftp.h#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/wc/wc.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/wtmpcvt/wtmpcvt.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/xz/Makefile#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/xzdec/Makefile#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/Makefile#13 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/adduser/adduser.conf.5#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/apm/apm.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/apmd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/apmd/README#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/apmd/apmd.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/apmd/apmd.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/apmd/apmd.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/apmd/apmdlex.l#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/apmd/contrib/pccardq.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bluetooth/bthidd/bthidd.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bluetooth/bthidd/hid.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bluetooth/btpand/btpand.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/clear_locks/clear_locks.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/cpucontrol/cpucontrol.8#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/cron/crontab/crontab.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/crunch/crunchgen/crunchgen.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/cxgbtool/cxgbtool.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/daemon/daemon.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/edquota/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/edquota/edquota.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/edquota/edquota.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/extattr/rmextattr.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/fifolog/lib/fifolog_reader.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/gssd/gssd.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/jail/jail.8#12 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mergemaster/mergemaster.sh#10 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mixer/mixer.8#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mount_portalfs/mount_portalfs.8#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 21 00:00:31 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C83C5106571E; Fri, 21 May 2010 00:00:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E52E106567C for ; Fri, 21 May 2010 00:00:30 +0000 (UTC) (envelope-from iprebeg@freebsd.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5B8338FC1A for ; Fri, 21 May 2010 00:00:30 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4L00UQp013987 for ; Fri, 21 May 2010 00:00:30 GMT (envelope-from iprebeg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4L00Ufu013985 for perforce@freebsd.org; Fri, 21 May 2010 00:00:30 GMT (envelope-from iprebeg@freebsd.org) Date: Fri, 21 May 2010 00:00:30 GMT Message-Id: <201005210000.o4L00Ufu013985@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to iprebeg@freebsd.org using -f From: Ivor Prebeg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178574 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 May 2010 00:00:31 -0000 http://p4web.freebsd.org/@@178574?ac=10 Change 178574 by iprebeg@iprebeg_zeus on 2010/05/21 00:00:24 Dirty hack, needs beautifing, leaving that for afterhours... fixes crash on X_ip_mrouter_done() Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#39 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#33 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#39 (text+ko) ==== @@ -608,6 +608,7 @@ ip_mrouter_reset(void) { + /* V_pim_assert_enabled = 0; V_mrt_api_config = 0; @@ -617,6 +618,7 @@ bzero(V_bw_meter_timers, sizeof(V_bw_meter_timers)); callout_init(&V_bw_upcalls_ch, CALLOUT_MPSAFE); callout_init(&V_bw_meter_ch, CALLOUT_MPSAFE); + */ } static void @@ -2829,6 +2831,18 @@ { MALLOC(V_nexpire, u_char *, mfchashsize, M_MRTABLE, M_WAITOK|M_ZERO); + + /* from ip_mrouter_reset */ + V_pim_assert_enabled = 0; + V_mrt_api_config = 0; + + callout_init(&V_expire_upcalls_ch, CALLOUT_MPSAFE); + + V_bw_upcalls_n = 0; + bzero(V_bw_meter_timers, sizeof(V_bw_meter_timers)); + callout_init(&V_bw_upcalls_ch, CALLOUT_MPSAFE); + callout_init(&V_bw_meter_ch, CALLOUT_MPSAFE); + /* from ip_mrouter_reset */ } VNET_SYSINIT(vnet_mroute_init, SI_SUB_PSEUDO, SI_ORDER_MIDDLE, vnet_mroute_init, @@ -2838,7 +2852,9 @@ vnet_mroute_uninit(const void *unused __unused) { +#ifndef VIMAGE X_ip_mrouter_done(); +#endif FREE(V_nexpire, M_MRTABLE); V_nexpire = NULL; } ==== //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#33 (text+ko) ==== @@ -81,13 +81,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/ip6_mroute.c,v 1.64 2010/04/29 11:52:42 bz Exp $"); -#define VIMAGE -#define DIAGNOSTIC -//#define MRT6DEBUG -//#define MRT6_OINIT -#define PIM6_CHECKSUM -#define UPCALL_TIMING - //#include "opt_inet.h" #include "opt_inet6.h" From owner-p4-projects@FreeBSD.ORG Fri May 21 12:07:36 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08BC31065673; Fri, 21 May 2010 12:07:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C10E2106566B for ; Fri, 21 May 2010 12:07:35 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AE66D8FC13 for ; Fri, 21 May 2010 12:07:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4LC7Zhw014146 for ; Fri, 21 May 2010 12:07:35 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4LC7ZXu014144 for perforce@freebsd.org; Fri, 21 May 2010 12:07:35 GMT (envelope-from lz@FreeBSD.org) Date: Fri, 21 May 2010 12:07:35 GMT Message-Id: <201005211207.o4LC7ZXu014144@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178586 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 May 2010 12:07:36 -0000 http://p4web.freebsd.org/@@178586?ac=10 Change 178586 by lz@gnehzuil-freebsd on 2010/05/21 12:06:55 Fix bugs and Improve naming. * Fix a bug in ext2_reclaim() * Fix a bug in ext2_alloc_new_rsv_win() * Improve naming in ext2_rsv_win structure * Initialize ip->i_rsv field in ext2_vget() from ext2_balloc() Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#13 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_balloc.c#5 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_inode.c#4 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#8 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_vfsops.c#5 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#13 (text+ko) ==== @@ -74,7 +74,7 @@ struct buf *, int32_t, int); struct ext2_rsv_win *ext2_search_rsv_win(struct ext2_rsv_win_tree *, int32_t); -RB_GENERATE(ext2_rsv_win_tree, ext2_rsv_win, rw_link, ext2_rsv_win_cmp); +RB_GENERATE(ext2_rsv_win_tree, ext2_rsv_win, rsv_link, ext2_rsv_win_cmp); /* * Lazily initialize reservation window per inode. @@ -96,11 +96,11 @@ if (rp == NULL) return; - rp->rw_start = EXT2_RWI_NOT_ALLOCATED; - rp->rw_end = EXT2_RWI_NOT_ALLOCATED; + rp->rsv_start = EXT2_RSV_NOT_ALLOCATED; + rp->rsv_end = EXT2_RSV_NOT_ALLOCATED; - rp->rw_goal_size = EXT2_RWI_DEFAULT_RESERVE_BLKS; - rp->rw_alloc_hit = 0; + rp->rsv_goal_size = EXT2_RSV_DEFAULT_RESERVE_BLKS; + rp->rsv_alloc_hit = 0; ip->i_rsv = rp; } @@ -118,18 +118,19 @@ { struct ext2_rsv_win *rp; - /* do not use reservation window */ if (ip->i_rsv == NULL) return; rp = ip->i_rsv; /* If reservation window is empty, nothing to do */ - if (rp->rw_end == EXT2_RWI_NOT_ALLOCATED) + if (rp->rsv_end == EXT2_RSV_NOT_ALLOCATED) return; - if (rp->rw_end != EXT2_RWI_NOT_ALLOCATED) + EXT2_TREE_LOCK(ip->i_e2fs); + if (rp != NULL && rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) ext2_remove_rsv_win(ip->i_e2fs, rp); + EXT2_TREE_UNLOCK(ip->i_e2fs); } /* @@ -138,10 +139,10 @@ static void ext2_remove_rsv_win(struct m_ext2fs *fs, struct ext2_rsv_win *rp) { - rp->rw_start = EXT2_RWI_NOT_ALLOCATED; - rp->rw_end = EXT2_RWI_NOT_ALLOCATED; - rp->rw_alloc_hit = 0; RB_REMOVE(ext2_rsv_win_tree, &fs->e2fs_rsv_tree, rp); + rp->rsv_start = EXT2_RSV_NOT_ALLOCATED; + rp->rsv_end = EXT2_RSV_NOT_ALLOCATED; + rp->rsv_alloc_hit = 0; } /* @@ -168,15 +169,15 @@ next = RB_ROOT(root); do { prev = next; - if (bpref < next->rw_start) - next = RB_LEFT(next, rw_link); - else if (bpref > next->rw_end) - next = RB_RIGHT(next, rw_link); + if (bpref < next->rsv_start) + next = RB_LEFT(next, rsv_link); + else if (bpref > next->rsv_end) + next = RB_RIGHT(next, rsv_link); else return prev; } while(next != NULL); - if (prev->rw_start > bpref) + if (prev->rsv_start > bpref) prev = RB_PREV(ext2_rsv_win_tree, root, prev); return prev; @@ -191,19 +192,21 @@ { struct ext2_rsv_win *rsv, *prev, *next; int32_t cur; - int size = EXT2_RWI_DEFAULT_RESERVE_BLKS; + int size = EXT2_RSV_DEFAULT_RESERVE_BLKS; + + if (search == NULL && RB_EMPTY(&fs->e2fs_rsv_tree)) + return -1; + else + search = RB_ROOT(&fs->e2fs_rsv_tree); cur = bpref; rsv = search; prev = NULL; - if (search == NULL) - return -1; while (1) { - if (cur <= rsv->rw_end) - cur = rsv->rw_end + 1; + if (cur <= rsv->rsv_end) + cur = rsv->rsv_end + 1; - /* TODO: need to be improved */ if (dtog(fs, cur) != cg) return -1; @@ -214,16 +217,16 @@ if (next == NULL); break; - if (cur + size <= rsv->rw_start) + if (cur + size <= rsv->rsv_start) break; } - if (rp->rw_end != EXT2_RWI_NOT_ALLOCATED) + if (rp != NULL && rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) ext2_remove_rsv_win(fs, rp); - rp->rw_start = cur; - rp->rw_end = cur + size - 1; - rp->rw_alloc_hit = 0; + rp->rsv_start = cur; + rp->rsv_end = cur + size - 1; + rp->rsv_alloc_hit = 0; ext2_add_rsv_win(fs, rp); @@ -245,14 +248,12 @@ ump = ip->i_ump; bbp = (char *)bp->b_data; - size = rp->rw_goal_size; + size = rp->rsv_goal_size; - /*mtx_lock_spin(&fs->e2fs_rsv_lock);*/ EXT2_TREE_LOCK(fs); /* If tree is empty, then try to alloc according to bpref */ if (RB_EMPTY(&fs->e2fs_rsv_tree)) { - /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/ EXT2_TREE_UNLOCK(fs); /* bpref is not in this cylinder group. * So try to allocate it in other group. @@ -283,61 +284,58 @@ } } - EXT2_LOCK(ump); - if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) - bpref = ext2_mapsearch(fs, bbp, bpref); - EXT2_UNLOCK(ump); + bpref = ext2_mapsearch(fs, bbp, bpref); if (bpref < 0) return 0; - goto allocated1; + goto gotit; } else { search_rsv = ext2_search_rsv_win(&fs->e2fs_rsv_tree, bpref); ret = ext2_find_next_rsv_win(search_rsv, rp, fs, bpref, cg); if (ret < 0) { - if (rp->rw_end != EXT2_RWI_NOT_ALLOCATED) + if (rp != NULL && rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) ext2_remove_rsv_win(fs, rp); - /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/ EXT2_TREE_UNLOCK(fs); - EXT2_LOCK(ump); - if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) - bpref = ext2_mapsearch(fs, bbp, bpref); - EXT2_UNLOCK(ump); + bpref = ext2_mapsearch(fs, bbp, bpref); if (bpref < 0) return 0; goto allocated1; } - /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/ EXT2_TREE_UNLOCK(fs); - if (isclr(bbp, bpref) && - bpref >= rp->rw_start && - bpref < rp->rw_end) - goto allocated; + if (dtog(fs, bpref) != cg) + bpref = 0; + + if (bpref != 0) { + bpref = dtogd(fs, bpref); + if (isclr(bbp, bpref) && + cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock + bpref >= rp->rsv_start && + cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock + bpref < rp->rsv_end) + goto allocated; + } - start = dtogd(fs, bpref) / NBBY; + if (bpref != 0) + start = dtogd(fs, bpref) / NBBY; + else + start = 0; end = howmany(fs->e2fs->e2fs_fpg, NBBY) - start; for (loc = start; loc < end; loc++) { if (bbp[loc] == 0 && - loc * NBBY >= rp->rw_start && - loc * NBBY < rp->rw_end) { + cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock + loc * NBBY >= rp->rsv_start && + cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock + loc * NBBY < rp->rsv_end) { bpref = loc * NBBY; goto allocated; } } if (loc == end) { - /*mtx_lock_spin(&fs->e2fs_rsv_lock);*/ EXT2_TREE_LOCK(fs); - ext2_remove_rsv_win(fs, rp); - /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/ + if (rp != NULL && rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) + ext2_remove_rsv_win(fs, rp); EXT2_TREE_UNLOCK(fs); - EXT2_LOCK(ump); - if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) - bpref = ext2_mapsearch(fs, bbp, bpref); - EXT2_UNLOCK(ump); + bpref = ext2_mapsearch(fs, bbp, bpref); if (bpref < 0) return 0; goto allocated1; @@ -345,18 +343,18 @@ } gotit: - rp->rw_start = bpref + cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock; - rp->rw_end = rp->rw_start + size - 1; - rp->rw_alloc_hit = 0; - /*mtx_lock_spin(&fs->e2fs_rsv_lock);*/ + rp->rsv_start = bpref + cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock; + rp->rsv_end = rp->rsv_start + size - 1; + rp->rsv_alloc_hit = 0; EXT2_TREE_LOCK(fs); ext2_add_rsv_win(fs, rp); - /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/ EXT2_TREE_UNLOCK(fs); allocated: - rp->rw_alloc_hit = bpref - rp->rw_start + 1; + rp->rsv_alloc_hit++; allocated1: + if (isset(bbp, bpref)) + return 0; setbit(bbp, (daddr_t)bpref); EXT2_LOCK(ump); fs->e2fs->e2fs_fbcount--; @@ -381,31 +379,32 @@ ump = ip->i_ump; bbp = (char *)bp->b_data; - if (rp != NULL && rp->rw_end != EXT2_RWI_NOT_ALLOCATED) - start = dtogd(fs, rp->rw_start + rp->rw_alloc_hit); - else - return 0; + if (rp != NULL && rp->rsv_end != EXT2_RSV_NOT_ALLOCATED) { + start = dtogd(fs, rp->rsv_start + rp->rsv_alloc_hit); + } else + goto find; + + if (dtog(fs, rp->rsv_start + rp->rsv_alloc_hit) != cg) + goto find; + start = dtogd(fs, start); if (isclr(bbp, start)) { bno = start; goto gotit; } - /*mtx_lock_spin(&fs->e2fs_rsv_lock);*/ +find: EXT2_TREE_LOCK(fs); - ext2_remove_rsv_win(fs, rp); - /*mtx_unlock_spin(&fs->e2fs_rsv_lock);*/ + if (rp != NULL && rp->rsv_end != EXT2_RSV_NOT_ALLOCATED); + ext2_remove_rsv_win(fs, rp); EXT2_TREE_UNLOCK(fs); - EXT2_LOCK(ump); - if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) - bno = ext2_mapsearch(fs, bbp, bpref); - EXT2_UNLOCK(ump); + bno = ext2_mapsearch(fs, bbp, bpref); if (bno < 0) return 0; goto allocated; gotit: - rp->rw_alloc_hit++; + rp->rsv_alloc_hit++; allocated: setbit(bbp, (daddr_t)bno); EXT2_LOCK(ump); @@ -428,15 +427,17 @@ rp = ip->i_rsv; + if (ip->i_rsv == NULL) + return ext2_alloc_blk(fs, ip, cg, bp, bpref, rp); + /* If window is empty or bpref is not in reservation window, * we will try to allocate a new reservation window. * Then we try to allocate a free block. */ - if (rp->rw_end == EXT2_RWI_NOT_ALLOCATED) { + if (rp->rsv_end == EXT2_RSV_NOT_ALLOCATED) return ext2_alloc_new_rsv_win(ip, rp, bpref, fs, cg, bp); - } else if (rp->rw_start + rp->rw_alloc_hit > rp->rw_end) { - return ext2_alloc_new_rsv_win(ip, rp, rp->rw_end, fs, cg, bp); - } + else if (rp->rsv_start + rp->rsv_alloc_hit > rp->rsv_end) + return ext2_alloc_new_rsv_win(ip, rp, rp->rsv_end, fs, cg, bp); return ext2_alloc_blk(fs, ip, cg, bp, bpref, rp); } @@ -486,10 +487,10 @@ goto ioerror; } - EXT2_IRSV_LOCK(ip); + EXT2_RSV_LOCK(ip); /* Try to allocate from reservation window */ bno = ext2_rsvalloc(fs, ip, cg, bp, bpref, size); - EXT2_IRSV_UNLOCK(ip); + EXT2_RSV_UNLOCK(ip); if (bno > 0) goto allocated; @@ -511,9 +512,9 @@ goto ioerror; } - EXT2_IRSV_LOCK(ip); + EXT2_RSV_LOCK(ip); bno = ext2_rsvalloc(fs, ip, cg, bp, bpref, size); - EXT2_IRSV_UNLOCK(ip); + EXT2_RSV_UNLOCK(ip); if (bno > 0) goto allocated; @@ -1353,12 +1354,6 @@ panic("ext2_vfree: range: devvp = %p, ino = %d, fs = %s", pip->i_devvp, ino, fs->e2fs_fsmnt); - EXT2_IRSV_LOCK(pip); - ext2_discard_rsv(pip); - /*free(pip->i_rsv, M_EXT2NODE);*/ - /*pip->i_rsv = NULL;*/ - EXT2_IRSV_UNLOCK(pip); - cg = ino_to_cg(fs, ino); error = bread(pip->i_devvp, fsbtodb(fs, fs->e2fs_gd[cg].ext2bgd_i_bitmap), ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_balloc.c#5 (text+ko) ==== @@ -79,12 +79,6 @@ fs = ip->i_e2fs; ump = ip->i_ump; - /* lazily initialize the reservation window info in inode */ - EXT2_IRSV_LOCK(ip); - if (ip->i_rsv == NULL) - ext2_init_rsv(ip); - EXT2_IRSV_UNLOCK(ip); - /* * check if this is a sequential block allocation. * If so, increment next_alloc fields to allow ext2_blkpref ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_inode.c#4 (text+ko) ==== @@ -155,9 +155,9 @@ fs = oip->i_e2fs; osize = oip->i_size; - EXT2_IRSV_LOCK(oip); + EXT2_RSV_LOCK(oip); ext2_discard_rsv(oip); - EXT2_IRSV_UNLOCK(oip); + EXT2_RSV_UNLOCK(oip); /* * Lengthen the size of the file. We must ensure that the @@ -490,9 +490,9 @@ if (prtactive && vrefcnt(vp) != 0) vprint("ext2_inactive: pushing active", vp); - EXT2_IRSV_LOCK(ip); + EXT2_RSV_LOCK(ip); ext2_discard_rsv(ip); - EXT2_IRSV_UNLOCK(ip); + EXT2_RSV_UNLOCK(ip); /* * Ignore inodes related to stale file handles. @@ -536,21 +536,20 @@ vprint("ufs_reclaim: pushing active", vp); ip = VTOI(vp); -#if 0 - EXT2_IRSV_LOCK(ip); - if (ip->i_rsv != NULL) { - free(ip->i_rsv, M_EXT2NODE); - ip->i_rsv = NULL; - } - EXT2_IRSV_UNLOCK(ip); - mtx_destroy(&ip->i_rsv_lock); -#endif - if (ip->i_flag & IN_LAZYMOD) { ip->i_flag |= IN_MODIFIED; ext2_update(vp, 0); } vfs_hash_remove(vp); + + EXT2_RSV_LOCK(ip); + if (ip->i_rsv != NULL) { + free(ip->i_rsv, M_EXT2NODE); + ip->i_rsv = NULL; + } + /*mtx_destroy(&ip->i_rsv_lock);*/ + EXT2_RSV_UNLOCK(ip); + free(vp->v_data, M_EXT2NODE); vp->v_data = 0; vnode_destroy_vobject(vp); ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#8 (text+ko) ==== @@ -30,28 +30,26 @@ #include -#define EXT2_RWI_DEFAULT_RESERVE_BLKS 8 -#define EXT2_RWI_NOT_ALLOCATED 0 +#define EXT2_RSV_DEFAULT_RESERVE_BLKS 8 +#define EXT2_RSV_NOT_ALLOCATED 0 -#define EXT2_MAX_RSV_WIN_BLKS 1027 +#define EXT2_RSV_LOCK(ip) mtx_lock(&ip->i_rsv_lock) +#define EXT2_RSV_UNLOCK(ip) mtx_unlock(&ip->i_rsv_lock) -#define EXT2_IRSV_LOCK(ip) mtx_lock(&ip->i_rsv_lock) -#define EXT2_IRSV_UNLOCK(ip) mtx_unlock(&ip->i_rsv_lock) +#define EXT2_TREE_LOCK(fs) mtx_lock(&fs->e2fs_rsv_lock); +#define EXT2_TREE_UNLOCK(fs) mtx_unlock(&fs->e2fs_rsv_lock); -#define EXT2_TREE_LOCK(fs) mtx_lock_spin(&fs->e2fs_rsv_lock); -#define EXT2_TREE_UNLOCK(fs) mtx_unlock_spin(&fs->e2fs_rsv_lock); - /* * Reservation window entry */ struct ext2_rsv_win { - RB_ENTRY(ext2_rsv_win) rw_link; /* RB tree links */ + RB_ENTRY(ext2_rsv_win) rsv_link; /* RB tree links */ - int32_t rw_goal_size; /* Default reservation window size */ - int32_t rw_alloc_hit; /* Number of allocated windows */ + int32_t rsv_goal_size; /* Default reservation window size */ + int32_t rsv_alloc_hit; /* Number of allocated windows */ - int32_t rw_start; /* First bytes of window */ - int32_t rw_end; /* End bytes of window */ + int32_t rsv_start; /* First bytes of window */ + int32_t rsv_end; /* End bytes of window */ }; RB_HEAD(ext2_rsv_win_tree, ext2_rsv_win); @@ -60,14 +58,14 @@ ext2_rsv_win_cmp(const struct ext2_rsv_win *a, const struct ext2_rsv_win *b) { - if (a->rw_start < b->rw_start) + if (a->rsv_start < b->rsv_start) return -1; - if (a->rw_start == b->rw_start) + if (a->rsv_start == b->rsv_start) return 0; return 1; } -RB_PROTOTYPE(ext2_rsv_win_tree, ext2_rsv_win, rw_link, ext2_rsv_win_cmp); +RB_PROTOTYPE(ext2_rsv_win_tree, ext2_rsv_win, rsv_link, ext2_rsv_win_cmp); struct inode; /* ext2_alloc.c */ ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_vfsops.c#5 (text+ko) ==== @@ -584,7 +584,7 @@ /* Initial reservation window index and lock */ bzero(&ump->um_e2fs->e2fs_rsv_lock, sizeof(struct mtx)); mtx_init(&ump->um_e2fs->e2fs_rsv_lock, - "rsv tree lock", NULL, MTX_SPIN); + "rsv tree lock", NULL, MTX_DEF); RB_INIT(&ump->um_e2fs->e2fs_rsv_tree); brelse(bp); @@ -892,11 +892,6 @@ ip->i_ump = ump; ip->i_number = ino; - /* lazily initialize reservation window */ - bzero(&ip->i_rsv_lock, sizeof(struct mtx)); - mtx_init(&ip->i_rsv_lock, "inode rsv lock", NULL, MTX_DEF); - ip->i_rsv = NULL; - lockmgr(vp->v_vnlock, LK_EXCLUSIVE, NULL); error = insmntque(vp, mp); if (error != 0) { @@ -931,6 +926,14 @@ ip->i_prealloc_count = 0; ip->i_prealloc_block = 0; + bzero(&ip->i_rsv_lock, sizeof(struct mtx)); + mtx_init(&ip->i_rsv_lock, "inode rsv lock", NULL, MTX_DEF); + EXT2_RSV_LOCK(ip); + ip->i_rsv = NULL; + if (ip->i_rsv == NULL) + ext2_init_rsv(ip); + EXT2_RSV_UNLOCK(ip); + /* * Now we want to make sure that block pointers for unused * blocks are zeroed out - ext2_balloc depends on this From owner-p4-projects@FreeBSD.ORG Fri May 21 14:05:46 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41CE11065677; Fri, 21 May 2010 14:05:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E1CB5106564A for ; Fri, 21 May 2010 14:05:45 +0000 (UTC) (envelope-from iprebeg@freebsd.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CF4478FC1D for ; Fri, 21 May 2010 14:05:45 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4LE5jik035937 for ; Fri, 21 May 2010 14:05:45 GMT (envelope-from iprebeg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4LE5jrZ035935 for perforce@freebsd.org; Fri, 21 May 2010 14:05:45 GMT (envelope-from iprebeg@freebsd.org) Date: Fri, 21 May 2010 14:05:45 GMT Message-Id: <201005211405.o4LE5jrZ035935@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to iprebeg@freebsd.org using -f From: Ivor Prebeg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178588 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 May 2010 14:05:46 -0000 http://p4web.freebsd.org/@@178588?ac=10 Change 178588 by iprebeg@iprebeg_zeus on 2010/05/21 14:05:16 Removed ip_mrouter_reset Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#40 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#40 (text+ko) ==== @@ -605,23 +605,6 @@ } static void -ip_mrouter_reset(void) -{ - - /* - V_pim_assert_enabled = 0; - V_mrt_api_config = 0; - - callout_init(&V_expire_upcalls_ch, CALLOUT_MPSAFE); - - V_bw_upcalls_n = 0; - bzero(V_bw_meter_timers, sizeof(V_bw_meter_timers)); - callout_init(&V_bw_upcalls_ch, CALLOUT_MPSAFE); - callout_init(&V_bw_meter_ch, CALLOUT_MPSAFE); - */ -} - -static void if_detached_event(void *arg __unused, struct ifnet *ifp) { vifi_t vifi; @@ -724,7 +707,9 @@ struct ifnet *ifp; struct ifreq ifr; + printf ("V_mcast: before MROUTER LOCK\n"); MROUTER_LOCK(); + printf ("V_mcast: after MROUTER LOCK\n"); if (V_ip_mrouter == NULL) { MROUTER_UNLOCK(); @@ -739,7 +724,8 @@ V_mrt_api_config = 0; VIF_LOCK(); - + + printf ("V_mcast: after VIF LOCK, before numvifs loop\n"); /* * For each phyint in use, disable promiscuous reception of all IP * multicasts. @@ -759,12 +745,15 @@ bzero((caddr_t)V_viftable, sizeof(V_viftable)); V_numvifs = 0; V_pim_assert_enabled = 0; - + + printf ("V_mcast: before VIF UNLOCK, after numvifs loop\n"); VIF_UNLOCK(); + printf ("V_mcast: after VIF UNLOCK, before stopping callouts\n"); callout_stop(&V_expire_upcalls_ch); callout_stop(&V_bw_upcalls_ch); callout_stop(&V_bw_meter_ch); + printf ("V_mcast: after stopping callouts\n"); MFC_LOCK(); @@ -2831,18 +2820,15 @@ { MALLOC(V_nexpire, u_char *, mfchashsize, M_MRTABLE, M_WAITOK|M_ZERO); - - /* from ip_mrouter_reset */ - V_pim_assert_enabled = 0; - V_mrt_api_config = 0; - - callout_init(&V_expire_upcalls_ch, CALLOUT_MPSAFE); - - V_bw_upcalls_n = 0; - bzero(V_bw_meter_timers, sizeof(V_bw_meter_timers)); - callout_init(&V_bw_upcalls_ch, CALLOUT_MPSAFE); - callout_init(&V_bw_meter_ch, CALLOUT_MPSAFE); - /* from ip_mrouter_reset */ + V_pim_assert_enabled = 0; + V_mrt_api_config = 0; + + callout_init(&V_expire_upcalls_ch, CALLOUT_MPSAFE); + + V_bw_upcalls_n = 0; + bzero(V_bw_meter_timers, sizeof(V_bw_meter_timers)); + callout_init(&V_bw_upcalls_ch, CALLOUT_MPSAFE); + callout_init(&V_bw_meter_ch, CALLOUT_MPSAFE); } VNET_SYSINIT(vnet_mroute_init, SI_SUB_PSEUDO, SI_ORDER_MIDDLE, vnet_mroute_init, @@ -2852,9 +2838,7 @@ vnet_mroute_uninit(const void *unused __unused) { -#ifndef VIMAGE X_ip_mrouter_done(); -#endif FREE(V_nexpire, M_MRTABLE); V_nexpire = NULL; } @@ -2892,7 +2876,6 @@ pim_squelch_wholepkt = 0; TUNABLE_ULONG_FETCH("net.inet.pim.squelch_wholepkt", &pim_squelch_wholepkt); - ip_mrouter_reset(); pim_encap_cookie = encap_attach_func(AF_INET, IPPROTO_PIM, pim_encapcheck, &in_pim_protosw, NULL); From owner-p4-projects@FreeBSD.ORG Fri May 21 14:27:59 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 184901065670; Fri, 21 May 2010 14:27:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D0095106564A; Fri, 21 May 2010 14:27:58 +0000 (UTC) (envelope-from Ivor.Prebeg@fer.hr) Received: from munja.zvne.fer.hr (munja.zvne.fer.hr [161.53.66.248]) by mx1.freebsd.org (Postfix) with ESMTP id 45E208FC17; Fri, 21 May 2010 14:27:57 +0000 (UTC) Received: from sluga.fer.hr ([161.53.66.244]) by munja.zvne.fer.hr with Microsoft SMTPSVC(6.0.3790.4675); Fri, 21 May 2010 16:27:55 +0200 x-mimeole: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Date: Fri, 21 May 2010 16:27:51 +0200 Message-ID: X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: PERFORCE change 178588 for review Thread-Index: Acr47rcm69vjaP/URDW5BSmsOqZmxAAAf0Gt References: <201005211405.o4LE5jrZ035935@repoman.freebsd.org> From: "Ivor Prebeg" To: "Ivor Prebeg" , "Perforce Change Reviews" , X-OriginalArrivalTime: 21 May 2010 14:27:55.0652 (UTC) FILETIME=[CDC4E440:01CAF8F1] Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Subject: RE: PERFORCE change 178588 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 May 2010 14:27:59 -0000 Ovak, stvar umre na lockanju vec unistenog mutexa. Nije mi jasno zasto, = jer se MROUTER_LOCK_DESTROY() zove tek na kraju CASE_MOD_UNLOAD, nigdje = prije :/=20 kad ubijem xorpove, ip_mrouter_done odradi sve kako treba za svaki vnet, = a prije nego ih ubijem, uopce ne mogu kldunloadat ip_mroute. Ivor -----Original Message----- From: Ivor Prebeg [mailto:iprebeg@freebsd.org] Sent: Fri 21-May-10 16:05 To: Perforce Change Reviews Subject: PERFORCE change 178588 for review =20 http://p4web.freebsd.org/@@178588?ac=3D10 Change 178588 by iprebeg@iprebeg_zeus on 2010/05/21 14:05:16 Removed ip_mrouter_reset Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#40 edit Differences ... =3D=3D=3D=3D //depot/projects/vimage/src/sys/netinet/ip_mroute.c#40 = (text+ko) =3D=3D=3D=3D @@ -605,23 +605,6 @@ } =20 static void -ip_mrouter_reset(void) -{ - - /* - V_pim_assert_enabled =3D 0; - V_mrt_api_config =3D 0; - - callout_init(&V_expire_upcalls_ch, CALLOUT_MPSAFE); - - V_bw_upcalls_n =3D 0; - bzero(V_bw_meter_timers, sizeof(V_bw_meter_timers)); - callout_init(&V_bw_upcalls_ch, CALLOUT_MPSAFE); - callout_init(&V_bw_meter_ch, CALLOUT_MPSAFE); - */ -} - -static void if_detached_event(void *arg __unused, struct ifnet *ifp) { vifi_t vifi; @@ -724,7 +707,9 @@ struct ifnet *ifp; struct ifreq ifr; =20 + printf ("V_mcast: before MROUTER LOCK\n"); MROUTER_LOCK(); + printf ("V_mcast: after MROUTER LOCK\n"); =20 if (V_ip_mrouter =3D=3D NULL) { MROUTER_UNLOCK(); @@ -739,7 +724,8 @@ V_mrt_api_config =3D 0; =20 VIF_LOCK(); - +=20 + printf ("V_mcast: after VIF LOCK, before numvifs loop\n"); /* * For each phyint in use, disable promiscuous reception of all IP * multicasts. @@ -759,12 +745,15 @@ bzero((caddr_t)V_viftable, sizeof(V_viftable)); V_numvifs =3D 0; V_pim_assert_enabled =3D 0; - + =20 + printf ("V_mcast: before VIF UNLOCK, after numvifs loop\n"); VIF_UNLOCK(); =20 + printf ("V_mcast: after VIF UNLOCK, before stopping callouts\n"); callout_stop(&V_expire_upcalls_ch); callout_stop(&V_bw_upcalls_ch); callout_stop(&V_bw_meter_ch); + printf ("V_mcast: after stopping callouts\n"); =20 MFC_LOCK(); =20 @@ -2831,18 +2820,15 @@ { =20 MALLOC(V_nexpire, u_char *, mfchashsize, M_MRTABLE, M_WAITOK|M_ZERO); - - /* from ip_mrouter_reset */ - V_pim_assert_enabled =3D 0; - V_mrt_api_config =3D 0; - - callout_init(&V_expire_upcalls_ch, CALLOUT_MPSAFE); - - V_bw_upcalls_n =3D 0; - bzero(V_bw_meter_timers, sizeof(V_bw_meter_timers)); - callout_init(&V_bw_upcalls_ch, CALLOUT_MPSAFE); - callout_init(&V_bw_meter_ch, CALLOUT_MPSAFE); - /* from ip_mrouter_reset */ + V_pim_assert_enabled =3D 0; + V_mrt_api_config =3D 0; +=09 + callout_init(&V_expire_upcalls_ch, CALLOUT_MPSAFE); +=09 + V_bw_upcalls_n =3D 0; + bzero(V_bw_meter_timers, sizeof(V_bw_meter_timers)); + callout_init(&V_bw_upcalls_ch, CALLOUT_MPSAFE); + callout_init(&V_bw_meter_ch, CALLOUT_MPSAFE); } =20 VNET_SYSINIT(vnet_mroute_init, SI_SUB_PSEUDO, SI_ORDER_MIDDLE, = vnet_mroute_init, @@ -2852,9 +2838,7 @@ vnet_mroute_uninit(const void *unused __unused) { =20 -#ifndef VIMAGE X_ip_mrouter_done(); -#endif FREE(V_nexpire, M_MRTABLE); V_nexpire =3D NULL; } @@ -2892,7 +2876,6 @@ pim_squelch_wholepkt =3D 0; TUNABLE_ULONG_FETCH("net.inet.pim.squelch_wholepkt", &pim_squelch_wholepkt); - ip_mrouter_reset(); =20 pim_encap_cookie =3D encap_attach_func(AF_INET, IPPROTO_PIM, pim_encapcheck, &in_pim_protosw, NULL); From owner-p4-projects@FreeBSD.ORG Fri May 21 15:32:20 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6D571065675; Fri, 21 May 2010 15:32:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6F5AB106566B for ; Fri, 21 May 2010 15:32:20 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5BDA98FC0C for ; Fri, 21 May 2010 15:32:20 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4LFWK8U043828 for ; Fri, 21 May 2010 15:32:20 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4LFWK9m043826 for perforce@freebsd.org; Fri, 21 May 2010 15:32:20 GMT (envelope-from mav@freebsd.org) Date: Fri, 21 May 2010 15:32:20 GMT Message-Id: <201005211532.o4LFWK9m043826@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178589 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 May 2010 15:32:21 -0000 http://p4web.freebsd.org/@@178589?ac=10 Change 178589 by mav@mav_mavtest on 2010/05/21 15:31:59 IFC Affected files ... .. //depot/projects/scottl-camlock/src/Makefile.inc1#21 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/CHANGES#9 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/api#7 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/validator.c#7 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/version#9 integrate .. //depot/projects/scottl-camlock/src/lib/libmagic/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/lib/libmagic/config.h#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mvs.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man8/nanobsd.8#3 integrate .. //depot/projects/scottl-camlock/src/share/misc/bsd-family-tree#10 integrate .. //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#14 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#53 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#90 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/taskq.h#4 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#113 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#55 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs_if.m#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs_soc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/pucdata.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/isa/atrtc.c#5 delete .. //depot/projects/scottl-camlock/src/sys/kern/sys_generic.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/xlr/rge.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/on_chip.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlr_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlrconfig.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/mvs/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/include/md_var.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/pc98/pc98_machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/ofw_machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/md_var.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/nexusvar.h#4 branch .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/ata_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#36 integrate .. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common#3 integrate Differences ... ==== //depot/projects/scottl-camlock/src/Makefile.inc1#21 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.647 2010/05/20 00:13:01 jkim Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.650 2010/05/20 20:15:56 jkim Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -969,6 +969,7 @@ ${_groff} \ ${_ar} \ usr.bin/lorder \ + usr.bin/makewhatis \ ${_mklocale} \ usr.bin/rpcgen \ ${_sed} \ ==== //depot/projects/scottl-camlock/src/contrib/bind9/CHANGES#9 (text+ko) ==== @@ -1,3 +1,8 @@ + --- 9.6.2-P2 released --- + +2876. [bug] Named could return SERVFAIL for negative responses + from unsigned zones. [RT #21131] + --- 9.6.2-P1 released --- 2852. [bug] Handle broken DNSSEC trust chains better. [RT #15619] ==== //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/api#7 (text+ko) ==== @@ -1,3 +1,3 @@ LIBINTERFACE = 56 -LIBREVISION = 0 +LIBREVISION = 1 LIBAGE = 1 ==== //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/validator.c#7 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: validator.c,v 1.164.12.11.8.2 2010/02/25 10:57:12 tbox Exp $ */ +/* $Id: validator.c,v 1.164.12.11.8.3 2010/04/21 04:29:01 marka Exp $ */ #include @@ -2961,7 +2961,7 @@ } findnsec3proofs(val); - if (val->authcount == val->authfail) + if (val->authfail != 0 && val->authcount == val->authfail) return (DNS_R_BROKENCHAIN); validator_log(val, ISC_LOG_DEBUG(3), "nonexistence proof(s) not found"); ==== //depot/projects/scottl-camlock/src/contrib/bind9/version#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $Id: version,v 1.43.12.8.2.3 2010/03/04 00:08:28 marka Exp $ +# $Id: version,v 1.43.12.8.2.4 2010/05/10 02:07:03 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -7,4 +7,4 @@ MINORVER=6 PATCHVER=2 RELEASETYPE=-P -RELEASEVER=1 +RELEASEVER=2 ==== //depot/projects/scottl-camlock/src/lib/libmagic/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libmagic/Makefile,v 1.14 2010/01/02 09:58:07 ed Exp $ +# $FreeBSD: src/lib/libmagic/Makefile,v 1.15 2010/05/20 09:00:11 marius Exp $ # Copyright (c) David E. O'Brien, 2000-2004 CONTRDIR= ${.CURDIR}/../../contrib/file @@ -20,7 +20,7 @@ CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${CONTRDIR} -WARNS?= 1 +WARNS?= 3 CLEANFILES+= magic magic.mgc ==== //depot/projects/scottl-camlock/src/lib/libmagic/config.h#3 (text+ko) ==== @@ -1,18 +1,18 @@ -/* $FreeBSD: src/lib/libmagic/config.h,v 1.9 2009/05/04 00:37:44 obrien Exp $ */ +/* $FreeBSD: src/lib/libmagic/config.h,v 1.10 2010/05/20 08:56:50 marius Exp $ */ /* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ -/* Use the builtin ELF recognition code */ +/* Define in built-in ELF support is used */ #define BUILTIN_ELF 1 -/* Recognize ELF core files */ +/* Define for ELF core file support */ #define ELFCORE 1 /* Define to 1 if you have the `asprintf' function. */ #define HAVE_ASPRINTF 1 -/* */ +/* HAVE_DAYLIGHT */ /* #undef HAVE_DAYLIGHT */ /* Define to 1 if you have the header file. */ @@ -51,9 +51,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_LOCALE_H 1 -/* */ -#define HAVE_LONG_LONG 1 - /* Define to 1 if you have the `mbrtowc' function. */ #define HAVE_MBRTOWC 1 @@ -69,9 +66,6 @@ /* Define to 1 if you have the `mmap' function. */ #define HAVE_MMAP 1 -/* Define to 1 if you have the `snprintf' function. */ -#define HAVE_SNPRINTF 1 - /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -102,13 +96,12 @@ /* Define to 1 if you have the `strtoul' function. */ #define HAVE_STRTOUL 1 +/* HAVE_STRUCT_OPTION */ +#define HAVE_STRUCT_OPTION 1 + /* Define to 1 if `st_rdev' is member of `struct stat'. */ #define HAVE_STRUCT_STAT_ST_RDEV 1 -/* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use - `HAVE_STRUCT_STAT_ST_RDEV' instead. */ -#define HAVE_ST_RDEV 1 - /* Define to 1 if `tm_gmtoff' is member of `struct tm'. */ #define HAVE_STRUCT_TM_TM_GMTOFF 1 @@ -133,7 +126,7 @@ /* Define to 1 if you have that is POSIX.1 compatible. */ #define HAVE_SYS_WAIT_H 1 -/* */ +/* HAVE_TM_ISDST */ #define HAVE_TM_ISDST 1 /* HAVE_TM_ZONE */ @@ -169,9 +162,6 @@ /* Define to 1 if you have the `vasprintf' function. */ #define HAVE_VASPRINTF 1 -/* Define to 1 if you have the `vsnprintf' function. */ -#define HAVE_VSNPRINTF 1 - /* Define to 1 if you have the header file. */ #define HAVE_WCHAR_H 1 @@ -199,35 +189,23 @@ #define PACKAGE "file" /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" +#define PACKAGE_BUGREPORT "christos@astron.com" /* Define to the full name of this package. */ -#define PACKAGE_NAME "" +#define PACKAGE_NAME "file" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" +#define PACKAGE_STRING "file 5.03" /* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" +#define PACKAGE_TARNAME "file" /* Define to the version of this package. */ -#define PACKAGE_VERSION VERSION +#define PACKAGE_VERSION "5.03" -/* */ -#define SIZEOF_INT64_T 8 - -/* */ -#define SIZEOF_UINT16_T 2 - -/* */ -#define SIZEOF_UINT32_T 4 +/* The size of `long long', as computed by sizeof. */ +#define SIZEOF_LONG_LONG 8 -/* */ -#define SIZEOF_UINT64_T 8 - -/* */ -#define SIZEOF_UINT8_T 1 - /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -235,7 +213,7 @@ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "5.00" +#define VERSION "5.03" /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ @@ -247,8 +225,49 @@ #endif #endif +/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ +/* #undef _LARGEFILE_SOURCE */ + /* Define for large files, on AIX-style hosts. */ /* #undef _LARGE_FILES */ /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ + +/* Define to a type if does not define. */ +/* #undef mbstate_t */ + +/* Define to `long int' if does not define. */ +/* #undef off_t */ + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ + + +#ifndef HAVE_UINT8_T +typedef unsigned char uint8_t; +#endif +#ifndef HAVE_UINT16_T +typedef unsigned short uint16_t; +#endif +#ifndef HAVE_UINT32_T +typedef unsigned int uint32_t; +#endif +#ifndef HAVE_INT32_T +typedef int int32_t; +#endif +#ifndef HAVE_UINT64_T +#if SIZEOF_LONG_LONG == 8 +typedef unsigned long long uint64_t; +#else +typedef unsigned long uint64_t; +#endif +#endif +#ifndef HAVE_INT64_T +#if SIZEOF_LONG_LONG == 8 +typedef long long int64_t; +#else +typedef long int64_t; +#endif +#endif + ==== //depot/projects/scottl-camlock/src/share/man/man4/mvs.4#3 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/share/man/man8/nanobsd.8#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man8/nanobsd.8,v 1.5 2009/03/16 15:54:21 sam Exp $ +.\" $FreeBSD: src/share/man/man8/nanobsd.8,v 1.6 2010/05/20 18:39:33 wxs Exp $ .\" -.Dd March 16, 2009 +.Dd May 20, 2010 .Dt NANOBSD 8 .Os .Sh NAME @@ -203,6 +203,9 @@ Path to the source tree used to build the image. .It Va NANO_KERNEL Name of the kernel configuration file used to build the kernel. +.It Va NANO_ARCH +Machine processor architecture to build. Defaults to output of +.Cm uname -p . .It Va NANO_BOOT0CFG Controls the options passed to .Xr boot0cfg 8 ; ==== //depot/projects/scottl-camlock/src/share/misc/bsd-family-tree#10 (text+ko) ==== @@ -235,7 +235,7 @@ *--FreeBSD | | | | | | 8.0 | | | | | | | FreeBSD | | | | - | V 7.3 | | | | + | V 7.3 | | | DragonFly 2.6.0 | | | OpenBSD 4.7 | | | | | | FreeBSD 9 -current | NetBSD -current OpenBSD -current | @@ -513,6 +513,7 @@ OpenBSD 4.6 2009-10-18 [OBD] FreeBSD 8.0 2009-11-26 [FBD] FreeBSD 7.3 2010-03-23 [FBD] +DragonFly 2.6.0 2010-03-28 [DFB] OpenBSD 4.7 2010-05-19 [OBD] Bibliography @@ -574,4 +575,4 @@ Copyright (c) 1997-2007 Wolfram Schneider URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree -$FreeBSD: src/share/misc/bsd-family-tree,v 1.137 2010/05/20 05:03:02 maxim Exp $ +$FreeBSD: src/share/misc/bsd-family-tree,v 1.138 2010/05/20 08:07:25 maxim Exp $ ==== //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/misc/committers-src.dot,v 1.113 2010/04/21 20:05:49 anchie Exp $ +# $FreeBSD: src/share/misc/committers-src.dot,v 1.114 2010/05/20 17:30:55 jchandra Exp $ # This file is meant to list all FreeBSD src committers and describe the # mentor-mentee relationships between them. @@ -114,6 +114,7 @@ jh [label="Jaakko Heinonen\njh@FreeBSD.org\n2009/10/02"] jilles [label="Jilles Tjoelker\njilles@FreeBSD.org\n2009/05/22"] jinmei [label="JINMEI Tatuya\njinmei@FreeBSD.org\n2007/03/17"] +jchandra [label="Jayachandran C.\njchandra@FreeBSD.org\n2010/05/19"] jdp [label="John Polstra\njdp@FreeBSD.org\n????/??/??"] jhb [label="John Baldwin\njhb@FreeBSD.org\n1999/08/23"] jkh [label="Jordan K. Hubbard\njkh@FreeBSD.org\n1993/06/12"] @@ -423,6 +424,7 @@ rpaulo -> bschmidt rrs -> brucec +rrs -> jchandra rrs -> tuexen ru -> ceri ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#53 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.17 2010/04/26 12:03:55 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.18 2010/05/20 12:46:19 marius Exp $"); #include @@ -58,6 +58,8 @@ #include +#include /* geometry translation */ + #ifdef _KERNEL #define ATA_MAX_28BIT_LBA 268435455UL @@ -178,6 +180,13 @@ #define ADA_DEFAULT_SEND_ORDERED 1 #endif +/* + * Most platforms map firmware geometry to actual, but some don't. If + * not overridden, default to nothing. + */ +#ifndef ata_disk_firmware_geom_adjust +#define ata_disk_firmware_geom_adjust(disk) +#endif static int ada_retry_count = ADA_DEFAULT_RETRY; static int ada_default_timeout = ADA_DEFAULT_TIMEOUT; @@ -737,9 +746,9 @@ ata_logical_sector_offset(&cgd->ident_data)) % softc->disk->d_stripesize; } - /* XXX: these are not actually "firmware" values, so they may be wrong */ softc->disk->d_fwsectors = softc->params.secs_per_track; softc->disk->d_fwheads = softc->params.heads; + ata_disk_firmware_geom_adjust(softc->disk); disk_create(softc->disk, DISK_VERSION); mtx_lock(periph->sim->mtx); ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#90 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.30 2010/05/02 12:07:47 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.31 2010/05/20 12:44:06 marius Exp $"); #include #include @@ -44,10 +44,6 @@ #include #include -#ifdef PC98 -#include /* geometry translation */ -#endif - #include #include #include ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#31 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_xpt.c,v 1.9 2010/02/22 19:17:17 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_xpt.c,v 1.10 2010/05/20 12:44:06 marius Exp $"); #include #include @@ -47,10 +47,6 @@ #include #include -#ifdef PC98 -#include /* geometry translation */ -#endif - #include #include #include ==== //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#11 (text+ko) ==== @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -152,14 +152,20 @@ /* number of seconds before growing cache again */ static int arc_grow_retry = 60; +/* shift of arc_c for calculating both min and max arc_p */ +static int arc_p_min_shift = 4; + +/* log2(fraction of arc to reclaim) */ +static int arc_shrink_shift = 5; + /* * minimum lifespan of a prefetch block in clock ticks * (initialized in arc_init()) */ static int arc_min_prefetch_lifespan; +static int arc_dead; extern int zfs_prefetch_disable; -static int arc_dead; /* * The arc has filled available memory and has now warmed up. @@ -173,6 +179,9 @@ uint64_t zfs_arc_min; uint64_t zfs_arc_meta_limit = 0; int zfs_mdcomp_disable = 0; +int zfs_arc_grow_retry = 0; +int zfs_arc_shrink_shift = 0; +int zfs_arc_p_min_shift = 0; TUNABLE_QUAD("vfs.zfs.arc_max", &zfs_arc_max); TUNABLE_QUAD("vfs.zfs.arc_min", &zfs_arc_min); @@ -277,6 +286,9 @@ kstat_named_t arcstat_recycle_miss; kstat_named_t arcstat_mutex_miss; kstat_named_t arcstat_evict_skip; + kstat_named_t arcstat_evict_l2_cached; + kstat_named_t arcstat_evict_l2_eligible; + kstat_named_t arcstat_evict_l2_ineligible; kstat_named_t arcstat_hash_elements; kstat_named_t arcstat_hash_elements_max; kstat_named_t arcstat_hash_collisions; @@ -288,10 +300,14 @@ kstat_named_t arcstat_c_max; kstat_named_t arcstat_size; kstat_named_t arcstat_hdr_size; + kstat_named_t arcstat_data_size; + kstat_named_t arcstat_other_size; kstat_named_t arcstat_l2_hits; kstat_named_t arcstat_l2_misses; kstat_named_t arcstat_l2_feeds; kstat_named_t arcstat_l2_rw_clash; + kstat_named_t arcstat_l2_read_bytes; + kstat_named_t arcstat_l2_write_bytes; kstat_named_t arcstat_l2_writes_sent; kstat_named_t arcstat_l2_writes_done; kstat_named_t arcstat_l2_writes_error; @@ -341,6 +357,9 @@ { "recycle_miss", KSTAT_DATA_UINT64 }, { "mutex_miss", KSTAT_DATA_UINT64 }, { "evict_skip", KSTAT_DATA_UINT64 }, + { "evict_l2_cached", KSTAT_DATA_UINT64 }, + { "evict_l2_eligible", KSTAT_DATA_UINT64 }, + { "evict_l2_ineligible", KSTAT_DATA_UINT64 }, { "hash_elements", KSTAT_DATA_UINT64 }, { "hash_elements_max", KSTAT_DATA_UINT64 }, { "hash_collisions", KSTAT_DATA_UINT64 }, @@ -352,10 +371,14 @@ { "c_max", KSTAT_DATA_UINT64 }, { "size", KSTAT_DATA_UINT64 }, { "hdr_size", KSTAT_DATA_UINT64 }, + { "data_size", KSTAT_DATA_UINT64 }, + { "other_size", KSTAT_DATA_UINT64 }, { "l2_hits", KSTAT_DATA_UINT64 }, { "l2_misses", KSTAT_DATA_UINT64 }, { "l2_feeds", KSTAT_DATA_UINT64 }, { "l2_rw_clash", KSTAT_DATA_UINT64 }, + { "l2_read_bytes", KSTAT_DATA_UINT64 }, + { "l2_write_bytes", KSTAT_DATA_UINT64 }, { "l2_writes_sent", KSTAT_DATA_UINT64 }, { "l2_writes_done", KSTAT_DATA_UINT64 }, { "l2_writes_error", KSTAT_DATA_UINT64 }, @@ -519,6 +542,8 @@ static int arc_evict_needed(arc_buf_contents_t type); static void arc_evict_ghost(arc_state_t *state, spa_t *spa, int64_t bytes); +static boolean_t l2arc_write_eligible(spa_t *spa, arc_buf_hdr_t *ab); + #define GHOST_STATE(state) \ ((state) == arc_mru_ghost || (state) == arc_mfu_ghost || \ (state) == arc_l2c_only) @@ -546,6 +571,7 @@ #define HDR_IN_HASH_TABLE(hdr) ((hdr)->b_flags & ARC_IN_HASH_TABLE) #define HDR_IO_IN_PROGRESS(hdr) ((hdr)->b_flags & ARC_IO_IN_PROGRESS) #define HDR_IO_ERROR(hdr) ((hdr)->b_flags & ARC_IO_ERROR) +#define HDR_PREFETCH(hdr) ((hdr)->b_flags & ARC_PREFETCH) #define HDR_FREED_IN_READ(hdr) ((hdr)->b_flags & ARC_FREED_IN_READ) #define HDR_BUF_AVAILABLE(hdr) ((hdr)->b_flags & ARC_BUF_AVAILABLE) #define HDR_FREE_IN_PROGRESS(hdr) ((hdr)->b_flags & ARC_FREE_IN_PROGRESS) @@ -603,10 +629,10 @@ * Level 2 ARC */ -#define L2ARC_WRITE_SIZE (64 * 1024 * 1024) /* initial write max */ -#define L2ARC_HEADROOM 128 /* num of writes */ -#define L2ARC_FEED_SECS 1 /* caching interval */ -#define L2ARC_FEED_SECS_SHIFT 1 /* caching interval shift */ +#define L2ARC_WRITE_SIZE (8 * 1024 * 1024) /* initial write max */ +#define L2ARC_HEADROOM 2 /* num of writes */ +#define L2ARC_FEED_SECS 1 /* caching interval secs */ +#define L2ARC_FEED_MIN_MS 200 /* min caching interval ms */ #define l2arc_writes_sent ARCSTAT(arcstat_l2_writes_sent) #define l2arc_writes_done ARCSTAT(arcstat_l2_writes_done) @@ -618,9 +644,10 @@ uint64_t l2arc_write_boost = L2ARC_WRITE_SIZE; /* extra write during warmup */ uint64_t l2arc_headroom = L2ARC_HEADROOM; /* number of dev writes */ uint64_t l2arc_feed_secs = L2ARC_FEED_SECS; /* interval seconds */ -uint64_t l2arc_feed_secs_shift = L2ARC_FEED_SECS_SHIFT; /* interval seconds shift */ +uint64_t l2arc_feed_min_ms = L2ARC_FEED_MIN_MS; /* min interval milliseconds */ boolean_t l2arc_noprefetch = B_FALSE; /* don't cache prefetch bufs */ - +boolean_t l2arc_feed_again = B_TRUE; /* turbo warmup */ +boolean_t l2arc_norw = B_TRUE; /* no reads during writes */ SYSCTL_QUAD(_vfs_zfs, OID_AUTO, l2arc_write_max, CTLFLAG_RW, &l2arc_write_max, 0, "max write size"); @@ -630,12 +657,15 @@ &l2arc_headroom, 0, "number of dev writes"); SYSCTL_QUAD(_vfs_zfs, OID_AUTO, l2arc_feed_secs, CTLFLAG_RW, &l2arc_feed_secs, 0, "interval seconds"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, l2arc_feed_secs_shift, CTLFLAG_RW, - &l2arc_feed_secs_shift, 0, "power of 2 division of feed seconds"); +SYSCTL_QUAD(_vfs_zfs, OID_AUTO, l2arc_feed_min_ms, CTLFLAG_RW, + &l2arc_feed_min_ms, 0, "min interval milliseconds"); SYSCTL_INT(_vfs_zfs, OID_AUTO, l2arc_noprefetch, CTLFLAG_RW, &l2arc_noprefetch, 0, "don't cache prefetch bufs"); - +SYSCTL_INT(_vfs_zfs, OID_AUTO, l2arc_feed_again, CTLFLAG_RW, + &l2arc_feed_again, 0, "turbo warmup"); +SYSCTL_INT(_vfs_zfs, OID_AUTO, l2arc_norw, CTLFLAG_RW, + &l2arc_norw, 0, "no reads during writes"); SYSCTL_QUAD(_vfs_zfs, OID_AUTO, anon_size, CTLFLAG_RD, &ARC_anon.arcs_size, 0, "size of anonymous state"); @@ -692,6 +722,7 @@ uint64_t l2ad_end; /* last addr on device */ uint64_t l2ad_evict; /* last addr eviction reached */ boolean_t l2ad_first; /* first sweep through */ + boolean_t l2ad_writing; /* currently writing */ list_t *l2ad_buflist; /* buffer list */ list_node_t l2ad_node; /* device list node */ } l2arc_dev_t; @@ -722,7 +753,7 @@ struct l2arc_buf_hdr { /* protected by arc_buf_hdr mutex */ l2arc_dev_t *b_dev; /* L2ARC device */ - daddr_t b_daddr; /* disk address, offset byte */ + uint64_t b_daddr; /* disk address, offset byte */ }; typedef struct l2arc_data_free { @@ -890,8 +921,8 @@ refcount_create(&buf->b_refcnt); cv_init(&buf->b_cv, NULL, CV_DEFAULT, NULL); mutex_init(&buf->b_freeze_lock, NULL, MUTEX_DEFAULT, NULL); + arc_space_consume(sizeof (arc_buf_hdr_t), ARC_SPACE_HDRS); - ARCSTAT_INCR(arcstat_hdr_size, HDR_SIZE); return (0); } @@ -903,6 +934,8 @@ bzero(buf, sizeof (arc_buf_t)); rw_init(&buf->b_lock, NULL, RW_DEFAULT, NULL); + arc_space_consume(sizeof (arc_buf_t), ARC_SPACE_HDRS); + return (0); } @@ -919,8 +952,7 @@ refcount_destroy(&buf->b_refcnt); cv_destroy(&buf->b_cv); mutex_destroy(&buf->b_freeze_lock); - - ARCSTAT_INCR(arcstat_hdr_size, -HDR_SIZE); + arc_space_return(sizeof (arc_buf_hdr_t), ARC_SPACE_HDRS); } /* ARGSUSED */ @@ -930,6 +962,7 @@ arc_buf_t *buf = vbuf; rw_destroy(&buf->b_lock); + arc_space_return(sizeof (arc_buf_t), ARC_SPACE_HDRS); } /* @@ -1245,15 +1278,49 @@ } void -arc_space_consume(uint64_t space) +arc_space_consume(uint64_t space, arc_space_type_t type) { + ASSERT(type >= 0 && type < ARC_SPACE_NUMTYPES); + + switch (type) { + case ARC_SPACE_DATA: + ARCSTAT_INCR(arcstat_data_size, space); + break; + case ARC_SPACE_OTHER: + ARCSTAT_INCR(arcstat_other_size, space); + break; + case ARC_SPACE_HDRS: + ARCSTAT_INCR(arcstat_hdr_size, space); + break; + case ARC_SPACE_L2HDRS: + ARCSTAT_INCR(arcstat_l2_hdr_size, space); + break; + } + atomic_add_64(&arc_meta_used, space); atomic_add_64(&arc_size, space); } void -arc_space_return(uint64_t space) +arc_space_return(uint64_t space, arc_space_type_t type) { + ASSERT(type >= 0 && type < ARC_SPACE_NUMTYPES); + + switch (type) { + case ARC_SPACE_DATA: + ARCSTAT_INCR(arcstat_data_size, -space); + break; + case ARC_SPACE_OTHER: + ARCSTAT_INCR(arcstat_other_size, -space); + break; + case ARC_SPACE_HDRS: + ARCSTAT_INCR(arcstat_hdr_size, -space); + break; + case ARC_SPACE_L2HDRS: + ARCSTAT_INCR(arcstat_l2_hdr_size, -space); + break; + } + ASSERT(arc_meta_used >= space); if (arc_meta_max < arc_meta_used) arc_meta_max = arc_meta_used; @@ -1353,6 +1420,7 @@ ASSERT(hdr->b_state == arc_mru || hdr->b_state == arc_mfu); add_reference(hdr, hash_lock, tag); + DTRACE_PROBE1(arc__hit, arc_buf_hdr_t *, hdr); arc_access(hdr, hash_lock); mutex_exit(hash_lock); ARCSTAT_BUMP(arcstat_hits); @@ -1400,11 +1468,12 @@ if (type == ARC_BUFC_METADATA) { arc_buf_data_free(buf->b_hdr, zio_buf_free, buf->b_data, size); - arc_space_return(size); + arc_space_return(size, ARC_SPACE_DATA); } else { ASSERT(type == ARC_BUFC_DATA); arc_buf_data_free(buf->b_hdr, zio_data_buf_free, buf->b_data, size); + ARCSTAT_INCR(arcstat_data_size, -size); atomic_add_64(&arc_size, -size); } } @@ -1699,6 +1768,21 @@ buf->b_data == stolen, TRUE); } } + + if (ab->b_l2hdr) { + ARCSTAT_INCR(arcstat_evict_l2_cached, + ab->b_size); + } else { + if (l2arc_write_eligible(ab->b_spa, ab)) { + ARCSTAT_INCR(arcstat_evict_l2_eligible, + ab->b_size); + } else { + ARCSTAT_INCR( + arcstat_evict_l2_ineligible, + ab->b_size); + } + } + if (ab->b_datacnt == 0) { arc_change_state(evicted_state, ab, hash_lock); ASSERT(HDR_IN_HASH_TABLE(ab)); @@ -1871,61 +1955,63 @@ static void arc_adjust(void) { - int64_t top_sz, mru_over, arc_over, todelete; + int64_t adjustment, delta; + + /* + * Adjust MRU size + */ - top_sz = arc_anon->arcs_size + arc_mru->arcs_size + arc_meta_used; + adjustment = MIN(arc_size - arc_c, + arc_anon->arcs_size + arc_mru->arcs_size + arc_meta_used - arc_p); - if (top_sz > arc_p && arc_mru->arcs_lsize[ARC_BUFC_DATA] > 0) { - int64_t toevict = - MIN(arc_mru->arcs_lsize[ARC_BUFC_DATA], top_sz - arc_p); - (void) arc_evict(arc_mru, NULL, toevict, FALSE, ARC_BUFC_DATA); - top_sz = arc_anon->arcs_size + arc_mru->arcs_size; + if (adjustment > 0 && arc_mru->arcs_lsize[ARC_BUFC_DATA] > 0) { + delta = MIN(arc_mru->arcs_lsize[ARC_BUFC_DATA], adjustment); + (void) arc_evict(arc_mru, NULL, delta, FALSE, ARC_BUFC_DATA); + adjustment -= delta; } - if (top_sz > arc_p && arc_mru->arcs_lsize[ARC_BUFC_METADATA] > 0) { - int64_t toevict = - MIN(arc_mru->arcs_lsize[ARC_BUFC_METADATA], top_sz - arc_p); - (void) arc_evict(arc_mru, NULL, toevict, FALSE, + if (adjustment > 0 && arc_mru->arcs_lsize[ARC_BUFC_METADATA] > 0) { + delta = MIN(arc_mru->arcs_lsize[ARC_BUFC_METADATA], adjustment); + (void) arc_evict(arc_mru, NULL, delta, FALSE, ARC_BUFC_METADATA); - top_sz = arc_anon->arcs_size + arc_mru->arcs_size; } - mru_over = top_sz + arc_mru_ghost->arcs_size - arc_c; + /* + * Adjust MFU size + */ + + adjustment = arc_size - arc_c; + + if (adjustment > 0 && arc_mfu->arcs_lsize[ARC_BUFC_DATA] > 0) { + delta = MIN(adjustment, arc_mfu->arcs_lsize[ARC_BUFC_DATA]); + (void) arc_evict(arc_mfu, NULL, delta, FALSE, ARC_BUFC_DATA); + adjustment -= delta; + } - if (mru_over > 0) { - if (arc_mru_ghost->arcs_size > 0) { - todelete = MIN(arc_mru_ghost->arcs_size, mru_over); - arc_evict_ghost(arc_mru_ghost, NULL, todelete); - } + if (adjustment > 0 && arc_mfu->arcs_lsize[ARC_BUFC_METADATA] > 0) { + int64_t delta = MIN(adjustment, + arc_mfu->arcs_lsize[ARC_BUFC_METADATA]); + (void) arc_evict(arc_mfu, NULL, delta, FALSE, + ARC_BUFC_METADATA); } - if ((arc_over = arc_size - arc_c) > 0) { - int64_t tbl_over; + /* + * Adjust ghost lists + */ - if (arc_mfu->arcs_lsize[ARC_BUFC_DATA] > 0) { - int64_t toevict = - MIN(arc_mfu->arcs_lsize[ARC_BUFC_DATA], arc_over); - (void) arc_evict(arc_mfu, NULL, toevict, FALSE, - ARC_BUFC_DATA); - arc_over = arc_size - arc_c; - } + adjustment = arc_mru->arcs_size + arc_mru_ghost->arcs_size - arc_c; - if (arc_over > 0 && - arc_mfu->arcs_lsize[ARC_BUFC_METADATA] > 0) { - int64_t toevict = - MIN(arc_mfu->arcs_lsize[ARC_BUFC_METADATA], - arc_over); - (void) arc_evict(arc_mfu, NULL, toevict, FALSE, - ARC_BUFC_METADATA); - } + if (adjustment > 0 && arc_mru_ghost->arcs_size > 0) { + delta = MIN(arc_mru_ghost->arcs_size, adjustment); + arc_evict_ghost(arc_mru_ghost, NULL, delta); + } - tbl_over = arc_size + arc_mru_ghost->arcs_size + - arc_mfu_ghost->arcs_size - arc_c * 2; + adjustment = + arc_mru_ghost->arcs_size + arc_mfu_ghost->arcs_size - arc_c; - if (tbl_over > 0 && arc_mfu_ghost->arcs_size > 0) { - todelete = MIN(arc_mfu_ghost->arcs_size, tbl_over); - arc_evict_ghost(arc_mfu_ghost, NULL, todelete); - } + if (adjustment > 0 && arc_mfu_ghost->arcs_size > 0) { + delta = MIN(arc_mfu_ghost->arcs_size, adjustment); + arc_evict_ghost(arc_mfu_ghost, NULL, delta); } } @@ -1999,8 +2085,6 @@ ASSERT(spa || arc_eviction_list == NULL); } -int arc_shrink_shift = 5; /* log2(fraction of arc to reclaim) */ - void arc_shrink(void) { @@ -2237,6 +2321,7 @@ arc_adapt(int bytes, arc_state_t *state) { int mult; + uint64_t arc_p_min = (arc_c >> arc_p_min_shift); if (state == arc_l2c_only) return; @@ -2254,12 +2339,15 @@ mult = ((arc_mru_ghost->arcs_size >= arc_mfu_ghost->arcs_size) ? 1 : (arc_mfu_ghost->arcs_size/arc_mru_ghost->arcs_size)); - arc_p = MIN(arc_c, arc_p + bytes * mult); + arc_p = MIN(arc_c - arc_p_min, arc_p + bytes * mult); } else if (state == arc_mfu_ghost) { + uint64_t delta; + mult = ((arc_mfu_ghost->arcs_size >= arc_mru_ghost->arcs_size) ? 1 : (arc_mru_ghost->arcs_size/arc_mfu_ghost->arcs_size)); - arc_p = MAX(0, (int64_t)arc_p - bytes * mult); + delta = MIN(bytes * mult, arc_p); + arc_p = MAX(arc_p_min, arc_p - delta); } ASSERT((int64_t)arc_p >= 0); @@ -2359,10 +2447,11 @@ if (!arc_evict_needed(type)) { if (type == ARC_BUFC_METADATA) { buf->b_data = zio_buf_alloc(size); - arc_space_consume(size); + arc_space_consume(size, ARC_SPACE_DATA); } else { ASSERT(type == ARC_BUFC_DATA); buf->b_data = zio_data_buf_alloc(size); + ARCSTAT_INCR(arcstat_data_size, size); atomic_add_64(&arc_size, size); } goto out; @@ -2379,21 +2468,22 @@ if (state == arc_mru || state == arc_anon) { uint64_t mru_used = arc_anon->arcs_size + arc_mru->arcs_size; - state = (arc_mfu->arcs_lsize[type] > 0 && + state = (arc_mfu->arcs_lsize[type] >= size && arc_p > mru_used) ? arc_mfu : arc_mru; } else { /* MFU cases */ uint64_t mfu_space = arc_c - arc_p; - state = (arc_mru->arcs_lsize[type] > 0 && + state = (arc_mru->arcs_lsize[type] >= size && mfu_space > arc_mfu->arcs_size) ? arc_mru : arc_mfu; } if ((buf->b_data = arc_evict(state, NULL, size, TRUE, type)) == NULL) { if (type == ARC_BUFC_METADATA) { buf->b_data = zio_buf_alloc(size); - arc_space_consume(size); + arc_space_consume(size, ARC_SPACE_DATA); } else { ASSERT(type == ARC_BUFC_DATA); buf->b_data = zio_data_buf_alloc(size); + ARCSTAT_INCR(arcstat_data_size, size); atomic_add_64(&arc_size, size); } ARCSTAT_BUMP(arcstat_recycle_miss); @@ -2816,7 +2906,8 @@ uint64_t size = BP_GET_LSIZE(bp); arc_callback_t *acb; vdev_t *vd = NULL; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 21 17:25:30 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 000BE106567C; Fri, 21 May 2010 17:25:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE840106566C for ; Fri, 21 May 2010 17:25:29 +0000 (UTC) (envelope-from gibbs@freebsd.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 99F6A8FC14 for ; Fri, 21 May 2010 17:25:29 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4LHPTcY066771 for ; Fri, 21 May 2010 17:25:29 GMT (envelope-from gibbs@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4LHPQvX066765 for perforce@freebsd.org; Fri, 21 May 2010 17:25:26 GMT (envelope-from gibbs@freebsd.org) Date: Fri, 21 May 2010 17:25:26 GMT Message-Id: <201005211725.o4LHPQvX066765@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gibbs@freebsd.org using -f From: "Justin T. Gibbs" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178598 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 May 2010 17:25:30 -0000 http://p4web.freebsd.org/@@178598?ac=10 Change 178598 by gibbs@gibbs-zfs on 2010/05/21 17:24:44 Re-baseline with //depot/user/pjd/zfs/... Affected files ... .. //depot/projects/zfs/Makefile.inc1#3 integrate .. //depot/projects/zfs/ObsoleteFiles.inc#4 integrate .. //depot/projects/zfs/UPDATING#4 integrate .. //depot/projects/zfs/bin/ln/symlink.7#2 integrate .. //depot/projects/zfs/bin/setfacl/setfacl.1#3 integrate .. //depot/projects/zfs/bin/sh/arith.y#3 integrate .. //depot/projects/zfs/bin/sh/arith_lex.l#2 integrate .. //depot/projects/zfs/bin/sh/eval.c#4 integrate .. //depot/projects/zfs/bin/sh/expand.c#3 integrate .. //depot/projects/zfs/bin/sh/sh.1#3 integrate .. //depot/projects/zfs/bin/sh/var.c#4 integrate .. //depot/projects/zfs/bin/sh/var.h#3 integrate .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zdb/zdb.c#3 integrate .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#3 integrate .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#3 integrate .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#2 integrate .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#3 integrate .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#3 integrate .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#3 integrate .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/ztest/ztest.c#3 integrate .. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#3 integrate .. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#3 integrate .. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#3 integrate .. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#3 integrate .. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#3 integrate .. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#3 integrate .. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#3 integrate .. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#3 integrate .. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzpool/common/util.c#2 integrate .. //depot/projects/zfs/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c#2 integrate .. //depot/projects/zfs/contrib/ipfilter/man/ipmon.8#2 integrate .. //depot/projects/zfs/contrib/telnet/telnet/commands.c#2 integrate .. //depot/projects/zfs/contrib/telnet/telnet/externs.h#3 integrate .. //depot/projects/zfs/contrib/telnet/telnet/network.c#2 integrate .. //depot/projects/zfs/contrib/telnet/telnet/sys_bsd.c#2 integrate .. //depot/projects/zfs/contrib/telnet/telnet/telnet.c#2 integrate .. //depot/projects/zfs/contrib/telnet/telnet/terminal.c#2 integrate .. //depot/projects/zfs/contrib/tzcode/zic/private.h#2 integrate .. //depot/projects/zfs/contrib/tzdata/northamerica#2 integrate .. //depot/projects/zfs/contrib/tzdata/zone.tab#2 integrate .. //depot/projects/zfs/contrib/xz/AUTHORS#1 branch .. //depot/projects/zfs/contrib/xz/COPYING#1 branch .. //depot/projects/zfs/contrib/xz/ChangeLog#1 branch .. //depot/projects/zfs/contrib/xz/FREEBSD-Xlist#1 branch .. //depot/projects/zfs/contrib/xz/FREEBSD-upgrade#1 branch .. //depot/projects/zfs/contrib/xz/README#1 branch .. //depot/projects/zfs/contrib/xz/THANKS#1 branch .. //depot/projects/zfs/contrib/xz/TODO#1 branch .. //depot/projects/zfs/contrib/xz/po/LINGUAS#1 branch .. //depot/projects/zfs/contrib/xz/po/Makevars#1 branch .. //depot/projects/zfs/contrib/xz/po/POTFILES.in#1 branch .. //depot/projects/zfs/contrib/xz/po/cs.po#1 branch .. //depot/projects/zfs/contrib/xz/src/common/mythread.h#1 branch .. //depot/projects/zfs/contrib/xz/src/common/sysdefs.h#1 branch .. //depot/projects/zfs/contrib/xz/src/common/tuklib_common.h#1 branch .. //depot/projects/zfs/contrib/xz/src/common/tuklib_config.h#1 branch .. //depot/projects/zfs/contrib/xz/src/common/tuklib_cpucores.c#1 branch .. //depot/projects/zfs/contrib/xz/src/common/tuklib_cpucores.h#1 branch .. //depot/projects/zfs/contrib/xz/src/common/tuklib_exit.c#1 branch .. //depot/projects/zfs/contrib/xz/src/common/tuklib_exit.h#1 branch .. //depot/projects/zfs/contrib/xz/src/common/tuklib_gettext.h#1 branch .. //depot/projects/zfs/contrib/xz/src/common/tuklib_integer.h#1 branch .. //depot/projects/zfs/contrib/xz/src/common/tuklib_open_stdxxx.c#1 branch .. //depot/projects/zfs/contrib/xz/src/common/tuklib_open_stdxxx.h#1 branch .. //depot/projects/zfs/contrib/xz/src/common/tuklib_physmem.c#1 branch .. //depot/projects/zfs/contrib/xz/src/common/tuklib_physmem.h#1 branch .. //depot/projects/zfs/contrib/xz/src/common/tuklib_progname.c#1 branch .. //depot/projects/zfs/contrib/xz/src/common/tuklib_progname.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/api/lzma.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/api/lzma/base.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/api/lzma/bcj.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/api/lzma/block.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/api/lzma/check.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/api/lzma/container.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/api/lzma/delta.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/api/lzma/filter.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/api/lzma/hardware.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/api/lzma/index.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/api/lzma/index_hash.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/api/lzma/lzma.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/api/lzma/stream_flags.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/api/lzma/subblock.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/api/lzma/version.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/api/lzma/vli.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/check/check.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/check/check.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/check/crc32_fast.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/check/crc32_small.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/check/crc32_table.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/check/crc32_table_be.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/check/crc32_table_le.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/check/crc32_tablegen.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/check/crc32_x86.S#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/check/crc64_fast.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/check/crc64_small.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/check/crc64_table.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/check/crc64_table_be.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/check/crc64_table_le.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/check/crc64_tablegen.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/check/crc64_x86.S#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/check/crc_macros.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/check/sha256.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/alone_decoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/alone_decoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/alone_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/auto_decoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/block_buffer_decoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/block_buffer_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/block_decoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/block_decoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/block_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/block_encoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/block_header_decoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/block_header_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/block_util.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/chunk_size.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/common.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/common.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/easy_buffer_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/easy_decoder_memusage.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/easy_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/easy_encoder_memusage.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/easy_preset.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/easy_preset.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/filter_buffer_decoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/filter_buffer_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/filter_common.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/filter_common.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/filter_decoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/filter_decoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/filter_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/filter_encoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/filter_flags_decoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/filter_flags_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/hardware_physmem.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/index.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/index.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/index_decoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/index_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/index_encoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/index_hash.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/stream_buffer_decoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/stream_buffer_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/stream_decoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/stream_decoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/stream_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/stream_encoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/stream_flags_common.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/stream_flags_common.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/stream_flags_decoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/stream_flags_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/vli_decoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/vli_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/common/vli_size.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/delta/delta_common.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/delta/delta_common.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/delta/delta_decoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/delta/delta_decoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/delta/delta_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/delta/delta_encoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/delta/delta_private.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lz/lz_decoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lz/lz_decoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lz/lz_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lz/lz_encoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lz/lz_encoder_hash.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lz/lz_encoder_hash_table.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lz/lz_encoder_mf.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lzma/fastpos.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lzma/fastpos_table.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lzma/fastpos_tablegen.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lzma/lzma2_decoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lzma/lzma2_decoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lzma/lzma2_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lzma/lzma2_encoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lzma/lzma_common.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lzma/lzma_decoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lzma/lzma_decoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lzma/lzma_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lzma/lzma_encoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lzma/lzma_encoder_presets.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/lzma/lzma_encoder_private.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/rangecoder/price.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/rangecoder/price_table.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/rangecoder/price_tablegen.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/rangecoder/range_common.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/rangecoder/range_decoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/rangecoder/range_encoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/simple/arm.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/simple/armthumb.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/simple/ia64.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/simple/powerpc.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/simple/simple_coder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/simple/simple_coder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/simple/simple_decoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/simple/simple_decoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/simple/simple_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/simple/simple_encoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/simple/simple_private.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/simple/sparc.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/simple/x86.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/subblock/subblock_decoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/subblock/subblock_decoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/subblock/subblock_decoder_helper.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/subblock/subblock_decoder_helper.h#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/subblock/subblock_encoder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/liblzma/subblock/subblock_encoder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/lzmainfo/lzmainfo.1#1 branch .. //depot/projects/zfs/contrib/xz/src/lzmainfo/lzmainfo.c#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/args.c#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/args.h#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/coder.c#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/coder.h#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/file_io.c#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/file_io.h#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/hardware.c#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/hardware.h#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/list.c#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/list.h#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/main.c#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/main.h#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/message.c#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/message.h#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/options.c#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/options.h#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/private.h#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/signals.c#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/signals.h#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/suffix.c#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/suffix.h#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/util.c#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/util.h#1 branch .. //depot/projects/zfs/contrib/xz/src/xz/xz.1#1 branch .. //depot/projects/zfs/contrib/xz/src/xzdec/xzdec.1#1 branch .. //depot/projects/zfs/contrib/xz/src/xzdec/xzdec.c#1 branch .. //depot/projects/zfs/crypto/openssh/ChangeLog#3 integrate .. //depot/projects/zfs/crypto/openssh/README#3 integrate .. //depot/projects/zfs/crypto/openssh/auth-options.c#3 integrate .. //depot/projects/zfs/crypto/openssh/auth2-pubkey.c#3 integrate .. //depot/projects/zfs/crypto/openssh/channels.c#3 integrate .. //depot/projects/zfs/crypto/openssh/clientloop.c#3 integrate .. //depot/projects/zfs/crypto/openssh/config.h#3 integrate .. //depot/projects/zfs/crypto/openssh/config.h.in#3 integrate .. //depot/projects/zfs/crypto/openssh/defines.h#3 integrate .. //depot/projects/zfs/crypto/openssh/key.c#3 integrate .. //depot/projects/zfs/crypto/openssh/key.h#3 integrate .. //depot/projects/zfs/crypto/openssh/loginrec.c#3 integrate .. //depot/projects/zfs/crypto/openssh/logintest.c#2 integrate .. //depot/projects/zfs/crypto/openssh/openbsd-compat/bsd-arc4random.c#2 integrate .. //depot/projects/zfs/crypto/openssh/servconf.c#3 integrate .. //depot/projects/zfs/crypto/openssh/session.c#3 integrate .. //depot/projects/zfs/crypto/openssh/ssh-keygen.1#3 integrate .. //depot/projects/zfs/crypto/openssh/ssh-keygen.c#3 integrate .. //depot/projects/zfs/crypto/openssh/ssh-pkcs11-helper.c#2 integrate .. //depot/projects/zfs/crypto/openssh/ssh.1#3 integrate .. //depot/projects/zfs/crypto/openssh/ssh_config#3 integrate .. //depot/projects/zfs/crypto/openssh/ssh_config.5#3 integrate .. //depot/projects/zfs/crypto/openssh/sshd_config#3 integrate .. //depot/projects/zfs/crypto/openssh/sshd_config.5#3 integrate .. //depot/projects/zfs/crypto/openssh/version.h#3 integrate .. //depot/projects/zfs/etc/csh.login#2 integrate .. //depot/projects/zfs/etc/defaults/rc.conf#4 integrate .. //depot/projects/zfs/etc/devd.conf#3 integrate .. //depot/projects/zfs/etc/mtree/BSD.include.dist#3 integrate .. //depot/projects/zfs/etc/network.subr#3 integrate .. //depot/projects/zfs/etc/periodic/daily/310.accounting#2 integrate .. //depot/projects/zfs/etc/periodic/daily/440.status-mailq#2 integrate .. //depot/projects/zfs/etc/periodic/weekly/330.catman#2 integrate .. //depot/projects/zfs/etc/profile#2 integrate .. //depot/projects/zfs/etc/rc.d/bluetooth#2 integrate .. //depot/projects/zfs/etc/rc.d/bridge#2 integrate .. //depot/projects/zfs/etc/rc.d/cleanvar#3 integrate .. //depot/projects/zfs/etc/rc.d/defaultroute#2 integrate .. //depot/projects/zfs/etc/rc.d/geli#2 integrate .. //depot/projects/zfs/etc/rc.d/geli2#2 integrate .. //depot/projects/zfs/etc/rc.d/ipfw#4 integrate .. //depot/projects/zfs/etc/rc.d/mdconfig#2 integrate .. //depot/projects/zfs/etc/rc.d/mdconfig2#2 integrate .. //depot/projects/zfs/etc/rc.d/named#3 integrate .. //depot/projects/zfs/etc/rc.d/nscd#2 integrate .. //depot/projects/zfs/etc/rc.d/rfcomm_pppd_server#2 integrate .. //depot/projects/zfs/etc/rc.d/routing#2 integrate .. //depot/projects/zfs/etc/rc.d/stf#2 integrate .. //depot/projects/zfs/etc/rc.d/syscons#2 integrate .. //depot/projects/zfs/etc/rc.d/ubthidhci#2 integrate .. //depot/projects/zfs/etc/rc.firewall#4 integrate .. //depot/projects/zfs/etc/rc.initdiskless#2 integrate .. //depot/projects/zfs/etc/regdomain.xml#2 integrate .. //depot/projects/zfs/etc/services#3 integrate .. //depot/projects/zfs/gnu/lib/libgcc/Makefile#3 integrate .. //depot/projects/zfs/gnu/lib/libstdc++/Makefile#3 integrate .. //depot/projects/zfs/gnu/lib/libsupc++/Makefile#3 integrate .. //depot/projects/zfs/gnu/usr.bin/cc/Makefile.inc#3 integrate .. //depot/projects/zfs/gnu/usr.bin/cc/cc_tools/freebsd-native.h#2 integrate .. //depot/projects/zfs/gnu/usr.bin/cc/include/Makefile#2 integrate .. //depot/projects/zfs/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate .. //depot/projects/zfs/lib/Makefile#3 integrate .. //depot/projects/zfs/lib/libarchive/Makefile#3 integrate .. //depot/projects/zfs/lib/libarchive/cpio.5#2 integrate .. //depot/projects/zfs/lib/libc/gen/alarm.3#2 integrate .. //depot/projects/zfs/lib/libc/gen/fmtcheck.3#3 integrate .. //depot/projects/zfs/lib/libc/gen/glob.c#2 integrate .. //depot/projects/zfs/lib/libc/gen/raise.3#2 integrate .. //depot/projects/zfs/lib/libc/gen/siginterrupt.3#2 integrate .. //depot/projects/zfs/lib/libc/gen/sysctl.3#3 integrate .. //depot/projects/zfs/lib/libc/gen/ualarm.3#2 integrate .. //depot/projects/zfs/lib/libc/locale/isblank.3#2 integrate .. //depot/projects/zfs/lib/libc/posix1e/acl_branding.c#2 integrate .. //depot/projects/zfs/lib/libc/posix1e/acl_perm.c#2 integrate .. //depot/projects/zfs/lib/libc/stdio/fgets.3#2 integrate .. //depot/projects/zfs/lib/libc/stdio/fopen.3#2 integrate .. //depot/projects/zfs/lib/libc/stdio/printf.3#4 integrate .. //depot/projects/zfs/lib/libc/stdio/tmpnam.3#2 integrate .. //depot/projects/zfs/lib/libc/stdio/wprintf.3#2 integrate .. //depot/projects/zfs/lib/libc/stdlib/realpath.3#3 integrate .. //depot/projects/zfs/lib/libc/stdlib/strtod.3#2 integrate .. //depot/projects/zfs/lib/libc/stdtime/strptime.c#2 integrate .. //depot/projects/zfs/lib/libc/string/strcat.3#3 integrate .. //depot/projects/zfs/lib/libc/string/strcpy.3#2 integrate .. //depot/projects/zfs/lib/libc/sys/access.2#2 integrate .. //depot/projects/zfs/lib/libc/sys/execve.2#2 integrate .. //depot/projects/zfs/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/zfs/lib/libc/sys/getitimer.2#2 integrate .. //depot/projects/zfs/lib/libc/sys/getrlimit.2#2 integrate .. //depot/projects/zfs/lib/libc/sys/getrusage.2#2 integrate .. //depot/projects/zfs/lib/libc/sys/ioctl.2#2 integrate .. //depot/projects/zfs/lib/libc/sys/quotactl.2#2 integrate .. //depot/projects/zfs/lib/libc/sys/setuid.2#2 integrate .. //depot/projects/zfs/lib/libc/sys/sigaction.2#3 integrate .. //depot/projects/zfs/lib/libc/sys/sigaltstack.2#2 integrate .. //depot/projects/zfs/lib/libc/sys/sigprocmask.2#2 integrate .. //depot/projects/zfs/lib/libc/sys/sigreturn.2#2 integrate .. //depot/projects/zfs/lib/libc/sys/unlink.2#3 integrate .. //depot/projects/zfs/lib/libc/sys/vfork.2#2 integrate .. //depot/projects/zfs/lib/libelf/elf.3#3 integrate .. //depot/projects/zfs/lib/libkvm/kvm.3#2 integrate .. //depot/projects/zfs/lib/liblzma/Makefile#1 branch .. //depot/projects/zfs/lib/liblzma/Symbol.map#1 branch .. //depot/projects/zfs/lib/liblzma/Versions.def#1 branch .. //depot/projects/zfs/lib/liblzma/config.h#1 branch .. //depot/projects/zfs/lib/libpam/modules/pam_krb5/pam_krb5.8#2 integrate .. //depot/projects/zfs/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate .. //depot/projects/zfs/lib/libpkg/Makefile#1 branch .. //depot/projects/zfs/lib/libpkg/deps.c#1 branch .. //depot/projects/zfs/lib/libpkg/exec.c#1 branch .. //depot/projects/zfs/lib/libpkg/file.c#1 branch .. //depot/projects/zfs/lib/libpkg/global.c#1 branch .. //depot/projects/zfs/lib/libpkg/match.c#1 branch .. //depot/projects/zfs/lib/libpkg/msg.c#1 branch .. //depot/projects/zfs/lib/libpkg/pen.c#1 branch .. //depot/projects/zfs/lib/libpkg/pkg.h#1 branch .. //depot/projects/zfs/lib/libpkg/pkgwrap.c#1 branch .. //depot/projects/zfs/lib/libpkg/plist.c#1 branch .. //depot/projects/zfs/lib/libpkg/str.c#1 branch .. //depot/projects/zfs/lib/libpkg/url.c#1 branch .. //depot/projects/zfs/lib/libpkg/version.c#1 branch .. //depot/projects/zfs/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/zfs/lib/libpmc/pmc.mips.3#2 integrate .. //depot/projects/zfs/lib/libpmc/pmc.xscale.3#2 integrate .. //depot/projects/zfs/lib/libufs/Makefile#3 integrate .. //depot/projects/zfs/lib/libufs/cgroup.c#3 integrate .. //depot/projects/zfs/lib/libufs/inode.c#2 integrate .. //depot/projects/zfs/lib/libufs/libufs.h#2 integrate .. //depot/projects/zfs/lib/libufs/sblock.c#3 integrate .. //depot/projects/zfs/lib/libufs/type.c#2 integrate .. //depot/projects/zfs/lib/libusb/libusb.h#3 integrate .. //depot/projects/zfs/lib/libusb/libusb10.c#4 integrate .. //depot/projects/zfs/lib/libusb/libusb10_desc.c#3 integrate .. //depot/projects/zfs/lib/libusb/libusb10_io.c#3 integrate .. //depot/projects/zfs/lib/libusb/libusb20_compat01.c#3 integrate .. //depot/projects/zfs/lib/libusbhid/data.c#3 integrate .. //depot/projects/zfs/lib/libusbhid/usbhid.h#3 integrate .. //depot/projects/zfs/lib/libutil/Makefile#3 integrate .. //depot/projects/zfs/lib/libutil/libutil.h#4 integrate .. //depot/projects/zfs/lib/libutil/quotafile.3#1 branch .. //depot/projects/zfs/lib/libutil/quotafile.c#1 branch .. //depot/projects/zfs/lib/msun/man/fenv.3#2 integrate .. //depot/projects/zfs/lib/msun/man/hypot.3#2 integrate .. //depot/projects/zfs/libexec/rpc.rquotad/Makefile#3 integrate .. //depot/projects/zfs/libexec/rpc.rquotad/rquotad.c#2 integrate .. //depot/projects/zfs/libexec/tftpd/Makefile#3 integrate .. //depot/projects/zfs/libexec/tftpd/tftp-file.c#1 branch .. //depot/projects/zfs/libexec/tftpd/tftp-file.h#1 branch .. //depot/projects/zfs/libexec/tftpd/tftp-io.c#1 branch .. //depot/projects/zfs/libexec/tftpd/tftp-io.h#1 branch .. //depot/projects/zfs/libexec/tftpd/tftp-options.c#1 branch .. //depot/projects/zfs/libexec/tftpd/tftp-options.h#1 branch .. //depot/projects/zfs/libexec/tftpd/tftp-transfer.c#1 branch .. //depot/projects/zfs/libexec/tftpd/tftp-transfer.h#1 branch .. //depot/projects/zfs/libexec/tftpd/tftp-utils.c#1 branch .. //depot/projects/zfs/libexec/tftpd/tftp-utils.h#1 branch .. //depot/projects/zfs/libexec/tftpd/tftpd.8#3 integrate .. //depot/projects/zfs/libexec/tftpd/tftpd.c#2 integrate .. //depot/projects/zfs/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate .. //depot/projects/zfs/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/zfs/rescue/rescue/Makefile#3 integrate .. //depot/projects/zfs/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/zfs/sbin/camcontrol/camcontrol.8#4 integrate .. //depot/projects/zfs/sbin/camcontrol/camcontrol.c#4 integrate .. //depot/projects/zfs/sbin/devd/devd.conf.5#2 integrate .. //depot/projects/zfs/sbin/dumpfs/dumpfs.c#3 integrate .. //depot/projects/zfs/sbin/fsck_ffs/Makefile#2 integrate .. //depot/projects/zfs/sbin/fsck_ffs/fsck.h#2 integrate .. //depot/projects/zfs/sbin/fsck_ffs/gjournal.c#3 integrate .. //depot/projects/zfs/sbin/fsck_ffs/main.c#3 integrate .. //depot/projects/zfs/sbin/fsck_ffs/pass5.c#2 integrate .. //depot/projects/zfs/sbin/fsck_ffs/suj.c#1 branch .. //depot/projects/zfs/sbin/fsdb/fsdb.c#2 integrate .. //depot/projects/zfs/sbin/fsdb/fsdbutil.c#2 integrate .. //depot/projects/zfs/sbin/fsirand/Makefile#2 integrate .. //depot/projects/zfs/sbin/fsirand/fsirand.8#2 integrate .. //depot/projects/zfs/sbin/fsirand/fsirand.c#2 integrate .. //depot/projects/zfs/sbin/geom/class/part/geom_part.c#2 integrate .. //depot/projects/zfs/sbin/geom/class/part/gpart.8#2 integrate .. //depot/projects/zfs/sbin/hastctl/hastctl.8#2 integrate .. //depot/projects/zfs/sbin/hastd/hast.conf.5#2 integrate .. //depot/projects/zfs/sbin/hastd/hast.h#2 integrate .. //depot/projects/zfs/sbin/hastd/hastd.8#2 integrate .. //depot/projects/zfs/sbin/hastd/hastd.c#2 integrate .. //depot/projects/zfs/sbin/hastd/metadata.c#2 integrate .. //depot/projects/zfs/sbin/hastd/parse.y#2 integrate .. //depot/projects/zfs/sbin/hastd/primary.c#2 integrate .. //depot/projects/zfs/sbin/hastd/proto.c#2 integrate .. //depot/projects/zfs/sbin/hastd/proto.h#2 integrate .. //depot/projects/zfs/sbin/hastd/proto_common.c#2 integrate .. //depot/projects/zfs/sbin/hastd/proto_tcp4.c#2 integrate .. //depot/projects/zfs/sbin/hastd/secondary.c#2 integrate .. //depot/projects/zfs/sbin/hastd/token.l#2 integrate .. //depot/projects/zfs/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/zfs/sbin/ifconfig/ifieee80211.c#3 integrate .. //depot/projects/zfs/sbin/kldstat/kldstat.c#2 integrate .. //depot/projects/zfs/sbin/mksnap_ffs/mksnap_ffs.8#2 integrate .. //depot/projects/zfs/sbin/mount/mount.8#3 integrate .. //depot/projects/zfs/sbin/mount_msdosfs/mount_msdosfs.8#3 integrate .. //depot/projects/zfs/sbin/mount_ntfs/mount_ntfs.8#2 integrate .. //depot/projects/zfs/sbin/mount_reiserfs/mount_reiserfs.8#2 integrate .. //depot/projects/zfs/sbin/mount_std/mount_std.8#2 integrate .. //depot/projects/zfs/sbin/quotacheck/Makefile#2 integrate .. //depot/projects/zfs/sbin/quotacheck/preen.c#2 integrate .. //depot/projects/zfs/sbin/quotacheck/quotacheck.8#3 integrate .. //depot/projects/zfs/sbin/quotacheck/quotacheck.c#2 integrate .. //depot/projects/zfs/sbin/quotacheck/quotacheck.h#2 integrate .. //depot/projects/zfs/sbin/rcorder/rcorder.8#2 integrate .. //depot/projects/zfs/sbin/restore/symtab.c#2 integrate .. //depot/projects/zfs/sbin/tunefs/Makefile#3 integrate .. //depot/projects/zfs/sbin/tunefs/tunefs.8#3 integrate .. //depot/projects/zfs/sbin/tunefs/tunefs.c#3 integrate .. //depot/projects/zfs/share/man/man1/builtin.1#2 integrate .. //depot/projects/zfs/share/man/man3/Makefile#3 integrate .. //depot/projects/zfs/share/man/man3/fpgetround.3#2 integrate .. //depot/projects/zfs/share/man/man3/pthread_cond_timedwait.3#2 integrate .. //depot/projects/zfs/share/man/man3/pthread_condattr.3#2 integrate .. //depot/projects/zfs/share/man/man4/Makefile#4 integrate .. //depot/projects/zfs/share/man/man4/ae.4#2 integrate .. //depot/projects/zfs/share/man/man4/ahb.4#2 integrate .. //depot/projects/zfs/share/man/man4/amdtemp.4#3 integrate .. //depot/projects/zfs/share/man/man4/ataraid.4#2 integrate .. //depot/projects/zfs/share/man/man4/bwn.4#2 integrate .. //depot/projects/zfs/share/man/man4/cas.4#2 integrate .. //depot/projects/zfs/share/man/man4/cmx.4#2 integrate .. //depot/projects/zfs/share/man/man4/cpuctl.4#2 integrate .. //depot/projects/zfs/share/man/man4/ed.4#2 integrate .. //depot/projects/zfs/share/man/man4/ef.4#2 integrate .. //depot/projects/zfs/share/man/man4/em.4#2 integrate .. //depot/projects/zfs/share/man/man4/en.4#2 integrate .. //depot/projects/zfs/share/man/man4/fpa.4#2 integrate .. //depot/projects/zfs/share/man/man4/fxp.4#2 integrate .. //depot/projects/zfs/share/man/man4/geom_fox.4#3 integrate .. //depot/projects/zfs/share/man/man4/harp.4#2 integrate .. //depot/projects/zfs/share/man/man4/hatm.4#2 integrate .. //depot/projects/zfs/share/man/man4/hifn.4#2 integrate .. //depot/projects/zfs/share/man/man4/hwpmc.4#2 integrate .. //depot/projects/zfs/share/man/man4/igb.4#2 integrate .. //depot/projects/zfs/share/man/man4/inet.4#2 integrate .. //depot/projects/zfs/share/man/man4/iscsi_initiator.4#3 integrate .. //depot/projects/zfs/share/man/man4/kbdmux.4#3 integrate .. //depot/projects/zfs/share/man/man4/ksyms.4#2 integrate .. //depot/projects/zfs/share/man/man4/man4.i386/cs.4#2 integrate .. //depot/projects/zfs/share/man/man4/man4.i386/ie.4#2 integrate .. //depot/projects/zfs/share/man/man4/man4.i386/mse.4#2 integrate .. //depot/projects/zfs/share/man/man4/man4.i386/pnp.4#2 integrate .. //depot/projects/zfs/share/man/man4/man4.i386/pnpbios.4#2 integrate .. //depot/projects/zfs/share/man/man4/man4.i386/vx.4#2 integrate .. //depot/projects/zfs/share/man/man4/man4.i386/wl.4#2 integrate .. //depot/projects/zfs/share/man/man4/man4.powerpc/snd_ai2s.4#2 integrate .. //depot/projects/zfs/share/man/man4/man4.powerpc/snd_davbus.4#2 integrate .. //depot/projects/zfs/share/man/man4/man4.sparc64/clkbrd.4#2 integrate .. //depot/projects/zfs/share/man/man4/man4.sparc64/creator.4#2 integrate .. //depot/projects/zfs/share/man/man4/man4.sparc64/machfb.4#2 integrate .. //depot/projects/zfs/share/man/man4/man4.sparc64/ofw_console.4#2 integrate .. //depot/projects/zfs/share/man/man4/man4.sparc64/openfirm.4#2 integrate .. //depot/projects/zfs/share/man/man4/man4.sparc64/openprom.4#2 integrate .. //depot/projects/zfs/share/man/man4/mfi.4#4 integrate .. //depot/projects/zfs/share/man/man4/mpt.4#3 integrate .. //depot/projects/zfs/share/man/man4/msk.4#3 integrate .. //depot/projects/zfs/share/man/man4/mvs.4#1 branch .. //depot/projects/zfs/share/man/man4/natm.4#2 integrate .. //depot/projects/zfs/share/man/man4/ng_bridge.4#2 integrate .. //depot/projects/zfs/share/man/man4/ng_hub.4#2 integrate .. //depot/projects/zfs/share/man/man4/nve.4#2 integrate .. //depot/projects/zfs/share/man/man4/patm.4#2 integrate .. //depot/projects/zfs/share/man/man4/psm.4#3 integrate .. //depot/projects/zfs/share/man/man4/run.4#2 integrate .. //depot/projects/zfs/share/man/man4/sge.4#2 integrate .. //depot/projects/zfs/share/man/man4/splash.4#3 integrate .. //depot/projects/zfs/share/man/man4/syscons.4#2 integrate .. //depot/projects/zfs/share/man/man4/twa.4#2 integrate .. //depot/projects/zfs/share/man/man4/ucom.4#3 integrate .. //depot/projects/zfs/share/man/man4/uhso.4#2 integrate .. //depot/projects/zfs/share/man/man4/vkbd.4#3 integrate .. //depot/projects/zfs/share/man/man4/vlan.4#3 integrate .. //depot/projects/zfs/share/man/man4/wpi.4#3 integrate .. //depot/projects/zfs/share/man/man5/boot.config.5#2 integrate .. //depot/projects/zfs/share/man/man5/fdescfs.5#2 integrate .. //depot/projects/zfs/share/man/man5/linsysfs.5#2 integrate .. //depot/projects/zfs/share/man/man5/make.conf.5#3 integrate .. //depot/projects/zfs/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/zfs/share/man/man5/reiserfs.5#2 integrate .. //depot/projects/zfs/share/man/man5/xfs.5#2 integrate .. //depot/projects/zfs/share/man/man9/alq.9#2 integrate .. //depot/projects/zfs/share/man/man9/fail.9#3 integrate .. //depot/projects/zfs/share/man/man9/ieee80211.9#3 integrate .. //depot/projects/zfs/share/man/man9/ieee80211_node.9#3 integrate .. //depot/projects/zfs/share/man/man9/make_dev.9#3 integrate .. //depot/projects/zfs/share/man/man9/mbpool.9#2 integrate .. //depot/projects/zfs/share/man/man9/namei.9#3 integrate .. //depot/projects/zfs/share/man/man9/uio.9#3 integrate .. //depot/projects/zfs/share/misc/mdoc.template#2 integrate .. //depot/projects/zfs/share/mk/bsd.libnames.mk#3 integrate .. //depot/projects/zfs/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/zfs/sys/amd64/amd64/bpf_jit_machdep.c#3 integrate .. //depot/projects/zfs/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate .. //depot/projects/zfs/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/zfs/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/zfs/sys/amd64/amd64/io.c#3 integrate .. //depot/projects/zfs/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/zfs/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/zfs/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/zfs/sys/amd64/include/iodev.h#3 integrate .. //depot/projects/zfs/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/zfs/sys/amd64/include/proc.h#2 integrate .. //depot/projects/zfs/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/zfs/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/zfs/sys/amd64/include/xen/xenfunc.h#2 integrate .. //depot/projects/zfs/sys/amd64/include/xen/xenvar.h#2 integrate .. //depot/projects/zfs/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/zfs/sys/arm/arm/cpufunc_asm_fa526.S#2 integrate .. //depot/projects/zfs/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/zfs/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/zfs/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/zfs/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/zfs/sys/arm/conf/DB-78XXX#3 integrate .. //depot/projects/zfs/sys/arm/conf/DB-88F5XXX#3 integrate .. //depot/projects/zfs/sys/arm/conf/DB-88F6XXX#3 integrate .. //depot/projects/zfs/sys/arm/conf/HL200#3 integrate .. //depot/projects/zfs/sys/arm/conf/KB920X#3 integrate .. //depot/projects/zfs/sys/arm/conf/LN2410SBC#2 integrate .. //depot/projects/zfs/sys/arm/conf/SHEEVAPLUG#2 integrate .. //depot/projects/zfs/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/zfs/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/zfs/sys/arm/include/disassem.h#2 integrate .. //depot/projects/zfs/sys/arm/include/md_var.h#3 integrate .. //depot/projects/zfs/sys/arm/include/pmap.h#2 integrate .. //depot/projects/zfs/sys/arm/include/proc.h#2 integrate .. //depot/projects/zfs/sys/arm/mv/files.mv#2 integrate .. //depot/projects/zfs/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/zfs/sys/boot/common/module.c#3 integrate .. //depot/projects/zfs/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/zfs/sys/boot/forth/loader.conf.5#3 integrate .. //depot/projects/zfs/sys/boot/sparc64/loader/main.c#3 integrate .. //depot/projects/zfs/sys/cam/ata/ata_da.c#3 integrate .. //depot/projects/zfs/sys/cam/ata/ata_pmp.c#4 integrate .. //depot/projects/zfs/sys/cam/ata/ata_xpt.c#4 integrate .. //depot/projects/zfs/sys/cam/cam_ccb.h#4 integrate .. //depot/projects/zfs/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/zfs/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/zfs/sys/cddl/boot/zfs/zfsimpl.h#3 integrate .. //depot/projects/zfs/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/zfs/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#3 integrate .. //depot/projects/zfs/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate .. //depot/projects/zfs/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate .. //depot/projects/zfs/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt_zap.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#2 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c#1 branch .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#3 delete .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h#1 branch .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c#1 branch .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c#2 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#3 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#2 integrate .. //depot/projects/zfs/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#3 integrate .. //depot/projects/zfs/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/zfs/sys/compat/x86bios/x86bios.c#3 integrate .. //depot/projects/zfs/sys/conf/NOTES#3 integrate .. //depot/projects/zfs/sys/conf/files#4 integrate .. //depot/projects/zfs/sys/conf/files.powerpc#2 integrate .. //depot/projects/zfs/sys/conf/files.sparc64#3 integrate .. //depot/projects/zfs/sys/conf/files.sun4v#3 integrate .. //depot/projects/zfs/sys/conf/kmod.mk#3 integrate .. //depot/projects/zfs/sys/conf/options#3 integrate .. //depot/projects/zfs/sys/conf/options.arm#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/changes.txt#4 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/common/adisasm.c#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/aslcompile.c#4 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/asldefine.h#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/aslfiles.c#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/asllisting.c#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/aslpredef.c#2 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/aslresource.c#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/aslrestype1.c#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/aslrestype1i.c#1 branch .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/aslrestype2.c#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/aslrestype2d.c#1 branch .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/aslrestype2e.c#1 branch .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/aslrestype2q.c#1 branch .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/aslrestype2w.c#1 branch .. //depot/projects/zfs/sys/contrib/dev/acpica/compiler/asltypes.h#4 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/debugger/dbcmds.c#4 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/debugger/dbdisply.c#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/events/evgpe.c#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/events/evgpeblk.c#4 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/events/evgpeinit.c#1 branch .. //depot/projects/zfs/sys/contrib/dev/acpica/events/evgpeutil.c#1 branch .. //depot/projects/zfs/sys/contrib/dev/acpica/executer/exconfig.c#4 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/executer/exoparg1.c#4 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/executer/exsystem.c#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/include/acevents.h#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/include/acglobal.h#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/include/acinterp.h#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/include/aclocal.h#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/include/acpiosxf.h#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/include/acpixf.h#4 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/include/actypes.h#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/include/amlresrc.h#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/osunixxf.c#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/tables/tbfind.c#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/tables/tbinstal.c#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/tables/tbutils.c#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/tables/tbxface.c#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/utilities/utcopy.c#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/utilities/utglobal.c#3 integrate .. //depot/projects/zfs/sys/contrib/dev/acpica/utilities/uttrack.c#3 integrate .. //depot/projects/zfs/sys/contrib/dev/run/rt2870.fw.uu#2 integrate .. //depot/projects/zfs/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/zfs/sys/ddb/db_output.c#2 integrate .. //depot/projects/zfs/sys/ddb/ddb.h#2 integrate .. //depot/projects/zfs/sys/dev/acpica/Osd/OsdHardware.c#3 integrate .. //depot/projects/zfs/sys/dev/ae/if_ae.c#3 integrate .. //depot/projects/zfs/sys/dev/agp/agp.c#3 integrate .. //depot/projects/zfs/sys/dev/agp/agp_i810.c#3 integrate .. //depot/projects/zfs/sys/dev/ahci/ahci.c#4 integrate .. //depot/projects/zfs/sys/dev/ahci/ahci.h#4 integrate .. //depot/projects/zfs/sys/dev/ale/if_ale.c#3 integrate .. //depot/projects/zfs/sys/dev/an/if_an.c#3 integrate .. //depot/projects/zfs/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/zfs/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/zfs/sys/dev/ata/chipsets/ata-serverworks.c#3 integrate .. //depot/projects/zfs/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#2 integrate .. //depot/projects/zfs/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/zfs/sys/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/zfs/sys/dev/atkbdc/atkbdc_ebus.c#2 integrate .. //depot/projects/zfs/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/zfs/sys/dev/atkbdc/atkbdcreg.h#2 integrate .. //depot/projects/zfs/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/zfs/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/zfs/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/zfs/sys/dev/bwi/if_bwi.c#3 integrate .. //depot/projects/zfs/sys/dev/bwn/if_bwn.c#2 integrate .. //depot/projects/zfs/sys/dev/cas/if_cas.c#2 integrate .. //depot/projects/zfs/sys/dev/cas/if_casreg.h#2 integrate .. //depot/projects/zfs/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/zfs/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/zfs/sys/dev/cm/smc90cx6.c#4 integrate .. //depot/projects/zfs/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/zfs/sys/dev/cs/if_cs.c#3 integrate .. //depot/projects/zfs/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/zfs/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/zfs/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/zfs/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/zfs/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/zfs/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/zfs/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/zfs/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/zfs/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/zfs/sys/dev/drm/drm_hashtab.c#2 integrate .. //depot/projects/zfs/sys/dev/drm/drm_mm.c#2 integrate .. //depot/projects/zfs/sys/dev/drm/drm_sman.c#2 integrate .. //depot/projects/zfs/sys/dev/drm/via_dmablit.c#2 integrate .. //depot/projects/zfs/sys/dev/drm/via_video.c#2 integrate .. //depot/projects/zfs/sys/dev/e1000/if_em.c#3 integrate .. //depot/projects/zfs/sys/dev/e1000/if_igb.c#3 integrate .. //depot/projects/zfs/sys/dev/e1000/if_lem.c#2 integrate .. //depot/projects/zfs/sys/dev/ed/if_ed.c#3 integrate .. //depot/projects/zfs/sys/dev/ep/if_ep.c#4 integrate .. //depot/projects/zfs/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/zfs/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/zfs/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/zfs/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/zfs/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/zfs/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/zfs/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/zfs/sys/dev/ie/if_ie.c#2 integrate .. //depot/projects/zfs/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/zfs/sys/dev/io/iodev.c#3 integrate .. //depot/projects/zfs/sys/dev/io/iodev.h#1 branch .. //depot/projects/zfs/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/zfs/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/zfs/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/zfs/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/zfs/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/zfs/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/zfs/sys/dev/iwn/if_iwn.c#3 integrate .. //depot/projects/zfs/sys/dev/ixgbe/ixgbe.c#3 integrate .. //depot/projects/zfs/sys/dev/le/lance.c#2 integrate .. //depot/projects/zfs/sys/dev/malo/if_malo.c#4 integrate .. //depot/projects/zfs/sys/dev/md/md.c#3 integrate .. //depot/projects/zfs/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/zfs/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/zfs/sys/dev/mii/miidevs#3 integrate .. //depot/projects/zfs/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/zfs/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/zfs/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/zfs/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/zfs/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/zfs/sys/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/zfs/sys/dev/mvs/mvs.c#1 branch .. //depot/projects/zfs/sys/dev/mvs/mvs.h#1 branch .. //depot/projects/zfs/sys/dev/mvs/mvs_if.m#1 branch .. //depot/projects/zfs/sys/dev/mvs/mvs_pci.c#1 branch .. //depot/projects/zfs/sys/dev/mvs/mvs_soc.c#1 branch .. //depot/projects/zfs/sys/dev/mwl/if_mwl.c#3 integrate .. //depot/projects/zfs/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/zfs/sys/dev/my/if_my.c#3 integrate .. //depot/projects/zfs/sys/dev/nxge/if_nxge.c#3 integrate .. //depot/projects/zfs/sys/dev/ofw/ofw_if.m#2 integrate .. //depot/projects/zfs/sys/dev/ofw/ofw_standard.c#3 integrate .. //depot/projects/zfs/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/zfs/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/zfs/sys/dev/pci/pci.c#4 integrate .. //depot/projects/zfs/sys/dev/pdq/pdq_ifsubr.c#3 integrate .. //depot/projects/zfs/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/zfs/sys/dev/quicc/quicc_bfe.h#2 integrate .. //depot/projects/zfs/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/zfs/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/zfs/sys/dev/re/if_re.c#4 integrate .. //depot/projects/zfs/sys/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/zfs/sys/dev/sge/if_sge.c#2 integrate .. //depot/projects/zfs/sys/dev/sge/if_sgereg.h#2 integrate .. //depot/projects/zfs/sys/dev/siis/siis.c#4 integrate .. //depot/projects/zfs/sys/dev/siis/siis.h#4 integrate .. //depot/projects/zfs/sys/dev/smc/if_smc.c#2 integrate .. //depot/projects/zfs/sys/dev/sn/if_sn.c#3 integrate .. //depot/projects/zfs/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/zfs/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/zfs/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/zfs/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/zfs/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/zfs/sys/dev/ti/if_ti.c#3 integrate .. //depot/projects/zfs/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/controller/ehci.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/controller/uhci.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/controller/usb_controller.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/controller/uss820dci.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/input/atp.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/input/uhid.c#3 integrate .. //depot/projects/zfs/sys/dev/usb/input/ukbd.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/input/ums.c#3 integrate .. //depot/projects/zfs/sys/dev/usb/misc/udbp.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/net/if_aue.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/net/if_axe.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/net/if_cdce.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/net/if_cue.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/net/if_kue.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/net/if_rue.c#3 integrate .. //depot/projects/zfs/sys/dev/usb/net/if_udav.c#3 integrate .. //depot/projects/zfs/sys/dev/usb/net/uhso.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/quirk/usb_quirk.c#3 integrate .. //depot/projects/zfs/sys/dev/usb/serial/u3g.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/serial/ubsa.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/serial/ubser.c#3 integrate .. //depot/projects/zfs/sys/dev/usb/serial/uchcom.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/serial/uftdi.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/serial/ulpt.c#3 integrate .. //depot/projects/zfs/sys/dev/usb/serial/umodem.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/serial/umoscom.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/serial/uplcom.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/serial/usb_serial.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/serial/uslcom.c#3 integrate .. //depot/projects/zfs/sys/dev/usb/serial/uvisor.c#3 integrate .. //depot/projects/zfs/sys/dev/usb/serial/uvscom.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/storage/umass.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/storage/urio.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/storage/ustorage_fs.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/usb_compat_linux.c#3 integrate .. //depot/projects/zfs/sys/dev/usb/usb_debug.h#3 integrate .. //depot/projects/zfs/sys/dev/usb/usb_dev.c#3 integrate .. //depot/projects/zfs/sys/dev/usb/usb_device.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/usb_device.h#3 integrate .. //depot/projects/zfs/sys/dev/usb/usb_freebsd.h#2 integrate .. //depot/projects/zfs/sys/dev/usb/usb_generic.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/usb_hid.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/usb_hub.c#3 integrate .. //depot/projects/zfs/sys/dev/usb/usb_request.c#3 integrate .. //depot/projects/zfs/sys/dev/usb/usb_transfer.c#4 integrate .. //depot/projects/zfs/sys/dev/usb/usb_transfer.h#2 integrate .. //depot/projects/zfs/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/zfs/sys/dev/usb/usbhid.h#2 integrate .. //depot/projects/zfs/sys/dev/usb/wlan/if_rum.c#3 integrate .. //depot/projects/zfs/sys/dev/usb/wlan/if_run.c#2 integrate .. //depot/projects/zfs/sys/dev/usb/wlan/if_runreg.h#2 integrate .. //depot/projects/zfs/sys/dev/usb/wlan/if_runvar.h#2 integrate .. //depot/projects/zfs/sys/dev/usb/wlan/if_uath.c#3 integrate .. //depot/projects/zfs/sys/dev/usb/wlan/if_upgt.c#3 integrate .. //depot/projects/zfs/sys/dev/usb/wlan/if_ural.c#3 integrate .. //depot/projects/zfs/sys/dev/usb/wlan/if_urtw.c#3 integrate .. //depot/projects/zfs/sys/dev/usb/wlan/if_zyd.c#3 integrate .. //depot/projects/zfs/sys/dev/vx/if_vx.c#3 integrate .. //depot/projects/zfs/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/zfs/sys/dev/wl/if_wl.c#3 integrate .. //depot/projects/zfs/sys/dev/wpi/if_wpi.c#3 integrate .. //depot/projects/zfs/sys/dev/xe/if_xe.c#2 integrate .. //depot/projects/zfs/sys/dev/xen/netfront/netfront.c#4 integrate .. //depot/projects/zfs/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/zfs/sys/fs/devfs/devfs_int.h#3 integrate .. //depot/projects/zfs/sys/fs/ext2fs/ext2_readwrite.c#2 integrate .. //depot/projects/zfs/sys/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/zfs/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/zfs/sys/fs/nfs/nfs_commonkrpc.c#2 integrate .. //depot/projects/zfs/sys/fs/nfs/nfs_commonport.c#3 integrate .. //depot/projects/zfs/sys/fs/nfs/nfs_var.h#4 integrate .. //depot/projects/zfs/sys/fs/nfs/nfskpiport.h#2 integrate .. //depot/projects/zfs/sys/fs/nfs/nfsport.h#3 integrate .. //depot/projects/zfs/sys/fs/nfsclient/nfs.h#3 integrate .. //depot/projects/zfs/sys/fs/nfsclient/nfs_clbio.c#3 integrate .. //depot/projects/zfs/sys/fs/nfsclient/nfs_clnfsiod.c#3 integrate .. //depot/projects/zfs/sys/fs/nfsclient/nfs_clnode.c#2 integrate .. //depot/projects/zfs/sys/fs/nfsclient/nfs_clrpcops.c#3 integrate .. //depot/projects/zfs/sys/fs/nfsclient/nfs_clstate.c#3 integrate .. //depot/projects/zfs/sys/fs/nfsclient/nfs_clvfsops.c#3 integrate .. //depot/projects/zfs/sys/fs/nfsclient/nfs_clvnops.c#3 integrate .. //depot/projects/zfs/sys/fs/nfsserver/nfs_nfsdstate.c#3 integrate .. //depot/projects/zfs/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/zfs/sys/fs/nwfs/nwfs_io.c#3 integrate .. //depot/projects/zfs/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/zfs/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/zfs/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/zfs/sys/geom/geom.h#2 integrate .. //depot/projects/zfs/sys/geom/geom_subr.c#3 integrate .. //depot/projects/zfs/sys/geom/multipath/g_multipath.c#3 integrate .. //depot/projects/zfs/sys/geom/part/g_part.c#3 integrate .. //depot/projects/zfs/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/zfs/sys/geom/part/g_part_bsd.c#3 integrate .. //depot/projects/zfs/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/zfs/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/zfs/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/zfs/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/zfs/sys/geom/part/g_part_vtoc8.c#3 integrate .. //depot/projects/zfs/sys/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/zfs/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/zfs/sys/geom/vinum/geom_vinum_events.c#2 integrate .. //depot/projects/zfs/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/zfs/sys/geom/zero/g_zero.c#2 integrate .. //depot/projects/zfs/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate .. //depot/projects/zfs/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/zfs/sys/i386/conf/XBOX#2 integrate .. //depot/projects/zfs/sys/i386/i386/bpf_jit_machdep.c#3 integrate .. //depot/projects/zfs/sys/i386/i386/bpf_jit_machdep.h#3 integrate .. //depot/projects/zfs/sys/i386/i386/geode.c#2 integrate .. //depot/projects/zfs/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/zfs/sys/i386/i386/io.c#3 integrate .. //depot/projects/zfs/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/zfs/sys/i386/include/iodev.h#3 integrate .. //depot/projects/zfs/sys/i386/include/pmap.h#3 integrate .. //depot/projects/zfs/sys/i386/include/proc.h#2 integrate .. //depot/projects/zfs/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/zfs/sys/i386/include/xen/xenfunc.h#2 integrate .. //depot/projects/zfs/sys/i386/include/xen/xenvar.h#2 integrate .. //depot/projects/zfs/sys/i386/xen/pmap.c#4 integrate .. //depot/projects/zfs/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/zfs/sys/ia64/ia64/iodev_machdep.c#2 integrate .. //depot/projects/zfs/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/zfs/sys/ia64/include/iodev.h#2 integrate .. //depot/projects/zfs/sys/ia64/include/pmap.h#3 integrate .. //depot/projects/zfs/sys/ia64/include/proc.h#2 integrate .. //depot/projects/zfs/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/zfs/sys/kern/kern_alq.c#3 integrate .. //depot/projects/zfs/sys/kern/kern_conf.c#3 integrate .. //depot/projects/zfs/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/zfs/sys/kern/kern_exec.c#3 integrate .. //depot/projects/zfs/sys/kern/kern_gzio.c#2 integrate .. //depot/projects/zfs/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/zfs/sys/kern/kern_ntptime.c#2 integrate .. //depot/projects/zfs/sys/kern/kern_proc.c#3 integrate .. //depot/projects/zfs/sys/kern/kern_resource.c#3 integrate .. //depot/projects/zfs/sys/kern/kern_sig.c#4 integrate .. //depot/projects/zfs/sys/kern/kern_thread.c#2 integrate .. //depot/projects/zfs/sys/kern/sched_ule.c#4 integrate .. //depot/projects/zfs/sys/kern/subr_bufring.c#2 integrate .. //depot/projects/zfs/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/zfs/sys/kern/subr_smp.c#2 integrate .. //depot/projects/zfs/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/zfs/sys/kern/subr_uio.c#2 integrate .. //depot/projects/zfs/sys/kern/subr_witness.c#3 integrate .. //depot/projects/zfs/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/zfs/sys/kern/sys_process.c#4 integrate .. //depot/projects/zfs/sys/kern/uipc_cow.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 21 17:34:40 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E9791065675; Fri, 21 May 2010 17:34:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E794E1065673 for ; Fri, 21 May 2010 17:34:39 +0000 (UTC) (envelope-from iprebeg@freebsd.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D55088FC13 for ; Fri, 21 May 2010 17:34:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4LHYdLs067682 for ; Fri, 21 May 2010 17:34:39 GMT (envelope-from iprebeg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4LHYd7N067680 for perforce@freebsd.org; Fri, 21 May 2010 17:34:39 GMT (envelope-from iprebeg@freebsd.org) Date: Fri, 21 May 2010 17:34:39 GMT Message-Id: <201005211734.o4LHYd7N067680@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to iprebeg@freebsd.org using -f From: Ivor Prebeg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178600 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 May 2010 17:34:40 -0000 http://p4web.freebsd.org/@@178600?ac=10 Change 178600 by iprebeg@iprebeg_zeus on 2010/05/21 17:34:32 Removed X_ip_mrouter_done() from vnet_mroute_uninit() as it causes mtx_lock() on already destroyed mutex and all work is alreadly done anyway Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#41 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#41 (text+ko) ==== @@ -707,9 +707,7 @@ struct ifnet *ifp; struct ifreq ifr; - printf ("V_mcast: before MROUTER LOCK\n"); MROUTER_LOCK(); - printf ("V_mcast: after MROUTER LOCK\n"); if (V_ip_mrouter == NULL) { MROUTER_UNLOCK(); @@ -725,7 +723,6 @@ VIF_LOCK(); - printf ("V_mcast: after VIF LOCK, before numvifs loop\n"); /* * For each phyint in use, disable promiscuous reception of all IP * multicasts. @@ -746,14 +743,11 @@ V_numvifs = 0; V_pim_assert_enabled = 0; - printf ("V_mcast: before VIF UNLOCK, after numvifs loop\n"); VIF_UNLOCK(); - printf ("V_mcast: after VIF UNLOCK, before stopping callouts\n"); callout_stop(&V_expire_upcalls_ch); callout_stop(&V_bw_upcalls_ch); callout_stop(&V_bw_meter_ch); - printf ("V_mcast: after stopping callouts\n"); MFC_LOCK(); @@ -2838,7 +2832,6 @@ vnet_mroute_uninit(const void *unused __unused) { - X_ip_mrouter_done(); FREE(V_nexpire, M_MRTABLE); V_nexpire = NULL; } From owner-p4-projects@FreeBSD.ORG Sat May 22 22:59:04 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B93571065673; Sat, 22 May 2010 22:59:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 647C7106566C for ; Sat, 22 May 2010 22:59:04 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 514BD8FC0C for ; Sat, 22 May 2010 22:59:04 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4MMx3o5019522 for ; Sat, 22 May 2010 22:59:03 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4MMww5D019514 for perforce@freebsd.org; Sat, 22 May 2010 22:58:58 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 22 May 2010 22:58:58 GMT Message-Id: <201005222258.o4MMww5D019514@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178626 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 May 2010 22:59:05 -0000 http://p4web.freebsd.org/@@178626?ac=10 Change 178626 by pgj@csupor on 2010/05/22 22:57:59 IFC @178625 Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/Makefile.inc1#7 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/CHANGES#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/validator.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/version#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/Makefile#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/csh.login#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/network.subr#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/periodic/weekly/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/profile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/SERVERS#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/ddb#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/dumpon#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/hostid#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/hostid_save#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/initrandom#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/mdconfig#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/mountcritlocal#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/savecore#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/sysctl#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/zvol#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/Makefile#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/Makefile#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/archive_read_disk.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/archive_read_open_fd.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/archive_read_open_filename.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/config_freebsd.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/isgreater.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/sem_timedwait.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/setproctitle.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/tcgetsid.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libftpio/ftpio.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libmagic/Makefile#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libmagic/config.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_get_error.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_get_mech_info.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_get_mechanisms.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_get_principal_name.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_get_versions.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_getcred.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_is_installed.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_max_data_length.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_mech_to_oid.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_oid_to_mech.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_qop_to_num.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_seccreate.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_set_callback.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_set_defaults.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_set_svc_name.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/librpcsec_gss/rpcsec_gss.3#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/libexec/rtld-elf/amd64/reloc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/libexec/rtld-elf/arm/reloc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/libexec/rtld-elf/i386/reloc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/libexec/rtld-elf/powerpc/reloc.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/libexec/rtld-elf/rtld.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/libexec/rtld-elf/sparc64/reloc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/bsdlabel/bsdlabel.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/fsck_ffs/pass2.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/fsck_ffs/pass4.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/geom/class/part/geom_part.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/mount_hpfs/mount_hpfs.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/tunefs/tunefs.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ksyms.4#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/malo.4#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/man4.powerpc/bm.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/md.4#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ng_ccatm.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/smp.4#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/snd_emu10kx.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/tx.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/u3g.4#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/uath.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/usb.4#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/usb2_template.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man5/src.conf.5#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man8/nanobsd.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/cr_seeothergids.9#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/cr_seeotheruids.9#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/p_candebug.9#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/p_cansee.9#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/prison_check.9#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/usbdi.9#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/watchdog.9#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/misc/bsd-family-tree#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/misc/committers-src.dot#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/mk/bsd.README#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/mk/bsd.own.mk#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/include/apicreg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/include/atomic.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/i386/zfsboot/zfsboot.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_da.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_xpt.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/scsi/scsi_xpt.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#9 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/conf/files#7 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/conf/files.powerpc#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/conf/files.sparc64#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ahci/ahci.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-all.c#8 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-disk.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-pci.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-serverworks.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwn/if_bwn.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/cxgb_main.c#9 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/e1000/if_em.c#7 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/e1000/if_igb.c#7 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fb/vesa.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/isp/ispvar.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ixgbe/ixgbe.c#7 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ixgbe/ixgbe.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mvs/mvs.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mvs/mvs_pci.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mvs/mvs_soc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mxge/eth_z8e.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mxge/ethp_z8e.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mxge/rss_eth_z8e.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mxge/rss_ethp_z8e.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ofw/ofw_if.m#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ofw/ofw_standard.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ofw/openfirm.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/pci/pci.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/siis/siis.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/syscons/syscons.c#7 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/syscons/syscons.h#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clsubs.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clvfsops.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/include/apicreg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/include/atomic.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/xen/pmap.c#7 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/db_machdep.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/ia64_cpu.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/pmap.h#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/runq.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/sal.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/vmparam.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_kthread.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/sched_ule.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_pcpu.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_smp.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/sys_generic.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/conf/XLR#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/hwfunc.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/locore.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/param.h#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/smp.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/cpu.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/db_trace.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/machdep.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/mp_machdep.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/mpboot.S#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/pmap.c#8 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/dev/xlr/rge.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/files.xlr#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/interrupt.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/intr_machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/iodi.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/mpwait.S#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/on_chip.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/pic.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/xlr_machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/xlr_pci.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/xlrconfig.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/sibyte/sb_machdep.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/modules/cas/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/modules/mvs/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/flowtable.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/flowtable.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_vlan.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_socket.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_bsd_addr.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_constants.h#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_pcb.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_structs.h#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctputil.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/in6.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_input.c#8 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/pc98/include/md_var.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/pc98/pc98/pc98_machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/aim/mmu_oea.c#7 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/aim/mmu_oea64.c#8 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/aim/ofw_machdep.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/booke/pmap.c#7 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/cpufreq/pcr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/include/pmap.h#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/ofw/ofw_pcibus.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/ofw/ofw_real.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powermac/ata_kauai.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powermac/cpcht.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powermac/cpchtvar.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powermac/smu.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powermac/uninorth.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powermac/uninorthpci.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powermac/uninorthvar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powerpc/openpic.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/include/md_var.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/ata_machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/pmap.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sun4v/sun4v/pmap.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sys/endian.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sys/kthread.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ffs/softdep.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_fault.c#10 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_object.c#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_page.c#10 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_page.h#7 integrate .. //depot/projects/soc2009/pgj_libstat/src/tools/build/options/WITHOUT_MAN_UTILS#1 branch .. //depot/projects/soc2009/pgj_libstat/src/tools/tools/ether_reflect/ether_reflect.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/Makefile#7 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/ar/Makefile#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/ar/acpyacc.y#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/ar/ar.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/ar/ar.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/ar/ar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/ar/read.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/ar/write.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/csup/cpasswd.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/csup/csup.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/mkuzip/mkuzip.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/vmstat/vmstat.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/vmstat/vmstat.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/wc/wc.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/Makefile#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/apm/apm.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/apmd/Makefile#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/apmd/README#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/apmd/apmd.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/clear_locks/clear_locks.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/daemon/daemon.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/gssd/gssd.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/iostat/iostat.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/iostat/iostat.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/jail/jail.8#6 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/mixer/mixer.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/mptable/mptable.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/nscd/nscd.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/nscd/nscd.conf.5#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/ntp/doc/ntpd.8#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/snapinfo/snapinfo.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/sysinstall/network.c#2 integrate Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/Makefile.inc1#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.646 2010/05/10 15:28:44 mm Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.650 2010/05/20 20:15:56 jkim Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir ==== //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#5 (text+ko) ==== @@ -343,6 +343,9 @@ extern int taskq_member(taskq_t *, void *); extern void system_taskq_init(void); +#define taskq_dispatch_safe(tq, func, arg, task) \ + taskq_dispatch((tq), (func), (arg), TQ_SLEEP) + #define XVA_MAPSIZE 3 #define XVA_MAGIC 0x78766174 ==== //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/CHANGES#4 (text+ko) ==== @@ -1,3 +1,8 @@ + --- 9.6.2-P2 released --- + +2876. [bug] Named could return SERVFAIL for negative responses + from unsigned zones. [RT #21131] + --- 9.6.2-P1 released --- 2852. [bug] Handle broken DNSSEC trust chains better. [RT #15619] ==== //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/api#4 (text+ko) ==== @@ -1,3 +1,3 @@ LIBINTERFACE = 56 -LIBREVISION = 0 +LIBREVISION = 1 LIBAGE = 1 ==== //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/validator.c#4 (text+ko) ==== @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: validator.c,v 1.164.12.11.8.2 2010/02/25 10:57:12 tbox Exp $ */ +/* $Id: validator.c,v 1.164.12.11.8.3 2010/04/21 04:29:01 marka Exp $ */ #include @@ -2961,7 +2961,7 @@ } findnsec3proofs(val); - if (val->authcount == val->authfail) + if (val->authfail != 0 && val->authcount == val->authfail) return (DNS_R_BROKENCHAIN); validator_log(val, ISC_LOG_DEBUG(3), "nonexistence proof(s) not found"); ==== //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/version#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $Id: version,v 1.43.12.8.2.3 2010/03/04 00:08:28 marka Exp $ +# $Id: version,v 1.43.12.8.2.4 2010/05/10 02:07:03 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -7,4 +7,4 @@ MINORVER=6 PATCHVER=2 RELEASETYPE=-P -RELEASEVER=1 +RELEASEVER=2 ==== //depot/projects/soc2009/pgj_libstat/src/etc/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.381 2010/03/19 15:53:02 ed Exp $ +# $FreeBSD: src/etc/Makefile,v 1.382 2010/05/19 23:56:26 jkim Exp $ .include @@ -64,7 +64,7 @@ BIN1+= ${.CURDIR}/../usr.bin/mail/misc/mail.rc .endif -.if ${MK_MAN} != "no" +.if ${MK_MAN_UTILS} != "no" BIN1+= ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config .endif ==== //depot/projects/soc2009/pgj_libstat/src/etc/csh.login#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/csh.login,v 1.21 2004/06/06 11:46:27 schweikh Exp $ +# $FreeBSD: src/etc/csh.login,v 1.22 2010/05/15 17:49:56 jilles Exp $ # # System-wide .login file for csh(1). # Uncomment this to give you the default 4.2 behavior, where disk @@ -9,7 +9,7 @@ # login.conf(5) and in particular the charset and lang options. # For full locales list check /usr/share/locale/* # -# Read system messages -# msgs -f +# Check system messages +# msgs -q # Allow terminal messages # mesg y ==== //depot/projects/soc2009/pgj_libstat/src/etc/network.subr#6 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.209 2010/05/14 04:53:57 dougb Exp $ +# $FreeBSD: src/etc/network.subr,v 1.210 2010/05/17 19:51:34 jhb Exp $ # # @@ -917,7 +917,7 @@ _list= for ifn in ${cloned_interfaces}; do - ifconfig ${ifn} destroy + ifconfig -n ${ifn} destroy if [ $? -eq 0 ]; then _list="${_list}${_prefix}${ifn}" [ -z "$_prefix" ] && _prefix=' ' @@ -1002,10 +1002,7 @@ if ! ifexists $child; then continue fi - if autoif $child; then - ifn_stop $child - fi - ifconfig $child destroy && cfg=0 + ifconfig -n $child destroy && cfg=0 done child_vlans=`get_if_var $ifn vlans_IF` @@ -1016,10 +1013,7 @@ if ! ifexists $child; then continue fi - if autoif $child; then - ifn_stop $child - fi - ifconfig $child destroy && cfg=0 + ifconfig -n $child destroy && cfg=0 done return ${cfg} ==== //depot/projects/soc2009/pgj_libstat/src/etc/periodic/weekly/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/periodic/weekly/Makefile,v 1.11 2009/01/14 09:00:30 ume Exp $ +# $FreeBSD: src/etc/periodic/weekly/Makefile,v 1.12 2010/05/19 23:56:26 jkim Exp $ .include @@ -11,7 +11,7 @@ FILES+= 310.locate .endif -.if ${MK_MAN} != "no" +.if ${MK_MAN_UTILS} != "no" FILES+= 320.whatis 330.catman .endif ==== //depot/projects/soc2009/pgj_libstat/src/etc/profile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/profile,v 1.14 2004/06/06 11:46:27 schweikh Exp $ +# $FreeBSD: src/etc/profile,v 1.15 2010/05/15 17:49:56 jilles Exp $ # # System-wide .profile file for sh(1). # @@ -12,7 +12,7 @@ # You should also read the setlocale(3) man page for information # on how to achieve more precise control of locale settings. # -# Read system messages -# msgs -f +# Check system messages +# msgs -q # Allow terminal messages # mesg y ==== //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/SERVERS#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/SERVERS,v 1.8 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/SERVERS,v 1.9 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: SERVERS -# REQUIRE: mountcritremote abi ldconfig +# REQUIRE: mountcritremote abi ldconfig savecore # This is a dummy dependency, for early-start servers relying on # some basic configuration. ==== //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/ddb#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ddb,v 1.1 2008/03/05 18:32:58 brooks Exp $ +# $FreeBSD: src/etc/rc.d/ddb,v 1.2 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: ddb # REQUIRE: dumpon -# BEFORE: disks savecore initrandom +# BEFORE: disks # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/dumpon#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/dumpon,v 1.12 2008/06/23 04:39:36 mtm Exp $ +# $FreeBSD: src/etc/rc.d/dumpon,v 1.13 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: dumpon -# BEFORE: disks savecore initrandom +# REQUIRE: zvol +# BEFORE: disks # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/hostid#3 (text+ko) ==== @@ -24,11 +24,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/hostid,v 1.12 2009/10/10 22:17:03 dougb Exp $ +# $FreeBSD: src/etc/rc.d/hostid,v 1.13 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: hostid -# BEFORE: fsck +# REQUIRE: sysctl # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/hostid_save#2 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/hostid_save,v 1.1 2009/07/29 05:23:52 pjd Exp $ +# $FreeBSD: src/etc/rc.d/hostid_save,v 1.2 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: hostid_save # REQUIRE: root -# BEFORE: mountcritlocal # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/initrandom#2 (text+ko) ==== @@ -1,9 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/initrandom,v 1.8 2008/04/22 15:18:47 ru Exp $ +# $FreeBSD: src/etc/rc.d/initrandom,v 1.9 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: initrandom +# REQUIRE: dumpon ddb # BEFORE: disks # KEYWORD: nojail ==== //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/mdconfig#3 (text) ==== @@ -24,12 +24,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/mdconfig,v 1.6 2010/05/14 04:53:57 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mdconfig,v 1.7 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: mdconfig -# REQUIRE: localswap -# BEFORE: mountcritlocal +# REQUIRE: localswap root . /etc/rc.subr ==== //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/mountcritlocal#3 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.18 2009/10/10 22:17:03 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.19 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: mountcritlocal -# REQUIRE: root +# REQUIRE: root hostid_save mdconfig # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/savecore#3 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/savecore,v 1.17 2009/10/10 22:17:03 dougb Exp $ +# $FreeBSD: src/etc/rc.d/savecore,v 1.18 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: savecore -# REQUIRE: syslogd -# BEFORE: SERVERS +# REQUIRE: dumpon ddb syslogd # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/sysctl#3 (text+ko) ==== @@ -1,11 +1,9 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/sysctl,v 1.22 2009/09/12 22:13:41 hrs Exp $ +# $FreeBSD: src/etc/rc.d/sysctl,v 1.23 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: sysctl -# REQUIRE: root -# BEFORE: FILESYSTEMS . /etc/rc.subr ==== //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/zvol#2 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/zvol,v 1.1 2009/07/29 05:23:52 pjd Exp $ +# $FreeBSD: src/etc/rc.d/zvol,v 1.2 2010/05/19 19:03:19 dougb Exp $ # # PROVIDE: zvol # REQUIRE: hostid -# BEFORE: fsck # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.102 2010/03/26 17:02:32 delphij Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.103 2010/05/19 23:56:26 jkim Exp $ .include @@ -39,7 +39,7 @@ _texinfo= texinfo .endif -.if ${MK_MAN} != "no" +.if ${MK_MAN_UTILS} != "no" _man= man .endif ==== //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/Makefile#5 (text+ko) ==== @@ -1,9 +1,17 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.104 2010/05/10 15:28:44 mm Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.106 2010/05/17 07:06:54 delphij Exp $ .include LIB= archive -DPADD= ${LIBBZ2} ${LIBZ} ${LIBMD} ${LIBLZMA} -LDADD= -lbz2 -lz -lmd -llzma +DPADD= ${LIBZ} ${LIBMD} +LDADD= -lz -lmd + +DPADD+= ${LIBBZ2} +LDADD+= -lbz2 +CFLAGS+= -DHAVE_BZLIB_H=1 + +DPADD+= ${LIBLZMA} +LDADD+= -llzma +CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. # It has no real relation to the libarchive version number. @@ -11,7 +19,6 @@ CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\" CFLAGS+= -I${.OBJDIR} -CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_OPENSSL ==== //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/archive_read_disk.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_read_disk.3,v 1.1 2009/04/12 05:04:02 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_read_disk.3,v 1.2 2010/05/19 08:57:53 uqs Exp $ .\" .Dd March 10, 2009 .Dt archive_read_disk 3 @@ -276,7 +276,7 @@ The .Nm libarchive library was written by -.An Tim Kientzle Aq kientzle@freebsd.org . +.An Tim Kientzle Aq kientzle@FreeBSD.org . .Sh BUGS The .Dq standard ==== //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/archive_read_open_fd.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_fd.c,v 1.16 2009/12/28 03:13:49 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_fd.c,v 1.17 2010/05/18 14:11:38 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -116,11 +116,15 @@ ssize_t bytes_read; *buff = mine->buffer; - bytes_read = read(mine->fd, mine->buffer, mine->block_size); - if (bytes_read < 0) { - archive_set_error(a, errno, "Error reading fd %d", mine->fd); + for (;;) { + bytes_read = read(mine->fd, mine->buffer, mine->block_size); + if (bytes_read < 0) { + if (errno == EINTR) + continue; + archive_set_error(a, errno, "Error reading fd %d", mine->fd); + } + return (bytes_read); } - return (bytes_read); } #if ARCHIVE_API_VERSION < 2 ==== //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/archive_read_open_filename.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.26 2009/12/28 02:28:44 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.27 2010/05/18 14:11:38 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -160,15 +160,19 @@ ssize_t bytes_read; *buff = mine->buffer; - bytes_read = read(mine->fd, mine->buffer, mine->block_size); - if (bytes_read < 0) { - if (mine->filename[0] == '\0') - archive_set_error(a, errno, "Error reading stdin"); - else - archive_set_error(a, errno, "Error reading '%s'", - mine->filename); + for (;;) { + bytes_read = read(mine->fd, mine->buffer, mine->block_size); + if (bytes_read < 0) { + if (errno == EINTR) + continue; + else if (mine->filename[0] == '\0') + archive_set_error(a, errno, "Error reading stdin"); + else + archive_set_error(a, errno, "Error reading '%s'", + mine->filename); + } + return (bytes_read); } - return (bytes_read); } #if ARCHIVE_API_VERSION < 2 ==== //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/config_freebsd.h#3 (text+ko) ==== @@ -22,7 +22,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/lib/libarchive/config_freebsd.h,v 1.25 2009/12/28 02:01:42 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/config_freebsd.h,v 1.26 2010/05/16 20:43:17 kientzle Exp $ */ /* FreeBSD 5.0 and later have ACL and extattr support. */ @@ -52,7 +52,6 @@ #endif #define HAVE_BSDXML_H 1 -#define HAVE_BZLIB_H 1 #define HAVE_CHFLAGS 1 #define HAVE_CHOWN 1 #define HAVE_DECL_INT64_MAX 1 ==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/isgreater.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2003 David Schultz +.\" Copyright (c) 2003 David Schultz .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/isgreater.3,v 1.3 2005/02/06 03:23:31 das Exp $ +.\" $FreeBSD: src/lib/libc/gen/isgreater.3,v 1.4 2010/05/19 08:57:53 uqs Exp $ .\" .Dd February 12, 2003 .Dt ISGREATER 3 ==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/sem_timedwait.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2008, David Xu +.\" Copyright (c) 2008, David Xu .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -32,7 +32,7 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_timedwait.3,v 1.4 2008/03/13 10:26:17 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_timedwait.3,v 1.5 2010/05/19 08:57:53 uqs Exp $ .\" .Dd March 3, 2008 .Dt SEM_TIMEDWAIT 3 ==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/setproctitle.3#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 1995 Peter Wemm +.\" Copyright (c) 1995 Peter Wemm .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -17,7 +17,7 @@ .\" 5. Modifications may be freely made to this file providing the above .\" conditions are met. .\" -.\" $FreeBSD: src/lib/libc/gen/setproctitle.3,v 1.26 2010/04/14 19:08:06 uqs Exp $ +.\" $FreeBSD: src/lib/libc/gen/setproctitle.3,v 1.27 2010/05/19 08:57:53 uqs Exp $ .\" .\" The following requests are required for all man pages. .Dd December 16, 1995 ==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/tcgetsid.3#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2008 David Xu +.\" Copyright (c) 2008 David Xu .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/tcgetsid.3,v 1.2 2009/05/07 13:49:48 ed Exp $ +.\" $FreeBSD: src/lib/libc/gen/tcgetsid.3,v 1.3 2010/05/19 08:57:53 uqs Exp $ .\" .Dd April 15, 2008 .Dt TCGETSID 3 ==== //depot/projects/soc2009/pgj_libstat/src/lib/libftpio/ftpio.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 1996 Jordan Hubbard (jkh@FreeBSD.org) +.\" Copyright (c) 1996 Jordan Hubbard .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libftpio/ftpio.3,v 1.35 2005/02/13 23:45:47 ru Exp $ +.\" $FreeBSD: src/lib/libftpio/ftpio.3,v 1.36 2010/05/19 08:57:53 uqs Exp $ .\" .Dd June 17, 1996 .Dt FTPIO 3 ==== //depot/projects/soc2009/pgj_libstat/src/lib/libmagic/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libmagic/Makefile,v 1.14 2010/01/02 09:58:07 ed Exp $ +# $FreeBSD: src/lib/libmagic/Makefile,v 1.15 2010/05/20 09:00:11 marius Exp $ # Copyright (c) David E. O'Brien, 2000-2004 CONTRDIR= ${.CURDIR}/../../contrib/file @@ -20,7 +20,7 @@ CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${CONTRDIR} -WARNS?= 1 +WARNS?= 3 CLEANFILES+= magic magic.mgc ==== //depot/projects/soc2009/pgj_libstat/src/lib/libmagic/config.h#3 (text+ko) ==== @@ -1,18 +1,18 @@ -/* $FreeBSD: src/lib/libmagic/config.h,v 1.9 2009/05/04 00:37:44 obrien Exp $ */ +/* $FreeBSD: src/lib/libmagic/config.h,v 1.10 2010/05/20 08:56:50 marius Exp $ */ /* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ -/* Use the builtin ELF recognition code */ +/* Define in built-in ELF support is used */ #define BUILTIN_ELF 1 -/* Recognize ELF core files */ +/* Define for ELF core file support */ #define ELFCORE 1 /* Define to 1 if you have the `asprintf' function. */ #define HAVE_ASPRINTF 1 -/* */ +/* HAVE_DAYLIGHT */ /* #undef HAVE_DAYLIGHT */ /* Define to 1 if you have the header file. */ @@ -51,9 +51,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_LOCALE_H 1 -/* */ -#define HAVE_LONG_LONG 1 - /* Define to 1 if you have the `mbrtowc' function. */ #define HAVE_MBRTOWC 1 @@ -69,9 +66,6 @@ /* Define to 1 if you have the `mmap' function. */ #define HAVE_MMAP 1 -/* Define to 1 if you have the `snprintf' function. */ -#define HAVE_SNPRINTF 1 - /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -102,13 +96,12 @@ /* Define to 1 if you have the `strtoul' function. */ #define HAVE_STRTOUL 1 +/* HAVE_STRUCT_OPTION */ +#define HAVE_STRUCT_OPTION 1 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 22 23:04:10 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10FD41065677; Sat, 22 May 2010 23:04:10 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9D8F1065673 for ; Sat, 22 May 2010 23:04:09 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B87748FC19 for ; Sat, 22 May 2010 23:04:09 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4MN49Mf020974 for ; Sat, 22 May 2010 23:04:09 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4MN49L9020972 for perforce@freebsd.org; Sat, 22 May 2010 23:04:09 GMT (envelope-from gcooper@FreeBSD.org) Date: Sat, 22 May 2010 23:04:09 GMT Message-Id: <201005222304.o4MN49L9020972@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178627 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 May 2010 23:04:10 -0000 http://p4web.freebsd.org/@@178627?ac=10 Change 178627 by gcooper@gcooper-bayonetta on 2010/05/22 23:03:54 Get rid of AutoAnswer. It's another wonderful unused global var. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/global.c#2 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#11 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/global.c#2 (text+ko) ==== @@ -28,5 +28,4 @@ Boolean Quiet = FALSE; Boolean Fake = FALSE; Boolean Force = FALSE; -int AutoAnswer = FALSE; int Verbose = 0; /* Allow multiple levels of verbose. */ ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#11 (text+ko) ==== @@ -230,7 +230,6 @@ extern Boolean Quiet; extern Boolean Fake; extern Boolean Force; -extern int AutoAnswer; extern int Verbose; #endif /* _INST_LIB_LIB_H_ */ From owner-p4-projects@FreeBSD.ORG Sat May 22 23:06:12 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CD0B1065674; Sat, 22 May 2010 23:06:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60D60106566C for ; Sat, 22 May 2010 23:06:12 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4EA8C8FC0C for ; Sat, 22 May 2010 23:06:12 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4MN6BUR021158 for ; Sat, 22 May 2010 23:06:11 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4MN6BjI021156 for perforce@freebsd.org; Sat, 22 May 2010 23:06:11 GMT (envelope-from gcooper@FreeBSD.org) Date: Sat, 22 May 2010 23:06:11 GMT Message-Id: <201005222306.o4MN6BjI021156@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178628 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 May 2010 23:06:12 -0000 http://p4web.freebsd.org/@@178628?ac=10 Change 178628 by gcooper@gcooper-bayonetta on 2010/05/22 23:05:58 Get rid of pkg_create -N and -Y ; they were unused options. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/main.c#10 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/pkg_create.1#2 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/main.c#10 (text+ko) ==== @@ -110,14 +110,6 @@ MatchType = MATCH_EXACT; break; - case 'N': - AutoAnswer = NO; - break; - - case 'Y': - AutoAnswer = YES; - break; - case 'O': PlistOnly = TRUE; break; ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/pkg_create.1#2 (text+ko) ==== @@ -31,7 +31,7 @@ .Nd a utility for creating software package distributions .Sh SYNOPSIS .Nm -.Op Fl YNOhjnvyz +.Op Fl Ohjnvyz .Op Fl C Ar conflicts .Op Fl P Ar pkgs .Op Fl p Ar prefix @@ -52,7 +52,7 @@ .Fl f Ar packlist .Ar pkg-filename .Nm -.Op Fl EGYNRhnvxy +.Op Fl EGRhnvxy .Fl b Ar pkg-name .Op Ar pkg-filename .Sh DESCRIPTION @@ -103,10 +103,6 @@ or, if preceded by .Cm - , the argument itself. -.It Fl Y , -yes -Assume a default answer of `Yes' for any questions asked. -.It Fl N , -no -Assume a default answer of `No' for any questions asked. .It Fl O , -plist-only Go into a `packing list Only' mode. This is a custom hack for the