From owner-p4-projects@FreeBSD.ORG Sun Sep 20 10:26:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DDBA106568B; Sun, 20 Sep 2009 10:26: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 AC990106566B for ; Sun, 20 Sep 2009 10:26:13 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 915178FC0C for ; Sun, 20 Sep 2009 10:26: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 n8KAQDkg037103 for ; Sun, 20 Sep 2009 10:26:13 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8KAQDfn037101 for perforce@freebsd.org; Sun, 20 Sep 2009 10:26:13 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 20 Sep 2009 10:26:13 GMT Message-Id: <200909201026.n8KAQDfn037101@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 168699 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: Sun, 20 Sep 2009 10:26:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=168699 Change 168699 by hselasky@hselasky_laptop001 on 2009/09/20 10:25:40 USB serial: - complete umct driver conversion into using new usbdi.h. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/umct.c#16 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/umct.c#16 (text+ko) ==== @@ -115,6 +115,7 @@ uint8_t sc_lcr; uint8_t sc_mcr; uint8_t sc_iface_no; + uint8_t sc_swap_cb; uint8_t sc_name[16]; }; @@ -125,8 +126,10 @@ static device_detach_t umct_detach; static usb_callback_t umct_intr_callback; +static usb_callback_t umct_intr_callback_sub; +static usb_callback_t umct_read_callback; +static usb_callback_t umct_read_callback_sub; static usb_callback_t umct_write_callback; -static usb_callback_t umct_read_callback; static void umct_cfg_do_request(struct umct_softc *sc, uint8_t request, uint16_t len, uint32_t value); @@ -238,7 +241,7 @@ struct usb_attach_arg *uaa = device_get_ivars(dev); struct umct_softc *sc = device_get_softc(dev); int32_t error; - //uint16_t maxp; + uint16_t maxp; uint8_t iface_index; sc->sc_udev = uaa->device; @@ -261,13 +264,13 @@ "transfers failed!\n"); goto detach; } + /* * The real bulk-in endpoint is also marked as an interrupt. * The only way to differentiate it from the real interrupt * endpoint is to look at the wMaxPacketSize field. */ -#ifdef XXX - maxp = UGETW(sc->sc_xfer[UMCT_BULK_DT_RD]->endpoint->edesc->wMaxPacketSize); + maxp = usbd_xfer_max_framelen(sc->sc_xfer[UMCT_BULK_DT_RD]); if (maxp == 0x2) { /* guessed wrong - switch around endpoints */ @@ -276,11 +279,9 @@ sc->sc_xfer[UMCT_INTR_DT_RD] = sc->sc_xfer[UMCT_BULK_DT_RD]; sc->sc_xfer[UMCT_BULK_DT_RD] = temp; + sc->sc_swap_cb = 1; + } - sc->sc_xfer[UMCT_BULK_DT_RD]->callback = &umct_read_callback; - sc->sc_xfer[UMCT_INTR_DT_RD]->callback = &umct_intr_callback; - } -#endif sc->sc_obufsize = usbd_xfer_max_len(sc->sc_xfer[UMCT_BULK_DT_WR]); if (uaa->info.idProduct == USB_PRODUCT_MCT_SITECOM_USB232) { @@ -340,7 +341,7 @@ } static void -umct_intr_callback(struct usb_xfer *xfer, usb_error_t error) +umct_intr_callback_sub(struct usb_xfer *xfer, usb_error_t error) { struct umct_softc *sc = usbd_xfer_softc(xfer); struct usb_page_cache *pc; @@ -545,6 +546,28 @@ } static void +umct_read_callback(struct usb_xfer *xfer, usb_error_t error) +{ + struct umct_softc *sc = usbd_xfer_softc(xfer); + + if (sc->sc_swap_cb) + umct_intr_callback_sub(xfer, error); + else + umct_read_callback_sub(xfer, error); +} + +static void +umct_intr_callback(struct usb_xfer *xfer, usb_error_t error) +{ + struct umct_softc *sc = usbd_xfer_softc(xfer); + + if (sc->sc_swap_cb) + umct_read_callback_sub(xfer, error); + else + umct_intr_callback_sub(xfer, error); +} + +static void umct_write_callback(struct usb_xfer *xfer, usb_error_t error) { struct umct_softc *sc = usbd_xfer_softc(xfer); @@ -575,7 +598,7 @@ } static void -umct_read_callback(struct usb_xfer *xfer, usb_error_t error) +umct_read_callback_sub(struct usb_xfer *xfer, usb_error_t error) { struct umct_softc *sc = usbd_xfer_softc(xfer); struct usb_page_cache *pc; From owner-p4-projects@FreeBSD.ORG Sun Sep 20 11:02:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 346D11065670; Sun, 20 Sep 2009 11:02: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 ED3AE106566B for ; Sun, 20 Sep 2009 11:02:53 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C25268FC15 for ; Sun, 20 Sep 2009 11:02:53 +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 n8KB2rfL039659 for ; Sun, 20 Sep 2009 11:02:53 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8KB2rIF039657 for perforce@freebsd.org; Sun, 20 Sep 2009 11:02:53 GMT (envelope-from gabor@freebsd.org) Date: Sun, 20 Sep 2009 11:02:53 GMT Message-Id: <200909201102.n8KB2rIF039657@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 168701 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: Sun, 20 Sep 2009 11:02:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=168701 Change 168701 by gabor@gabor_server on 2009/09/20 11:02:44 - Try to make -f more GNU compatible Affected files ... .. //depot/projects/soc2008/gabor_textproc/newsort/coll.c#5 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/newsort/coll.c#5 (text+ko) ==== @@ -34,6 +34,8 @@ #include "sort.h" +#define MAX(a, b) (((#a) > (#b)) ? (#a) : (#b)) + static wchar_t **months; static inline int _wcscoll(const wchar_t *, const wchar_t *); @@ -168,6 +170,9 @@ return (_wcscoll(s1, s2)); } +/* + * Inline wrapper for wcscoll() and wcscasecoll(). + */ static inline int _wcscoll(const wchar_t *s1, const wchar_t *s2) { @@ -175,27 +180,52 @@ } /* + * Collating single wide characters in a non case-sensitive way. + */ +static int +wccasecoll(const wint_t c1, const wint_t c2) { + + if (iswpunct(c1) && !iswpunct(c2)) + return (-1); + else if (!iswpunct(c1) && iswpunct(c2)) + return (1); + + if (iswupper(c1) && !iswupper(c2)) + return (1); + else if (!iswupper(c1) && iswupper(c2)) + return (-1); + else { + wchar_t *s1, *s2; + + s1 = sort_malloc(2 * sizeof(wint_t)); + s2 = sort_malloc(2 * sizeof(wint_t)); + + s1[0] = towlower(c1); + s1[1] = L'\0'; + + s2[0] = towlower(c2); + s2[1] = L'\0'; + + return (wcscoll(s1, s2)); + } +} + +/* * A case insensitive version of wcscoll(). */ static int wcscasecoll(const wchar_t *s1, const wchar_t *s2) { - int len1, len2, i; - wchar_t *ss1, *ss2; + int len1, len2, len; len1 = wcslen(s1); len2 = wcslen(s2); + len = MAX(len1, len2); - ss1 = sort_malloc(sizeof(wint_t) * (len1 + 1)); - ss2 = sort_malloc(sizeof(wint_t) * (len2 + 1)); + for (int i = 0; i < len; i++) + if (wccasecoll(s1[i], s2[i]) != 0) + return (wccasecoll(s1[i], s2[i])); - for (i = 0; i < len1; i++) - ss1[i]= towlower(s1[i]); - ss1[i + 1] = L'\0'; - for (i = 0; i < len2; i++) - ss2[i]= towlower(s2[i]); - ss2[i + 1] = L'\0'; - - return (wcscoll(ss1, ss2)); + return (len1 > len2 ? -1 : (len2 > len1 ? 1 : 0)); } #define NUMCHECK_COMMON(a, b) \ From owner-p4-projects@FreeBSD.ORG Sun Sep 20 13:20:25 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2FFD1065672; Sun, 20 Sep 2009 13:20: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 9EDC91065670 for ; Sun, 20 Sep 2009 13:20:24 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8C77A8FC15 for ; Sun, 20 Sep 2009 13:20: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 n8KDKOtO063113 for ; Sun, 20 Sep 2009 13:20:24 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8KDKOLr063111 for perforce@freebsd.org; Sun, 20 Sep 2009 13:20:24 GMT (envelope-from gk@FreeBSD.org) Date: Sun, 20 Sep 2009 13:20:24 GMT Message-Id: <200909201320.n8KDKOLr063111@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Cc: Subject: PERFORCE change 168707 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: Sun, 20 Sep 2009 13:20:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=168707 Change 168707 by gk@gk_h1 on 2009/09/20 13:19:49 * use aes-128 in cbc mode to encrypt file names * don't use algorithm id and keysize during key generation, because file names are always encrypted with the same algorithm * load pefs kld if needed Affected files ... .. //depot/projects/soc2009/gk_pefs/sbin/pefs/Makefile#3 edit .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#7 edit .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.h#7 edit .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_key.c#6 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_crypto.c#11 edit Differences ... ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/Makefile#3 (text+ko) ==== @@ -16,7 +16,7 @@ WARNS?= 6 DEBUG_FLAGS+= -g -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +DPADD= ${LIBCRYPTO} ${LIBUTIL} +LDADD= -lcrypto -lutil .include ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#7 (text+ko) ==== @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include @@ -42,6 +43,7 @@ #include #include #include +#include #include @@ -776,6 +778,15 @@ exit(EX_USAGE); } +static void +pefs_kld_load(void) +{ + if (modfind(PEFS_KLD) < 0) + if (kld_load(PEFS_KLD) < 0 || modfind(PEFS_KLD) < 0) + errx(EX_OSERR, "cannot find or load \"%s\" kernel module", + PEFS_KLD); +} + int main(int argc, char *argv[]) { @@ -787,6 +798,7 @@ prog = argv[0]; if (strstr(prog, "mount_pefs")) { + pefs_kld_load(); return (pefs_mount_prog(argc, argv)); } @@ -799,6 +811,7 @@ argv += 2; optind = 0; optreset = 1; + pefs_kld_load(); return (cmd->func(argc, argv)); } } ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.h#7 (text+ko) ==== @@ -27,6 +27,7 @@ */ #define PEFS_FSTYPE "pefs" +#define PEFS_KLD PEFS_FSTYPE #define PEFS_ALG_DEFAULT PEFS_ALG_AES_CTR #define PEFS_ALG_DEFAULT_KEYBITS 256 ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_key.c#6 (text+ko) ==== @@ -122,11 +122,6 @@ g_eli_crypto_hmac_init(&ctx, NULL, 0); - i = htole32(xk->pxk_alg); - g_eli_crypto_hmac_update(&ctx, (void *)&i, sizeof(uint32_t)); - i = htole32(xk->pxk_keybits); - g_eli_crypto_hmac_update(&ctx, (void *)&i, sizeof(uint32_t)); - if (kp->kp_keyfile != NULL && kp->kp_keyfile[0] == '\0') kp->kp_keyfile = NULL; if (kp->kp_keyfile == NULL && kp->kp_nopassphrase) { ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_crypto.c#11 (text+ko) ==== @@ -47,7 +47,7 @@ #include #define PEFS_CTR_BLOCK_SIZE 16 -#define PEFS_CSUM_BLOCK_SIZE 16 +#define PEFS_NAME_BLOCK_SIZE 16 #define PEFS_BLOCK_ROUND(block, a) (((a) + (block) - 1) & ~((block) - 1)) CTASSERT(PEFS_KEY_SIZE <= SHA512_DIGEST_LENGTH); @@ -114,10 +114,6 @@ pefs_camellia_crypt }; -static const char magic_tweak_name[PEFS_TWEAK_SIZE] = { - 0x5c, 0x83, 0xcb, 0x96, 0x2f, 0xaf, 0x3b, 0xb5, -}; - /* vmac requirement: first bit of the nonce buffer n must be 0 */ static const char magic_name_csum_nonce[VMAC_NHBYTES] = { 0x00, 0xb1, 0xad, 0xd5, 0x5b, 0xf9, 0x10, 0xe1, @@ -209,7 +205,7 @@ pefs_hmac_update(&ctx->o.pctx_hmac, magic_ctxinfo_name_key, PEFS_TWEAK_SIZE); pefs_hmac_update(&ctx->o.pctx_hmac, &idx, sizeof(idx)); pefs_hmac_final(&ctx->o.pctx_hmac, key, PEFS_KEY_SIZE); - pk->pk_alg->pa_keysetup(pk->pk_name_ctx, key, pk->pk_keybits); + pefs_aes_keysetup(pk->pk_name_ctx, key, 128); idx = 3; pefs_hmac_init(&ctx->o.pctx_hmac, masterkey, PEFS_KEY_SIZE); @@ -432,36 +428,49 @@ pefs_data_encrypt(ctx, ptk, offset, pc); } +/* + * File name layout: [checksum] [tweak] [name] + * File name is padded with zeros to 16 byte boundary + */ static inline size_t -pefs_name_checksum_psize(size_t namelen) +pefs_name_padsize(size_t size) { size_t psize; - MPASS(namelen > PEFS_NAME_CSUM_SIZE && namelen < MAXNAMLEN + 1); - psize = namelen - PEFS_NAME_CSUM_SIZE; + MPASS(size > PEFS_NAME_CSUM_SIZE && size <= MAXNAMLEN); + psize = size - PEFS_NAME_CSUM_SIZE; psize = PEFS_NAME_CSUM_SIZE + - PEFS_BLOCK_ROUND(PEFS_CSUM_BLOCK_SIZE, psize); + PEFS_BLOCK_ROUND(PEFS_NAME_BLOCK_SIZE, psize); return (psize); } -/* - * File name layout: [checksum] [tweak] [name] - */ -static inline void -pefs_name_checksum(struct pefs_ctx *ctx, struct pefs_key *pk, char *csum, - char *name, size_t size, size_t maxsize) +static inline size_t +pefs_name_pad(char *name, size_t size, size_t maxsize) { - CTASSERT(PEFS_NAME_CSUM_SIZE <= sizeof(uint64_t)); - uint64_t csum_int; size_t psize; - psize = pefs_name_checksum_psize(size); + psize = pefs_name_padsize(size); + MPASS(psize <= MAXNAMLEN); if (psize != size) { if (maxsize < psize) - panic("pefs_name_checksum: buffer is too small"); + panic("pefs_name_pad: buffer is too small"); bzero(name + size, psize - size); } + + return (psize); +} + +static inline void +pefs_name_checksum(struct pefs_ctx *ctx, struct pefs_key *pk, char *csum, + char *name, size_t size) +{ + CTASSERT(PEFS_NAME_CSUM_SIZE <= sizeof(uint64_t)); + uint64_t csum_int; + + MPASS(size > PEFS_NAME_CSUM_SIZE && + size <= MAXNAMLEN && + (size - PEFS_NAME_CSUM_SIZE) % PEFS_NAME_BLOCK_SIZE == 0); pefs_ctx_cpy(ctx, pk->pk_name_csum_ctx); csum_int = vmac(name + PEFS_NAME_CSUM_SIZE, @@ -471,13 +480,64 @@ memcpy(csum, &csum_int, PEFS_NAME_CSUM_SIZE); } +static inline void +pefs_name_enccbc(struct pefs_ctx *ctx, struct pefs_key *pk, + u_char *data, ssize_t size) +{ + u_char *prev; + int i; + + size -= PEFS_NAME_CSUM_SIZE; + data += PEFS_NAME_CSUM_SIZE; + MPASS(size > 0 && size % PEFS_NAME_BLOCK_SIZE == 0); + + pefs_ctx_cpy(ctx, pk->pk_name_ctx); + + /* Start with zero iv */ + while (1) { + rijndael_encrypt(&ctx->o.pctx_aes, data, data); + prev = data; + data += PEFS_NAME_BLOCK_SIZE; + size -= PEFS_NAME_BLOCK_SIZE; + if (size == 0) + break; + for (i = 0; i < PEFS_NAME_BLOCK_SIZE; i++) + data[i] ^= prev[i]; + } +} + +static inline void +pefs_name_deccbc(struct pefs_ctx *ctx, struct pefs_key *pk, + u_char *data, ssize_t size) +{ + u_char tmp[PEFS_NAME_BLOCK_SIZE], iv[PEFS_NAME_BLOCK_SIZE]; + int i; + + size -= PEFS_NAME_CSUM_SIZE; + data += PEFS_NAME_CSUM_SIZE; + MPASS(size > 0 && size % PEFS_NAME_BLOCK_SIZE == 0); + + pefs_ctx_cpy(ctx, pk->pk_name_ctx); + + bzero(iv, PEFS_NAME_BLOCK_SIZE); + while (size > 0) { + memcpy(tmp, data, PEFS_NAME_BLOCK_SIZE); + rijndael_decrypt(&ctx->o.pctx_aes, data, data); + for (i = 0; i < PEFS_NAME_BLOCK_SIZE; i++) + data[i] ^= iv[i]; + memcpy(iv, tmp, PEFS_NAME_BLOCK_SIZE); + data += PEFS_NAME_BLOCK_SIZE; + size -= PEFS_NAME_BLOCK_SIZE; + } +} + int -pefs_name_encrypt(struct pefs_ctx *ctx, struct pefs_tkey *ptk, const char *plain, size_t plain_len, char *enc, size_t enc_size) +pefs_name_encrypt(struct pefs_ctx *ctx, struct pefs_tkey *ptk, + const char *plain, size_t plain_len, char *enc, size_t enc_size) { - CTASSERT(MAXNAMLEN >= PEFS_NAME_PTON_SIZE(MAXNAMLEN) + PEFS_CSUM_BLOCK_SIZE); - const struct pefs_alg *alg; + CTASSERT(MAXNAMLEN >= + PEFS_NAME_PTON_SIZE(MAXNAMLEN) + PEFS_NAME_BLOCK_SIZE); char buf[MAXNAMLEN + 1]; - char *buf_name, *buf_tweak; size_t size; int free_ctx = 0; int r; @@ -485,15 +545,15 @@ KASSERT(ptk != NULL && ptk->ptk_key != NULL, ("pefs_name_encrypt: key is null")); - alg = ptk->ptk_key->pk_alg; - - size = PEFS_TWEAK_SIZE + plain_len + PEFS_NAME_CSUM_SIZE; - if (PEFS_NAME_NTOP_SIZE(size) + 1 > MAXNAMLEN) { + size = PEFS_NAME_CSUM_SIZE + PEFS_TWEAK_SIZE + plain_len; + /* Resulting name size, count '.' prepended to name */ + r = PEFS_NAME_NTOP_SIZE(pefs_name_padsize(size)) + 1; + if (r > MAXNAMLEN) { return (-ENAMETOOLONG); } - if (enc_size < PEFS_NAME_NTOP_SIZE(size) + 1) { - printf("pefs: name encryption buffer is too small: length %ld, required %ld\n", - enc_size, PEFS_NAME_NTOP_SIZE(size)); + if (enc_size < r) { + printf("pefs: name encryption buffer is too small: length %ld, required %d\n", + enc_size, r); return (-EOVERFLOW); } @@ -502,17 +562,13 @@ free_ctx = 1; } - buf_tweak = buf + PEFS_NAME_CSUM_SIZE; - buf_name = buf + PEFS_NAME_CSUM_SIZE + PEFS_TWEAK_SIZE; - memcpy(buf_tweak, ptk->ptk_tweak, PEFS_TWEAK_SIZE); - memcpy(buf_name, plain, plain_len); + memcpy(buf + PEFS_NAME_CSUM_SIZE, ptk->ptk_tweak, PEFS_TWEAK_SIZE); + memcpy(buf + PEFS_NAME_CSUM_SIZE + PEFS_TWEAK_SIZE, plain, plain_len); - pefs_ctx_cpy(ctx, ptk->ptk_key->pk_name_ctx); - alg->pa_ivsetup(ctx, magic_tweak_name, 0); - alg->pa_crypt(ctx, buf_tweak, buf_tweak, size - PEFS_NAME_CSUM_SIZE); + size = pefs_name_pad(buf, size, sizeof(buf)); + pefs_name_enccbc(ctx, ptk->ptk_key, buf, size); + pefs_name_checksum(ctx, ptk->ptk_key, buf, buf, size); - pefs_name_checksum(ctx, ptk->ptk_key, buf, buf, size, sizeof(buf)); - if (free_ctx) pefs_ctx_free(ctx); @@ -526,36 +582,38 @@ } int -pefs_name_decrypt(struct pefs_ctx *ctx, struct pefs_key *pk, struct pefs_tkey *ptk, const char *enc, size_t enc_len, char *plain, size_t plain_size) +pefs_name_decrypt(struct pefs_ctx *ctx, struct pefs_key *pk, + struct pefs_tkey *ptk, const char *enc, size_t enc_len, + char *plain, size_t plain_size) { - const struct pefs_alg *alg; struct pefs_key *ki; char csum[PEFS_NAME_CSUM_SIZE]; - char *plain_tweak; int free_ctx = 0; int r, ki_rev; KASSERT(enc != plain, ("pefs_name_decrypt: ciphertext and plaintext buffers should differ")); + MPASS(enc_len > 0 && enc_len <= MAXNAMLEN); - alg = pk->pk_alg; - - if (enc[0] != '.') + if (enc[0] != '.' || enc_len <= 1) return (-EINVAL); enc++; enc_len--; - if (PEFS_NAME_PTON_SIZE(enc_len) <= PEFS_TWEAK_SIZE + PEFS_NAME_CSUM_SIZE) + + r = PEFS_NAME_PTON_SIZE(enc_len); + if (r <= PEFS_TWEAK_SIZE + PEFS_NAME_CSUM_SIZE || + (r - PEFS_NAME_CSUM_SIZE) % PEFS_NAME_BLOCK_SIZE != 0) return (-EINVAL); + if (plain_size < r) { + printf("pefs: name decryption buffer is too small: length %ld, required %d\n", + plain_size, r); + return (-EOVERFLOW); + } + r = pefs_name_pton(enc, enc_len, plain, plain_size); if (r <= 0) { PEFSDEBUG("pefs_name_decrypt: error: r=%d\n", r); return (-EINVAL); } - if (plain_size < pefs_name_checksum_psize(r)) { - printf("pefs: name decryption buffer is too small: length %ld, required %ld\n", - plain_size, pefs_name_checksum_psize(r)); - return (-EOVERFLOW); - } - plain_tweak = plain + PEFS_NAME_CSUM_SIZE; if (ctx == NULL) { ctx = pefs_ctx_get(); @@ -565,7 +623,7 @@ ki = pk; ki_rev = 0; do { - pefs_name_checksum(ctx, ki, csum, plain, r, plain_size); + pefs_name_checksum(ctx, ki, csum, plain, r); if (memcmp(csum, plain, PEFS_NAME_CSUM_SIZE) == 0) break; @@ -585,20 +643,23 @@ pefs_ctx_free(ctx); if (ki == NULL) - return (-1); + return (-EINVAL); - pefs_ctx_cpy(ctx, ki->pk_name_ctx); - alg->pa_ivsetup(ctx, magic_tweak_name, 0); - alg->pa_crypt(ctx, plain_tweak, plain_tweak, r - PEFS_NAME_CSUM_SIZE); + pefs_name_deccbc(ctx, ki, plain, r); if (ptk) { ptk->ptk_key = ki; - memcpy(ptk->ptk_tweak, plain_tweak, PEFS_TWEAK_SIZE); + memcpy(ptk->ptk_tweak, plain + PEFS_NAME_CSUM_SIZE, + PEFS_TWEAK_SIZE); } r -= PEFS_TWEAK_SIZE + PEFS_NAME_CSUM_SIZE; memcpy(plain, plain + PEFS_NAME_CSUM_SIZE + PEFS_TWEAK_SIZE, r); plain[r] = '\0'; + /* Remove encryption zero padding */ + while (r > 0 && plain[r - 1] == '\0') + r--; + MPASS(r > 0 && strlen(plain) == r); return (r); } From owner-p4-projects@FreeBSD.ORG Sun Sep 20 19:32:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5BA51065679; Sun, 20 Sep 2009 19:32:11 +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 91E861065672 for ; Sun, 20 Sep 2009 19:32:11 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 76F2C8FC14 for ; Sun, 20 Sep 2009 19:32: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 n8KJWBBm008126 for ; Sun, 20 Sep 2009 19:32:11 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8KJWBUC008124 for perforce@freebsd.org; Sun, 20 Sep 2009 19:32:11 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 20 Sep 2009 19:32:11 GMT Message-Id: <200909201932.n8KJWBUC008124@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 Cc: Subject: PERFORCE change 168719 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: Sun, 20 Sep 2009 19:32:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=168719 Change 168719 by pgj@beehive on 2009/09/20 19:31:33 IFC Affected files ... .. //depot/projects/docproj_hu/doc/share/sgml/mirrors.xml#10 integrate .. //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/hardware/article.sgml#7 integrate .. //depot/projects/docproj_hu/www/en/platforms/sparc.sgml#5 integrate Differences ... ==== //depot/projects/docproj_hu/doc/share/sgml/mirrors.xml#10 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.84 2009/09/19 08:47:17 erwin Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.85 2009/09/20 13:25:06 erwin Exp $ @@ -47,6 +47,8 @@ ftp4.FreeBSD.org ftp://ftp4.FreeBSD.org/pub/FreeBSD/ + http://ftp4.FreeBSD.org/pub/FreeBSD/ + http://ftp4.FreeBSD.org/pub/FreeBSD/ @@ -2213,6 +2215,8 @@ ftp4.us.FreeBSD.org ftp://ftp4.us.FreeBSD.org/pub/FreeBSD/ + http://ftp4.us.FreeBSD.org/pub/FreeBSD/ + http://ftp4.us.FreeBSD.org/pub/FreeBSD/ ==== //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/hardware/article.sgml#7 (text+ko) ==== @@ -18,7 +18,7 @@ The &os; Documentation Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.326.2.8 2009/04/26 07:58:00 blackend Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.326.2.9 2009/09/20 12:19:21 marius Exp $ 2000 @@ -699,6 +699,8 @@ &hwlist.bge; + &hwlist.cas; + &hwlist.cdce; [&arch.amd64;, &arch.i386;] Crystal Semiconductor CS89x0-based NICs ==== //depot/projects/docproj_hu/www/en/platforms/sparc.sgml#5 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -97,9 +97,12 @@
  • Blade 1000
  • Blade 1500
  • Blade 2000
    • +
  • Blade 2500
  • Fire 280R
  • Fire V210
    • -
  • Fire V440 (except for the on-board NICs)
    • +
  • Fire V250
    • +
  • Fire V440 (support for the on-board NICs first appeared in + 8.0-RELEASE)
  • Fire V880
  • Netra 20/Netra T4
    • From owner-p4-projects@FreeBSD.ORG Sun Sep 20 19:43:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A8E0106568B; Sun, 20 Sep 2009 19: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 1EE881065672 for ; Sun, 20 Sep 2009 19:43:24 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0E9C38FC0A for ; Sun, 20 Sep 2009 19: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 n8KJhNDs009017 for ; Sun, 20 Sep 2009 19:43:23 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8KJhNGW009015 for perforce@freebsd.org; Sun, 20 Sep 2009 19:43:23 GMT (envelope-from gabor@freebsd.org) Date: Sun, 20 Sep 2009 19:43:23 GMT Message-Id: <200909201943.n8KJhNGW009015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 168722 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: Sun, 20 Sep 2009 19:43:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=168722 Change 168722 by gabor@gabor_server on 2009/09/20 19:42:57 - My macro skills have failed... Let's fix this. Affected files ... .. //depot/projects/soc2008/gabor_textproc/newsort/coll.c#6 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/newsort/coll.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ #include "sort.h" -#define MAX(a, b) (((#a) > (#b)) ? (#a) : (#b)) +#define MAX(a, b) (((a) > (b)) ? (a) : (b)) static wchar_t **months; @@ -231,12 +231,12 @@ #define NUMCHECK_COMMON(a, b) \ double d1, d2; \ errno = 0; \ - d1 = wcstod(#a, &ep1); \ + d1 = wcstod(a, &ep1); \ \ if ((errno == ERANGE) && (d1 == HUGE_VAL)) \ return (1); \ \ - d2 = wcstod(#b, &ep2); \ + d2 = wcstod(b, &ep2); \ \ if ((errno == ERANGE) && (d2 == HUGE_VAL)) \ return (-1); From owner-p4-projects@FreeBSD.ORG Sun Sep 20 19:45:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 131D9106568D; Sun, 20 Sep 2009 19:45: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 B3978106566B for ; Sun, 20 Sep 2009 19:45:26 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 984E68FC14 for ; Sun, 20 Sep 2009 19:45: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 n8KJjQMH009200 for ; Sun, 20 Sep 2009 19:45:26 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8KJjQvG009198 for perforce@freebsd.org; Sun, 20 Sep 2009 19:45:26 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 20 Sep 2009 19:45:26 GMT Message-Id: <200909201945.n8KJjQvG009198@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 Cc: Subject: PERFORCE change 168723 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: Sun, 20 Sep 2009 19:45:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=168723 Change 168723 by pgj@beehive on 2009/09/20 19:45:11 MFen (doc): 1.128 -> 1.129 hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml 1.464 -> 1.467 hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml 1.116 -> 1.118 hu_HU.ISO8859-2/share/sgml/freebsd.ent Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml#12 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#32 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#23 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml#12 (text+ko) ==== @@ -6,7 +6,7 @@ @@ -1151,19 +1151,12 @@ Ellenõrizzük a /etc/X11/xorg.conf állományban a "Files" - szakaszt. Az alábbi sorokat mindegyik más + szakaszt. Az alábbi sort mindegyik más FontPath bejegyzés elõtt kell szerepeltetnünk: - FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/misc" -FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/75dpi" -FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/100dpi" - - Ha nagy felbontású - megjelenítést használunk, - cseréljük meg a 75 és a 100 dpi-s - sorokat. + FontPath "/usr/X11R6/lib/X11/fonts/cyrillic" A portok között találhatunk ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#32 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.464 + %SRCID% 1.467 --> @@ -3069,6 +3069,15 @@ + RELENG_8 + + + A FreeBSD-8.X fejlesztési ága, más + néven a FreeBSD 8-STABLE + + + + RELENG_7 ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#23 (text+ko) ==== @@ -12,7 +12,7 @@ @@ -110,10 +110,13 @@
  • Blade 1000
  • Blade 1500
  • Blade 2000
    • +
  • Blade 2500
  • Fire 280R
  • Fire V210
    • -
  • Fire V440 (kivéve az integrált - hálózati kártyák)
    • +
  • Fire V250
    • +
  • Fire V440 (az integrált hálózati + kártyák támogatása megjelent a + 8.0-RELEASE kiadásban)
  • Fire V880
  • Netra 20/Netra T4
    • From owner-p4-projects@FreeBSD.ORG Mon Sep 21 19:02:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1225D1065670; Mon, 21 Sep 2009 19:02:57 +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 B2A66106566B for ; Mon, 21 Sep 2009 19:02:56 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A31F68FC18 for ; Mon, 21 Sep 2009 19:02:56 +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 n8LJ2uXX000831 for ; Mon, 21 Sep 2009 19:02:56 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8LJ2ukv000829 for perforce@freebsd.org; Mon, 21 Sep 2009 19:02:56 GMT (envelope-from anchie@FreeBSD.org) Date: Mon, 21 Sep 2009 19:02:56 GMT Message-Id: <200909211902.n8LJ2ukv000829@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 Cc: Subject: PERFORCE change 168754 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: Mon, 21 Sep 2009 19:02:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=168754 Change 168754 by anchie@anchie_malimis on 2009/09/21 19:02:34 Minor in changes in script that produces x509v2 certificate chain with RFC3779 extension for IP Addresses. Affected files ... .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/gen_ipext#2 edit Differences ... ==== //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/gen_ipext#2 (text+ko) ==== @@ -42,23 +42,28 @@ # with the prefix definitions below, and the names of the subdirectories # containing the keying material. -ids="lvl1 ar1" +ids="lvl1" +#ids="lvl1 ar1" #ids="ar2" #ids="ar3" +#ids="router1" # For each ID in the list above, you must create a list of prefixes this # ID will be able to route. -pfxs_ca="prefix 2003::/64; - prefix 2004::/64; - prefix 2005::/64;" -pfxs_lvl1="prefix 2003::/64; - prefix 2004::/64;" -pfxs_ar1="prefix 2003::/64;" -pfxs_ar2="prefix 2004::/64;" -pfxs_ar3="prefix 2005::/64;" +pfxs_ca="prefix 2000::/64;" +pfxs_lvl1="prefix 2000::/64;" +#pfxs_ar1="prefix 2000::/64;" + # prefix 2004::/64; + # prefix 2005::/64;" +#pfxs_lvl1="prefix 2003::/64; + #prefix 2004::/64;" +#pfxs_ar1="prefix 2003::/64;" +#pfxs_ar2="prefix 2004::/64;" +#pfxs_ar3="prefix 2005::/64;" # Where does CA.pl live on your system -CA=/usr/ssl/misc/CA.pl +#CA=/usr/ssl/misc/CA.pl +CA=/usr/home/anchie/p4/send_kernel_compile/crypto/openssl/apps/CA.pl # RSA key size rsa_bits=1024 @@ -79,6 +84,7 @@ } mk_ca() { + echo "----------------> mk_ca()" rm -f demoCA mkdir -p demoCA.$1/private ln -s demoCA.$1 demoCA @@ -119,23 +125,34 @@ add_files_section() { echo "files {" >> $2 for id in $ids; do - [ "$id" != "$1" ] && fname="trustedcert" || fname="certfile" + echo "$id" + test $id != $1 && fname="trustedcert" || fname="certfile" echo " $fname `pwd`/$id/cert_ipext.pem;" >> $2 - [ "$id" == "$1" ] && break + test $id = $1 && break done echo "}" >> $2 } gen_conf_file() { # Generate a config file for adding IP extensions - pfxs=pfxs_${1} + #pfxs=pfxs_${1} + echo "addresses {" > $1/ipext_add.conf echo " ipv6 {" >> $1/ipext_add.conf echo " SAFI unicast;" >> $1/ipext_add.conf - echo " ${!pfxs}" >> $1/ipext_add.conf + if test $1 = "ca" + then + echo " " $pfxs_ca >> $1/ipext_add.conf + fi + if test $1 = "lvl1" + then + echo " " $pfxs_lvl1 >> $1/ipext_add.conf + fi + + #echo " " $pfxs_ca >> $1/ipext_add.conf echo " }" >> $1/ipext_add.conf echo "}" >> $1/ipext_add.conf - + echo "files {" >> $1/ipext_add.conf echo " certfile $1/cert.pem;" >> $1/ipext_add.conf echo " cacert $2/cert.pem;" >> $1/ipext_add.conf @@ -157,11 +174,20 @@ } verify_ipexts() { - pfxs=pfxs_${1} + #pfxs=pfxs_${1} + echo "addresses {" > ipext_verify.conf echo " ipv6 {" >> ipext_verify.conf echo " SAFI unicast;" >> ipext_verify.conf - echo " ${!pfxs}" >> ipext_verify.conf + if test $1 = "ca" + then + echo " " $pfxs_ca >> $1/ipext_add.conf + fi + if test $1 = "lvl1" + then + echo " " $pfxs_lvl1 >> $1/ipext_add.conf + fi + #echo " ${!pfxs}" >> ipext_verify.conf echo " }" >> ipext_verify.conf echo "}" >> ipext_verify.conf @@ -178,19 +204,22 @@ add_ipext $id done + /usr/sbin/ipexttool -w -i ca/ipext_add.conf + /usr/sbin/ipexttool -w -i lvl1/ipext_add.conf + verify_ipexts $id } case "$1" in chain) - if [ $# == 1 ]; then + if [ $# -eq 1 ]; then mk_top_ca generate_certs ids="ca $ids" gen_conf_files add_ipexts else - if [ $# != 3 ]; then + if [ $# -ne 3 ]; then echo $"Usage: $0 chain " exit 1 fi @@ -204,11 +233,11 @@ ;; ipext) ids="ca $ids" - if [ $# == 1 ]; then + if [ $# -eq 1 ]; then gen_conf_files add_ipexts else - if [ $# != 3 ]; then + if [ $# -ne 3 ]; then echo $"Usage: $0 ipext " exit 1 fi From owner-p4-projects@FreeBSD.ORG Mon Sep 21 20:26:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA30610656A3; Mon, 21 Sep 2009 20:26:28 +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 AECFF1065696 for ; Mon, 21 Sep 2009 20:26:28 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9CDBF8FC15 for ; Mon, 21 Sep 2009 20: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 n8LKQSUA009135 for ; Mon, 21 Sep 2009 20:26:28 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8LKQSXw009133 for perforce@freebsd.org; Mon, 21 Sep 2009 20:26:28 GMT (envelope-from trasz@freebsd.org) Date: Mon, 21 Sep 2009 20:26:28 GMT Message-Id: <200909212026.n8LKQSXw009133@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 168759 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: Mon, 21 Sep 2009 20:26:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=168759 Change 168759 by trasz@trasz_victim on 2009/09/21 20:25:32 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#41 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/sh.1#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.subr#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/groff/tmac/mdoc.local#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/patch/common.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/patch/pch.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/Makefile.inc#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/Symbol.map#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/getpagesizes.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/getpagesizes.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/regex/engine.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/regex/grot/tests#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/kqueue.2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/setfib.2#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/stack_protector.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libdevinfo/devinfo.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libdisk/change.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libjail/jail.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/Makefile#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/hardware/article.sgml#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/nop/gnop.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ipfw/ipfw.8#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mksnap_ffs/mksnap_ffs.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.8#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_nfs/mount_nfs.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/savecore/savecore.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/scsi_target/scsi_target.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/acpi_panasonic.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/rc.conf.5#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/fail.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_amrr.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_beacon.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_bmiss.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_crypto.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_ddb.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_input.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_node.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_output.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_proto.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_radiotap.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_regdomain.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_scan.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/ieee80211_vap.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/misc/bsd-family-tree#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/misc/iso3166#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/timedef/hi_IN.ISCII-DEV.src#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/pmap.c#23 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/trap.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/NOTES#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/param.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/param.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_xpt.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_target.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/vfs.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#40 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#50 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.amd64#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/newvers.sh#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#34 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/x86emu/x86emu.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/x86emu/x86emu_util.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpi_support/acpi_ibm.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/amdtemp/amdtemp.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/asmc/asmc.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ciss/ciss.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ciss/cissreg.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ciss/cissvar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dpms/dpms.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/s3_pci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/vesa.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/isp.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/isp_stds.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/isp_tpublic.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/kbd/kbd.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mwl/if_mwl.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/if_mxge.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/if_mxge_var.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/syscons.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/x86bios/x86bios.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/x86bios/x86bios.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/x86bios/x86bios_alloc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/NOTES#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/pmap.c#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/trap.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/param.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/param.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_event.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_mib.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sched_ule.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_devstat.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_smp.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_socket.c#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_syscalls.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/include/param.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#32 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/x86bios/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/x86emu/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if.c#29 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_llatbl.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_var.h#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.c#25 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#23 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_mcast.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.c#26 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_proto.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/raw_ip.c#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_asconf.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_bsd_addr.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_input.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_os_bsd.h#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_output.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_pcb.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_pcb.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_structs.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_sysctl.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_timer.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_usrreq.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctputil.c#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_subr.c#26 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_timer.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_usrreq.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_var.h#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#27 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/sctp6_usrreq.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/key.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vfsops.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pci/intpm.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/param.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/param.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/include/param.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/bus.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/event.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/kbio.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/mman.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/smp.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/systm.h#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#33 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_mmap.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/multitest.t#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1.10#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1.11#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1.12#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1.13#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1.14#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1.15#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1.16#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1.17#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1.18#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1.2#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1.4.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1.5#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1.6#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1.7#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1.9#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/100_9.10#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/101_9.11#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/102_9.12#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/103_9.13#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/104_9.14#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/105_9.15#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/106_9.16#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/107_9.17#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/108_9.18#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/109_9.19#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/10_1.9#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/110_9.20#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/111_9.21#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/112_9.22#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/113_9.23#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/114_9.24#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/115_9.25#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/116_9.26#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/117_9.27#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/118_9.28#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/119_9.29#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/11_1.10#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/120_9.30#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/121_9.31#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/12_1.11#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/13_1.12#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/14_1.13#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/15_1.14#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/16_1.15#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/17_1.16#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/18_1.17#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/19_1.18#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/1_1.1#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.10#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.11#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.12#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.13#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.14#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.15#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.16#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.17#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.18#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.19#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.2#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.20#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.21#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.22#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.5#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.6#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.7#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2.9#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/20_2.1#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/21_2.2#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/22_2.3#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/23_2.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/24_2.5#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/25_2.6#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/26_2.7#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/27_2.8#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/28_2.9#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/29_2.10#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/2_1.2#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/3.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/3.2#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/3.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/3.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/30_2.11#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/31_2.12#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/32_2.13#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/33_2.14#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/34_2.15#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/35_2.16#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/36_2.17#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/37_2.18#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/38_2.19#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/39_2.20#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/3_1.3#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/4.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/4.2#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/4.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/4.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/4.5#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/4.6#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/4.7#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/4.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/40_2.21#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/40_3.1#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/41_2.22#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/41_3.2#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/42_3.3#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/43_3.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/44_4.1#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/45_4.2#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/46_4.3#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/47_4.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/48_4.5#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/49_4.6#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/4_1.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/5.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/5.2#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/5.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/5.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/5.5#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/5.6#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/5.7#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/5.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/50_4.7#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/51_4.8#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/52_5.1#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/53_5.2#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/54_5.3#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/55_5.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/56_5.5#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/57_5.6#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/58_5.7#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/59_5.8#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/5_1.4.1#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/6.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/6.2#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/6.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/6.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/6.5#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/6.6#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/60_6.1#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/61_6.2#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/62_6.3#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/63_6.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/64_6.5#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/65_6.6#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/66_7.1#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/67_7.2#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/68_7.3#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/69_7.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/6_1.5#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/7.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/7.2#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/7.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/7.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/7.5#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/7.6#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/7.7#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/7.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/70_7.5#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/71_7.6#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/72_7.7#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/73_7.8#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/74_8.1#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/75_8.2#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/76_8.3#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/77_8.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/78_8.5#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/79_8.6#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/7_1.6#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.10#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.11#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.12#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.13#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.14#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.15#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.16#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.17#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.18#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.19#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.2#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.20#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.21#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.22#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.23#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.5#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.6#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.7#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8.9#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/80_8.7#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/81_8.8#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/82_8.9#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/83_8.10#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/84_8.11#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/85_8.12#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/86_8.13#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/87_8.14#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/88_8.15#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/89_8.16#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/8_1.7#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.10#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.11#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.12#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.13#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.14#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.15#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.16#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.17#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.18#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.19#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.2#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.20#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.21#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.22#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.23#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.24#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.25#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.26#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.27#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.28#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.29#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.30#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.31#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.5#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.6#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.7#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9.9#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/90_8.17#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/91_9.1#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/92_9.2#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/93_9.3#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/94_9.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/95_9.5#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/96_9.6#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/97_9.7#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/98_9.8#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/99_9.9#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/9_1.8#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/find/find.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/inet.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/netstat.1#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/sed/compile.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/crashinfo/crashinfo.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/kbdcontrol/kbdcontrol.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/kbdcontrol/kbdmap.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/menus.c#11 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#41 (text+ko) ==== @@ -22,6 +22,10 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090910: + ZFS snapshots are now mounted with MNT_IGNORE flag. Use -v option for + mount(8) and -a option for df(1) to see them. + 20090825: The old tunable hw.bus.devctl_disable has been superseded by hw.bus.devctl_queue. hw.bus.devctl_disable=1 in loader.conf should be @@ -971,4 +975,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.638 2009/09/05 08:09:35 imp Exp $ +$FreeBSD: src/UPDATING,v 1.639 2009/09/14 21:10:40 pjd Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/sh.1#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.130 2009/06/24 22:04:04 jilles Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.131 2009/09/20 21:42:38 jilles Exp $ .\" .Dd May 31, 2009 .Dt SH 1 @@ -375,6 +375,10 @@ The word starting with .Ql # and the rest of the line are ignored. +.Pp +.Tn ASCII +.Dv NUL +characters (character code 0) are not allowed in shell input. .Ss Quoting Quoting is used to remove the special meaning of certain characters or words to the shell, such as operators, whitespace, keywords, ==== //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#20 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.360 2009/09/12 22:22:31 hrs Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.361 2009/09/17 19:05:47 dougb Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -23,6 +23,7 @@ rc_debug="NO" # Set to YES to enable debugging output from rc.d rc_info="NO" # Enables display of informational messages at boot. +rc_startmsgs="NO" # Show "Starting foo:" messages at boot rcshutdown_timeout="30" # Seconds to wait before terminating rc.shutdown early_late_divider="FILESYSTEMS" # Script that separates early/late # stages of the boot process. Make sure you know ==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.subr#6 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.89 2009/09/12 22:19:48 hrs Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.90 2009/09/17 19:05:47 dougb Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -708,7 +708,13 @@ # setup the full command to run # - [ -z "${rc_quiet}" ] && echo "Starting ${name}." + _show_startmsgs=1 + if [ -n "${rc_quiet}" ]; then + if ! checkyesno rc_startmsgs; then + unset _show_startmsgs + fi + fi + [ -n "$_show_startmsgs" ] && echo "Starting ${name}." if [ -n "$_chroot" ]; then _doit="\ ${_nice:+nice -n $_nice }\ ==== //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/groff/tmac/mdoc.local#7 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.69 2009/08/22 23:44:37 kensmith Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.70 2009/09/21 17:19:36 alc Exp $ .\" .\" %beginstrip% . @@ -72,6 +72,8 @@ .ds doc-operating-system-FreeBSD-6.3 6.3 .ds doc-operating-system-FreeBSD-6.4 6.4 .ds doc-operating-system-FreeBSD-7.1 7.1 +.ds doc-operating-system-FreeBSD-7.2 7.2 +.ds doc-operating-system-FreeBSD-7.3 7.3 .ds doc-operating-system-FreeBSD-8.0 8.0 .ds doc-operating-system-FreeBSD-9.0 9.0 . ==== //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/patch/common.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/patch/common.h,v 1.10 2009/05/08 02:18:46 sepotvin Exp $ +/* $FreeBSD: src/gnu/usr.bin/patch/common.h,v 1.11 2009/09/16 19:53:29 sepotvin Exp $ * * $Log: common.h,v $ * Revision 2.0.1.2 88/06/22 20:44:53 lwall @@ -34,6 +34,7 @@ #define Strcpy (void)strcpy #define Strcat (void)strcat #define Strlcpy (void)strlcpy +#define Strncpy (void)strncpy #define Strlcat (void)strlcat /* NeXT declares malloc and realloc incompatibly from us in some of ==== //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/patch/pch.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/patch/pch.c,v 1.22 2009/08/23 12:23:24 ed Exp $ +/* $FreeBSD: src/gnu/usr.bin/patch/pch.c,v 1.23 2009/09/16 19:53:29 sepotvin Exp $ * * $Log: pch.c,v $ * Revision 2.0.2.0 90/05/01 22:17:51 davison @@ -1176,7 +1176,8 @@ indent++; } } - Strlcpy(buf, line, len + 1 - skipped); + Strncpy(buf, line, len - skipped); + buf[len - skipped] = '\0'; } return len; } ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/Makefile.inc#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.144 2009/07/13 12:53:43 trasz Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.145 2009/09/19 18:01:32 alc Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -15,7 +15,7 @@ getbootfile.c getbsize.c \ getcap.c getcwd.c getdomainname.c getgrent.c getgrouplist.c \ gethostname.c getloadavg.c getlogin.c getmntinfo.c getnetgrent.c \ - getosreldate.c getpagesize.c \ + getosreldate.c getpagesize.c getpagesizes.c \ getpeereid.c getprogname.c getpwent.c getttyent.c \ getusershell.c getvfsbyname.c glob.c \ initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \ @@ -51,8 +51,8 @@ getbootfile.3 getbsize.3 getcap.3 getcontext.3 getcwd.3 \ getdiskbyname.3 getdomainname.3 getfsent.3 \ getgrent.3 getgrouplist.3 gethostname.3 getloadavg.3 \ - getmntinfo.3 getnetgrent.3 getosreldate.3 \ - getpagesize.3 getpass.3 getpeereid.3 getprogname.3 getpwent.3 \ + getmntinfo.3 getnetgrent.3 getosreldate.3 getpagesize.3 \ + getpagesizes.3 getpass.3 getpeereid.3 getprogname.3 getpwent.3 \ getttyent.3 getusershell.3 getvfsbyname.3 \ glob.3 initgroups.3 isgreater.3 ldexp.3 lockf.3 makecontext.3 \ modf.3 \ ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/Symbol.map#10 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.21 2009/06/24 21:10:52 jhb Exp $ + * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.22 2009/09/19 18:01:32 alc Exp $ */ FBSD_1.0 { @@ -366,6 +366,10 @@ tcsetsid; }; +FBSD_1.2 { + getpagesizes; +}; + FBSDprivate_1.0 { /* needed by thread libraries */ __thr_jtable; ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/regex/engine.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/regex/engine.c,v 1.21 2007/05/25 12:44:58 delphij Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/regex/engine.c,v 1.23 2009/09/16 06:32:23 dds Exp $"); /* * The matching engine and friends. This file is #included by regexec.c @@ -247,6 +247,8 @@ if (g->moffset > -1) start = ((dp - g->moffset) < start) ? start : dp - g->moffset; + SP("mloop", m->st, *start); + /* this loop does only one repetition except for backrefs */ for (;;) { endp = fast(m, start, stop, gf, gl); @@ -787,6 +789,7 @@ CLEAR(st); SET1(st, startst); + SP("fast", st, *p); st = step(m->g, startst, stopst, st, NOTHING, st); ASSIGN(fresh, st); SP("start", st, *p); @@ -1072,7 +1075,7 @@ OP(s = g->strip[pc+look]) != O_CH; look += OPND(s)) assert(OP(s) == OOR2); - FWD(aft, aft, look); + FWD(aft, aft, look + 1); } break; case OOR2: /* propagate OCH_'s marking */ ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/regex/grot/tests#2 (text+ko) ==== @@ -1,5 +1,5 @@ # regular expression test set -# $FreeBSD: src/lib/libc/regex/grot/tests,v 1.3 2007/03/05 09:44:41 delphij Exp $ +# $FreeBSD: src/lib/libc/regex/grot/tests,v 1.4 2009/09/15 21:15:29 dds Exp $ # Lines are at least three fields, separated by one or more tabs. "" stands # for an empty field. First field is an RE. Second field is flags. If # C flag given, regcomp() is expected to fail, and the third field is the @@ -472,3 +472,6 @@ abcdefghijklmnopqrstuv i abcdefghijklmnopqrstuv abcdefghijklmnopqrstuv (ALAK)|(ALT[AB])|(CC[123]1)|(CM[123]1)|(GAMC)|(LC[23][EO ])|(SEM[1234])|(SL[ES][12])|(SLWW)|(SLF )|(SLDT)|(VWH[12])|(WH[34][EW])|(WP1[ESN]) - CC11 CC11 CC[13]1|a{21}[23][EO][123][Es][12]a{15}aa[34][EW]aaaaaaa[X]a - CC11 CC11 +# PR 130504 +(.|())(b) - ab ab +(()|.)(b) - ab ab ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/kqueue.2#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.46 2007/09/07 13:10:09 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.49 2009/09/16 03:49:54 sson Exp $ .\" -.Dd September 6, 2007 +.Dd September 15, 2009 .Dt KQUEUE 2 .Os .Sh NAME @@ -201,11 +201,25 @@ .Fn kevent will not return it. The filter itself is not disabled. +.It EV_DISPATCH +Disable the event source immediately after delivery of an event. +See +.Dv EV_DISABLE +above. .It EV_DELETE Removes the event from the kqueue. Events which are attached to file descriptors are automatically deleted on the last close of the descriptor. +.It EV_RECEIPT +This flag is useful for making bulk changes to a kqueue without draining +any pending events. +When passed as input, it forces +.Dv EV_ERROR +to always be returned. +When a filter is successfully added the +.Va data +field will be zero. .It EV_ONESHOT Causes the event to return only the first occurrence of the filter being triggered. @@ -441,6 +455,44 @@ On return, .Va fflags contains the events which triggered the filter. +.It Dv EVFILT_USER +Establishes a user event identified by +.Va ident +which is not assosicated with any kernel mechanism but is triggered by +user level code. +The lower 24 bits of the +.Va fflags +may be used for user defined flags and manipulated using the following: +.Bl -tag -width XXNOTE_FFLAGSMASK +.It Dv NOTE_FFNOP +Ignore the input +.Va fflags . +.It Dv NOTE_FFAND +Bitwise AND +.Va fflags . +.It Dv NOTE_FFOR +Bitwise OR +.Va fflags . +.It Dv NOTE_COPY +Copy +.Va fflags . +.It Dv NOTE_FFCTRLMASK +Control mask for +.Va fflags . +.It Dv NOTE_FFLAGSMASK +User defined flag mask for +.Va fflags . +.El +.Pp +A user event is triggered for output with the following: +.Bl -tag -width XXNOTE_FFLAGSMASK +.It Dv NOTE_TRIGGER +Cause the event to be triggered. +.El +.Pp +On return, +.Va fflags +contains the users defined flags in the lower 24 bits. .El .Sh RETURN VALUES The ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/setfib.2#5 (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/libc/sys/setfib.2,v 1.5 2009/04/23 08:37:56 brueffer Exp $ +.\" $FreeBSD: src/lib/libc/sys/setfib.2,v 1.6 2009/09/18 14:17:00 brueffer Exp $ .\" .Dd August 8, 2008 .Dt SETFIB 2 @@ -67,8 +67,8 @@ .Fa fib argument is greater than the current system maximum. .Sh SEE ALSO -.Xr setsockopt 2 , -.Xr setfib 8 +.Xr setfib 1 , +.Xr setsockopt 2 .Sh STANDARDS The .Fn setfib ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/stack_protector.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.5 2009/07/14 21:19:13 kan Exp $ */ +/* $FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.6 2009/09/17 13:21:53 kan Exp $ */ /* $NetBSD: stack_protector.c,v 1.4 2006/11/22 17:23:25 christos Exp $ */ /* $OpenBSD: stack_protector.c,v 1.10 2006/03/31 05:34:44 deraadt Exp $ */ /* @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.5 2009/07/14 21:19:13 kan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.6 2009/09/17 13:21:53 kan Exp $"); #include #include @@ -108,4 +108,8 @@ __fail("buffer overflow detected; terminated"); } +#ifdef PIC __sym_compat(__stack_chk_fail_local, __stack_chk_fail, FBSD_1.0); +#else +__weak_reference(__stack_chk_fail, __stack_chk_fail_local); +#endif ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libdevinfo/devinfo.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libdevinfo/devinfo.h,v 1.5 2005/08/31 14:57:39 rodrigc Exp $ + * $FreeBSD: src/lib/libdevinfo/devinfo.h,v 1.6 2009/09/15 16:59:52 attilio Exp $ */ #ifndef _DEVINFO_H_INCLUDED @@ -41,10 +41,10 @@ */ /* XXX not sure if I want a copy here, or expose sys/bus.h */ typedef enum devinfo_state { - DIS_NOTPRESENT, /* not probed or probe failed */ - DIS_ALIVE, /* probe succeeded */ - DIS_ATTACHED, /* attach method called */ - DIS_BUSY /* device is open */ + DIS_NOTPRESENT = 10, /* not probed or probe failed */ + DIS_ALIVE = 20, /* probe succeeded */ + DIS_ATTACHED = 30, /* attach method called */ + DIS_BUSY = 40 /* device is open */ } devinfo_state_t; struct devinfo_dev { ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libdisk/change.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/change.c,v 1.29 2009/06/17 06:47:05 lulf Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/change.c,v 1.31 2009/09/21 04:04:02 nyan Exp $"); #include #include @@ -36,17 +36,22 @@ if (disk->bios_cyl >= 65536) sane = 0; - if (disk->bios_hd > 256) +#ifdef PC98 + if (disk->bios_hd >= 256) sane = 0; -#ifdef PC98 if (disk->bios_sect >= 256) + sane = 0; #else + if (disk->bios_hd > 256) + sane = 0; if (disk->bios_sect > 63) + sane = 0; #endif - sane = 0; +#if 0 /* Disable a check on a disk size. It's too strict. */ if (disk->bios_cyl * disk->bios_hd * disk->bios_sect != disk->chunks->size) sane = 0; +#endif if (sane) return; ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libjail/jail.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/libjail/jail.3,v 1.1 2009/06/24 18:18:35 jamie Exp $ +.\" $FreeBSD: src/lib/libjail/jail.3,v 1.2 2009/09/21 08:30:52 ru Exp $ .\" .Dd June 24, 2009 .Dt JAIL 3 @@ -39,7 +39,7 @@ .Nm jailparam_set , .Nm jailparam_get , .Nm jailparam_export , -.Nm jailparam_free , +.Nm jailparam_free .Nd create and manage system jails .Sh LIBRARY .Lb libjail @@ -89,14 +89,16 @@ The .Fn jail_getid function returns the JID of the jail identified by -.Ar name , +.Fa name , or \-1 if the jail does not exist. .Pp The .Fn jail_getname function returns the name of the jail identified by -.Ar jid , -or NULL if the jail does not exist. +.Fa jid , +or +.Dv NULL +if the jail does not exist. .Pp The .Fn jail_setv @@ -116,7 +118,7 @@ The .Fn jailparam_all function sets -.Ar jpp +.Fa jpp to a list of all known jail parameters, and returns the number of parameters. The list should later be freed with @@ -127,14 +129,15 @@ The .Fn jailparam_init function clears a parameter record and copies the -.Ar name -to it. After use, it should be freed with +.Fa name +to it. +After use, it should be freed with .Fn jailparam_free . .Pp The .Fn jailparam_import function adds a -.Ar value +.Fa value to a parameter record, converting it from a string to its native form. The .Fn jailparam_import_raw @@ -151,7 +154,7 @@ .Pp The .Fn jailparam_get -function function passes a list of parameters to +function passes a list of parameters to .Xr jail_get 2 . The parameters are assumed to have been created with .Fn jailparam_init @@ -163,7 +166,7 @@ The .Fn jailparam_export function returns the string equivalent of a parameter value. -The returned string should freed after use. +The returned string should be freed after use. .Pp The .Fn jailparam_free @@ -171,6 +174,43 @@ If the list itself came from .Fn jailparam_all , it should be freed as well. +.Sh RETURN VALUES +The +.Fn jail_getid , +.Fn jail_setv , +.Fn jail_getv , +.Fn jailparam_set +and +.Fn jailparam_get +functions return a JID on success, or \-1 on error. +.Pp +The +.Fn jail_getname +and +.Fn jailparam_export +functions return a dynamically allocated string on success, or +.Dv NULL +on error. +.Pp +The +.Fn jailparam_all +function returns the number of parameters on success, or \-1 on error. +.Pp +The +.Fn jailparam_init , +.Fn jailparam_import +and +.Fn jailparam_import_raw +functions return 0 on success, or \-1 on error. +.Pp +Whenever an error is returned, +.Va errno +is set, and the global string +.Va jail_errmsg +contains a description of the error, possibly from +.Xr jail_set 2 +or +.Xr jail_get 2 . .Sh EXAMPLES >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 21 20:26:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95C321065760; Mon, 21 Sep 2009 20: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 50E20106575E for ; Mon, 21 Sep 2009 20:26:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 294BC8FC16 for ; Mon, 21 Sep 2009 20:26: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 n8LKQTj4009140 for ; Mon, 21 Sep 2009 20:26:29 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8LKQSLH009138 for perforce@freebsd.org; Mon, 21 Sep 2009 20:26:28 GMT (envelope-from trasz@freebsd.org) Date: Mon, 21 Sep 2009 20:26:28 GMT Message-Id: <200909212026.n8LKQSLH009138@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 168760 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: Mon, 21 Sep 2009 20:26:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=168760 Change 168760 by trasz@trasz_victim on 2009/09/21 20:26:23 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/UPDATING#14 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/sh.1#5 integrate .. //depot/projects/soc2009/trasz_limits/etc/defaults/rc.conf#8 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.subr#4 integrate .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/patch/common.h#2 integrate .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/patch/pch.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/gen/getpagesizes.3#1 branch .. //depot/projects/soc2009/trasz_limits/lib/libc/gen/getpagesizes.c#1 branch .. //depot/projects/soc2009/trasz_limits/lib/libc/regex/engine.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/regex/grot/tests#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/kqueue.2#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/setfib.2#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/stack_protector.c#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libdevinfo/devinfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libdisk/change.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libjail/jail.3#2 integrate .. //depot/projects/soc2009/trasz_limits/release/Makefile#5 integrate .. //depot/projects/soc2009/trasz_limits/release/doc/en_US.ISO8859-1/hardware/article.sgml#4 integrate .. //depot/projects/soc2009/trasz_limits/sbin/geom/class/nop/gnop.8#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ipfw/ipfw.8#4 integrate .. //depot/projects/soc2009/trasz_limits/sbin/mksnap_ffs/mksnap_ffs.8#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/mount/mount.8#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/mount/mount.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/mount_nfs/mount_nfs.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sbin/savecore/savecore.8#2 integrate .. //depot/projects/soc2009/trasz_limits/share/examples/scsi_target/scsi_target.c#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/acpi_panasonic.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/fail.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211.9#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_amrr.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_beacon.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_bmiss.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_crypto.9#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_ddb.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_input.9#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_node.9#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_output.9#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_proto.9#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_radiotap.9#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_regdomain.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_scan.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_vap.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/misc/bsd-family-tree#3 integrate .. //depot/projects/soc2009/trasz_limits/share/misc/iso3166#2 integrate .. //depot/projects/soc2009/trasz_limits/share/timedef/hi_IN.ISCII-DEV.src#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/param.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/include/param.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/scsi/scsi_target.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.amd64#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.i386#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/newvers.sh#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/options#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/x86emu/x86emu.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/x86emu/x86emu_util.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpi_support/acpi_ibm.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/amdtemp/amdtemp.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/asmc/asmc.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ciss/cissreg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ciss/cissvar.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/dpms/dpms.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/fb/s3_pci.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/fb/vesa.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/isp/isp.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/isp/isp_stds.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/isp/isp_tpublic.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/kbd/kbd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mwl/if_mwl.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/x86bios/x86bios.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/x86bios/x86bios.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/x86bios/x86bios_alloc.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/i386/conf/NOTES#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/pmap.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/trap.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/param.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/include/param.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_event.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_mib.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sched_ule.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_devstat.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_smp.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_socket.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_syscalls.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/include/param.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/Makefile#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/x86bios/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/modules/x86emu/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/sys/net/if.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if_llatbl.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if_var.h#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/if_ether.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/in.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/in_mcast.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/in_pcb.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/in_proto.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/raw_ip.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_os_bsd.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_output.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_sysctl.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctputil.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_timer.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_usrreq.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_var.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/in6.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netipsec/key.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/pci/intpm.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/param.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/include/param.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/sun4v/include/param.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/bus.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/event.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/kbio.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/mman.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/smp.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/systm.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ufs/ufs_vnops.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_mmap.c#6 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/multitest.t#3 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1.1#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1.10#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1.11#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1.12#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1.13#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1.14#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1.15#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1.16#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1.17#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1.18#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1.2#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1.3#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1.4#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1.4.1#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1.5#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1.6#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1.7#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1.8#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1.9#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/100_9.10#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/101_9.11#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/102_9.12#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/103_9.13#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/104_9.14#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/105_9.15#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/106_9.16#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/107_9.17#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/108_9.18#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/109_9.19#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/10_1.9#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/110_9.20#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/111_9.21#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/112_9.22#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/113_9.23#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/114_9.24#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/115_9.25#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/116_9.26#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/117_9.27#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/118_9.28#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/119_9.29#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/11_1.10#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/120_9.30#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/121_9.31#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/12_1.11#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/13_1.12#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/14_1.13#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/15_1.14#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/16_1.15#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/17_1.16#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/18_1.17#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/19_1.18#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/1_1.1#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.1#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.10#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.11#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.12#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.13#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.14#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.15#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.16#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.17#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.18#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.19#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.2#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.20#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.21#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.22#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.3#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.4#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.5#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.6#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.7#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.8#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2.9#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/20_2.1#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/21_2.2#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/22_2.3#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/23_2.4#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/24_2.5#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/25_2.6#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/26_2.7#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/27_2.8#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/28_2.9#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/29_2.10#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/2_1.2#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/3.1#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/3.2#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/3.3#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/3.4#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/30_2.11#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/31_2.12#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/32_2.13#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/33_2.14#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/34_2.15#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/35_2.16#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/36_2.17#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/37_2.18#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/38_2.19#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/39_2.20#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/3_1.3#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/4.1#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/4.2#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/4.3#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/4.4#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/4.5#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/4.6#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/4.7#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/4.8#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/40_2.21#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/40_3.1#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/41_2.22#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/41_3.2#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/42_3.3#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/43_3.4#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/44_4.1#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/45_4.2#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/46_4.3#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/47_4.4#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/48_4.5#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/49_4.6#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/4_1.4#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/5.1#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/5.2#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/5.3#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/5.4#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/5.5#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/5.6#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/5.7#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/5.8#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/50_4.7#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/51_4.8#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/52_5.1#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/53_5.2#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/54_5.3#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/55_5.4#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/56_5.5#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/57_5.6#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/58_5.7#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/59_5.8#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/5_1.4.1#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/6.1#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/6.2#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/6.3#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/6.4#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/6.5#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/6.6#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/60_6.1#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/61_6.2#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/62_6.3#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/63_6.4#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/64_6.5#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/65_6.6#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/66_7.1#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/67_7.2#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/68_7.3#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/69_7.4#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/6_1.5#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/7.1#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/7.2#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/7.3#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/7.4#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/7.5#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/7.6#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/7.7#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/7.8#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/70_7.5#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/71_7.6#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/72_7.7#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/73_7.8#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/74_8.1#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/75_8.2#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/76_8.3#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/77_8.4#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/78_8.5#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/79_8.6#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/7_1.6#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.1#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.10#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.11#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.12#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.13#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.14#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.15#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.16#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.17#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.18#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.19#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.2#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.20#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.21#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.22#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.23#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.3#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.4#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.5#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.6#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.7#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.8#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8.9#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/80_8.7#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/81_8.8#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/82_8.9#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/83_8.10#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/84_8.11#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/85_8.12#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/86_8.13#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/87_8.14#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/88_8.15#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/89_8.16#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/8_1.7#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.1#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.10#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.11#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.12#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.13#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.14#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.15#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.16#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.17#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.18#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.19#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.2#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.20#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.21#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.22#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.23#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.24#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.25#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.26#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.27#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.28#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.29#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.3#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.30#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.31#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.4#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.5#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.6#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.7#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.8#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9.9#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/90_8.17#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/91_9.1#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/92_9.2#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/93_9.3#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/94_9.4#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/95_9.5#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/96_9.6#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/97_9.7#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/98_9.8#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/99_9.9#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/9_1.8#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/find/find.1#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/netstat/inet.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/netstat/netstat.1#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/sed/compile.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/crashinfo/crashinfo.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/kbdcontrol/kbdcontrol.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/kbdcontrol/kbdmap.5#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/sysinstall/menus.c#4 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/UPDATING#14 (text+ko) ==== @@ -22,6 +22,10 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090910: + ZFS snapshots are now mounted with MNT_IGNORE flag. Use -v option for + mount(8) and -a option for df(1) to see them. + 20090825: The old tunable hw.bus.devctl_disable has been superseded by hw.bus.devctl_queue. hw.bus.devctl_disable=1 in loader.conf should be @@ -971,4 +975,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.638 2009/09/05 08:09:35 imp Exp $ +$FreeBSD: src/UPDATING,v 1.639 2009/09/14 21:10:40 pjd Exp $ ==== //depot/projects/soc2009/trasz_limits/bin/sh/sh.1#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.130 2009/06/24 22:04:04 jilles Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.131 2009/09/20 21:42:38 jilles Exp $ .\" .Dd May 31, 2009 .Dt SH 1 @@ -375,6 +375,10 @@ The word starting with .Ql # and the rest of the line are ignored. +.Pp +.Tn ASCII +.Dv NUL +characters (character code 0) are not allowed in shell input. .Ss Quoting Quoting is used to remove the special meaning of certain characters or words to the shell, such as operators, whitespace, keywords, ==== //depot/projects/soc2009/trasz_limits/etc/defaults/rc.conf#8 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.360 2009/09/12 22:22:31 hrs Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.361 2009/09/17 19:05:47 dougb Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -23,6 +23,7 @@ rc_debug="NO" # Set to YES to enable debugging output from rc.d rc_info="NO" # Enables display of informational messages at boot. +rc_startmsgs="NO" # Show "Starting foo:" messages at boot rcshutdown_timeout="30" # Seconds to wait before terminating rc.shutdown early_late_divider="FILESYSTEMS" # Script that separates early/late # stages of the boot process. Make sure you know ==== //depot/projects/soc2009/trasz_limits/etc/rc.subr#4 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.89 2009/09/12 22:19:48 hrs Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.90 2009/09/17 19:05:47 dougb Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -708,7 +708,13 @@ # setup the full command to run # - [ -z "${rc_quiet}" ] && echo "Starting ${name}." + _show_startmsgs=1 + if [ -n "${rc_quiet}" ]; then + if ! checkyesno rc_startmsgs; then + unset _show_startmsgs + fi + fi + [ -n "$_show_startmsgs" ] && echo "Starting ${name}." if [ -n "$_chroot" ]; then _doit="\ ${_nice:+nice -n $_nice }\ ==== //depot/projects/soc2009/trasz_limits/gnu/usr.bin/groff/tmac/mdoc.local#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/gnu/usr.bin/groff/tmac/mdoc.local,v 1.69 2009/08/22 23:44:37 kensmith Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.70 2009/09/21 17:19:36 alc Exp $ .\" .\" %beginstrip% . @@ -72,6 +72,8 @@ .ds doc-operating-system-FreeBSD-6.3 6.3 .ds doc-operating-system-FreeBSD-6.4 6.4 .ds doc-operating-system-FreeBSD-7.1 7.1 +.ds doc-operating-system-FreeBSD-7.2 7.2 +.ds doc-operating-system-FreeBSD-7.3 7.3 .ds doc-operating-system-FreeBSD-8.0 8.0 .ds doc-operating-system-FreeBSD-9.0 9.0 . ==== //depot/projects/soc2009/trasz_limits/gnu/usr.bin/patch/common.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/patch/common.h,v 1.10 2009/05/08 02:18:46 sepotvin Exp $ +/* $FreeBSD: src/gnu/usr.bin/patch/common.h,v 1.11 2009/09/16 19:53:29 sepotvin Exp $ * * $Log: common.h,v $ * Revision 2.0.1.2 88/06/22 20:44:53 lwall @@ -34,6 +34,7 @@ #define Strcpy (void)strcpy #define Strcat (void)strcat #define Strlcpy (void)strlcpy +#define Strncpy (void)strncpy #define Strlcat (void)strlcat /* NeXT declares malloc and realloc incompatibly from us in some of ==== //depot/projects/soc2009/trasz_limits/gnu/usr.bin/patch/pch.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/patch/pch.c,v 1.22 2009/08/23 12:23:24 ed Exp $ +/* $FreeBSD: src/gnu/usr.bin/patch/pch.c,v 1.23 2009/09/16 19:53:29 sepotvin Exp $ * * $Log: pch.c,v $ * Revision 2.0.2.0 90/05/01 22:17:51 davison @@ -1176,7 +1176,8 @@ indent++; } } - Strlcpy(buf, line, len + 1 - skipped); + Strncpy(buf, line, len - skipped); + buf[len - skipped] = '\0'; } return len; } ==== //depot/projects/soc2009/trasz_limits/lib/libc/gen/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.144 2009/07/13 12:53:43 trasz Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.145 2009/09/19 18:01:32 alc Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -15,7 +15,7 @@ getbootfile.c getbsize.c \ getcap.c getcwd.c getdomainname.c getgrent.c getgrouplist.c \ gethostname.c getloadavg.c getlogin.c getmntinfo.c getnetgrent.c \ - getosreldate.c getpagesize.c \ + getosreldate.c getpagesize.c getpagesizes.c \ getpeereid.c getprogname.c getpwent.c getttyent.c \ getusershell.c getvfsbyname.c glob.c \ initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \ @@ -51,8 +51,8 @@ getbootfile.3 getbsize.3 getcap.3 getcontext.3 getcwd.3 \ getdiskbyname.3 getdomainname.3 getfsent.3 \ getgrent.3 getgrouplist.3 gethostname.3 getloadavg.3 \ - getmntinfo.3 getnetgrent.3 getosreldate.3 \ - getpagesize.3 getpass.3 getpeereid.3 getprogname.3 getpwent.3 \ + getmntinfo.3 getnetgrent.3 getosreldate.3 getpagesize.3 \ + getpagesizes.3 getpass.3 getpeereid.3 getprogname.3 getpwent.3 \ getttyent.3 getusershell.3 getvfsbyname.3 \ glob.3 initgroups.3 isgreater.3 ldexp.3 lockf.3 makecontext.3 \ modf.3 \ ==== //depot/projects/soc2009/trasz_limits/lib/libc/gen/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.21 2009/06/24 21:10:52 jhb Exp $ + * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.22 2009/09/19 18:01:32 alc Exp $ */ FBSD_1.0 { @@ -366,6 +366,10 @@ tcsetsid; }; +FBSD_1.2 { + getpagesizes; +}; + FBSDprivate_1.0 { /* needed by thread libraries */ __thr_jtable; ==== //depot/projects/soc2009/trasz_limits/lib/libc/regex/engine.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/regex/engine.c,v 1.21 2007/05/25 12:44:58 delphij Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/regex/engine.c,v 1.23 2009/09/16 06:32:23 dds Exp $"); /* * The matching engine and friends. This file is #included by regexec.c @@ -247,6 +247,8 @@ if (g->moffset > -1) start = ((dp - g->moffset) < start) ? start : dp - g->moffset; + SP("mloop", m->st, *start); + /* this loop does only one repetition except for backrefs */ for (;;) { endp = fast(m, start, stop, gf, gl); @@ -787,6 +789,7 @@ CLEAR(st); SET1(st, startst); + SP("fast", st, *p); st = step(m->g, startst, stopst, st, NOTHING, st); ASSIGN(fresh, st); SP("start", st, *p); @@ -1072,7 +1075,7 @@ OP(s = g->strip[pc+look]) != O_CH; look += OPND(s)) assert(OP(s) == OOR2); - FWD(aft, aft, look); + FWD(aft, aft, look + 1); } break; case OOR2: /* propagate OCH_'s marking */ ==== //depot/projects/soc2009/trasz_limits/lib/libc/regex/grot/tests#2 (text+ko) ==== @@ -1,5 +1,5 @@ # regular expression test set -# $FreeBSD: src/lib/libc/regex/grot/tests,v 1.3 2007/03/05 09:44:41 delphij Exp $ +# $FreeBSD: src/lib/libc/regex/grot/tests,v 1.4 2009/09/15 21:15:29 dds Exp $ # Lines are at least three fields, separated by one or more tabs. "" stands # for an empty field. First field is an RE. Second field is flags. If # C flag given, regcomp() is expected to fail, and the third field is the @@ -472,3 +472,6 @@ abcdefghijklmnopqrstuv i abcdefghijklmnopqrstuv abcdefghijklmnopqrstuv (ALAK)|(ALT[AB])|(CC[123]1)|(CM[123]1)|(GAMC)|(LC[23][EO ])|(SEM[1234])|(SL[ES][12])|(SLWW)|(SLF )|(SLDT)|(VWH[12])|(WH[34][EW])|(WP1[ESN]) - CC11 CC11 CC[13]1|a{21}[23][EO][123][Es][12]a{15}aa[34][EW]aaaaaaa[X]a - CC11 CC11 +# PR 130504 +(.|())(b) - ab ab +(()|.)(b) - ab ab ==== //depot/projects/soc2009/trasz_limits/lib/libc/sys/kqueue.2#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.46 2007/09/07 13:10:09 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.49 2009/09/16 03:49:54 sson Exp $ .\" -.Dd September 6, 2007 +.Dd September 15, 2009 .Dt KQUEUE 2 .Os .Sh NAME @@ -201,11 +201,25 @@ .Fn kevent will not return it. The filter itself is not disabled. +.It EV_DISPATCH +Disable the event source immediately after delivery of an event. +See +.Dv EV_DISABLE +above. .It EV_DELETE Removes the event from the kqueue. Events which are attached to file descriptors are automatically deleted on the last close of the descriptor. +.It EV_RECEIPT +This flag is useful for making bulk changes to a kqueue without draining +any pending events. +When passed as input, it forces +.Dv EV_ERROR +to always be returned. +When a filter is successfully added the +.Va data +field will be zero. .It EV_ONESHOT Causes the event to return only the first occurrence of the filter being triggered. @@ -441,6 +455,44 @@ On return, .Va fflags contains the events which triggered the filter. +.It Dv EVFILT_USER +Establishes a user event identified by +.Va ident +which is not assosicated with any kernel mechanism but is triggered by +user level code. +The lower 24 bits of the +.Va fflags +may be used for user defined flags and manipulated using the following: +.Bl -tag -width XXNOTE_FFLAGSMASK +.It Dv NOTE_FFNOP +Ignore the input +.Va fflags . +.It Dv NOTE_FFAND +Bitwise AND +.Va fflags . +.It Dv NOTE_FFOR +Bitwise OR +.Va fflags . +.It Dv NOTE_COPY +Copy +.Va fflags . +.It Dv NOTE_FFCTRLMASK +Control mask for +.Va fflags . +.It Dv NOTE_FFLAGSMASK +User defined flag mask for +.Va fflags . +.El +.Pp +A user event is triggered for output with the following: +.Bl -tag -width XXNOTE_FFLAGSMASK +.It Dv NOTE_TRIGGER +Cause the event to be triggered. +.El +.Pp +On return, +.Va fflags +contains the users defined flags in the lower 24 bits. .El .Sh RETURN VALUES The ==== //depot/projects/soc2009/trasz_limits/lib/libc/sys/setfib.2#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/libc/sys/setfib.2,v 1.5 2009/04/23 08:37:56 brueffer Exp $ +.\" $FreeBSD: src/lib/libc/sys/setfib.2,v 1.6 2009/09/18 14:17:00 brueffer Exp $ .\" .Dd August 8, 2008 .Dt SETFIB 2 @@ -67,8 +67,8 @@ .Fa fib argument is greater than the current system maximum. .Sh SEE ALSO -.Xr setsockopt 2 , -.Xr setfib 8 +.Xr setfib 1 , +.Xr setsockopt 2 .Sh STANDARDS The .Fn setfib ==== //depot/projects/soc2009/trasz_limits/lib/libc/sys/stack_protector.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.5 2009/07/14 21:19:13 kan Exp $ */ +/* $FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.6 2009/09/17 13:21:53 kan Exp $ */ /* $NetBSD: stack_protector.c,v 1.4 2006/11/22 17:23:25 christos Exp $ */ /* $OpenBSD: stack_protector.c,v 1.10 2006/03/31 05:34:44 deraadt Exp $ */ /* @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.5 2009/07/14 21:19:13 kan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.6 2009/09/17 13:21:53 kan Exp $"); #include #include @@ -108,4 +108,8 @@ __fail("buffer overflow detected; terminated"); } +#ifdef PIC __sym_compat(__stack_chk_fail_local, __stack_chk_fail, FBSD_1.0); +#else +__weak_reference(__stack_chk_fail, __stack_chk_fail_local); +#endif ==== //depot/projects/soc2009/trasz_limits/lib/libdevinfo/devinfo.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libdevinfo/devinfo.h,v 1.5 2005/08/31 14:57:39 rodrigc Exp $ + * $FreeBSD: src/lib/libdevinfo/devinfo.h,v 1.6 2009/09/15 16:59:52 attilio Exp $ */ #ifndef _DEVINFO_H_INCLUDED @@ -41,10 +41,10 @@ */ /* XXX not sure if I want a copy here, or expose sys/bus.h */ typedef enum devinfo_state { - DIS_NOTPRESENT, /* not probed or probe failed */ - DIS_ALIVE, /* probe succeeded */ - DIS_ATTACHED, /* attach method called */ - DIS_BUSY /* device is open */ + DIS_NOTPRESENT = 10, /* not probed or probe failed */ + DIS_ALIVE = 20, /* probe succeeded */ + DIS_ATTACHED = 30, /* attach method called */ + DIS_BUSY = 40 /* device is open */ } devinfo_state_t; struct devinfo_dev { ==== //depot/projects/soc2009/trasz_limits/lib/libdisk/change.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/change.c,v 1.29 2009/06/17 06:47:05 lulf Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/change.c,v 1.31 2009/09/21 04:04:02 nyan Exp $"); #include #include @@ -36,17 +36,22 @@ if (disk->bios_cyl >= 65536) sane = 0; - if (disk->bios_hd > 256) +#ifdef PC98 + if (disk->bios_hd >= 256) sane = 0; -#ifdef PC98 if (disk->bios_sect >= 256) + sane = 0; #else + if (disk->bios_hd > 256) + sane = 0; if (disk->bios_sect > 63) + sane = 0; #endif - sane = 0; +#if 0 /* Disable a check on a disk size. It's too strict. */ if (disk->bios_cyl * disk->bios_hd * disk->bios_sect != disk->chunks->size) sane = 0; +#endif if (sane) return; ==== //depot/projects/soc2009/trasz_limits/lib/libjail/jail.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/libjail/jail.3,v 1.1 2009/06/24 18:18:35 jamie Exp $ +.\" $FreeBSD: src/lib/libjail/jail.3,v 1.2 2009/09/21 08:30:52 ru Exp $ .\" .Dd June 24, 2009 .Dt JAIL 3 @@ -39,7 +39,7 @@ .Nm jailparam_set , .Nm jailparam_get , .Nm jailparam_export , -.Nm jailparam_free , +.Nm jailparam_free .Nd create and manage system jails .Sh LIBRARY .Lb libjail @@ -89,14 +89,16 @@ The .Fn jail_getid function returns the JID of the jail identified by -.Ar name , +.Fa name , or \-1 if the jail does not exist. .Pp The .Fn jail_getname function returns the name of the jail identified by -.Ar jid , -or NULL if the jail does not exist. +.Fa jid , +or +.Dv NULL +if the jail does not exist. .Pp The .Fn jail_setv @@ -116,7 +118,7 @@ The .Fn jailparam_all function sets -.Ar jpp +.Fa jpp to a list of all known jail parameters, and returns the number of parameters. The list should later be freed with @@ -127,14 +129,15 @@ The .Fn jailparam_init function clears a parameter record and copies the -.Ar name -to it. After use, it should be freed with +.Fa name +to it. +After use, it should be freed with .Fn jailparam_free . .Pp The .Fn jailparam_import function adds a -.Ar value +.Fa value to a parameter record, converting it from a string to its native form. The .Fn jailparam_import_raw @@ -151,7 +154,7 @@ .Pp The .Fn jailparam_get -function function passes a list of parameters to +function passes a list of parameters to .Xr jail_get 2 . The parameters are assumed to have been created with .Fn jailparam_init @@ -163,7 +166,7 @@ The .Fn jailparam_export function returns the string equivalent of a parameter value. -The returned string should freed after use. +The returned string should be freed after use. .Pp The .Fn jailparam_free @@ -171,6 +174,43 @@ If the list itself came from .Fn jailparam_all , it should be freed as well. +.Sh RETURN VALUES +The +.Fn jail_getid , +.Fn jail_setv , +.Fn jail_getv , +.Fn jailparam_set +and +.Fn jailparam_get +functions return a JID on success, or \-1 on error. +.Pp +The +.Fn jail_getname +and +.Fn jailparam_export +functions return a dynamically allocated string on success, or +.Dv NULL +on error. +.Pp +The +.Fn jailparam_all +function returns the number of parameters on success, or \-1 on error. +.Pp +The +.Fn jailparam_init , +.Fn jailparam_import +and +.Fn jailparam_import_raw +functions return 0 on success, or \-1 on error. +.Pp +Whenever an error is returned, +.Va errno +is set, and the global string +.Va jail_errmsg +contains a description of the error, possibly from +.Xr jail_set 2 +or +.Xr jail_get 2 . .Sh EXAMPLES >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 22 11:04:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DEFC1065670; Tue, 22 Sep 2009 11:04: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 42BA0106566B for ; Tue, 22 Sep 2009 11:04:27 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 31AB28FC1E for ; Tue, 22 Sep 2009 11:04:27 +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 n8MB4ROT027440 for ; Tue, 22 Sep 2009 11:04:27 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8MB4RsT027437 for perforce@freebsd.org; Tue, 22 Sep 2009 11:04:27 GMT (envelope-from mav@freebsd.org) Date: Tue, 22 Sep 2009 11:04:27 GMT Message-Id: <200909221104.n8MB4RsT027437@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 Cc: Subject: PERFORCE change 168764 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, 22 Sep 2009 11:04:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=168764 Change 168764 by mav@mav_mavbook on 2009/09/22 11:04:11 Fix old PIO PCCARD devices. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#36 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#36 (text+ko) ==== @@ -668,6 +668,9 @@ path->device->flags |= CAM_DEV_IDENTIFY_DATA_VALID; ata_device_transport(path); + /* Old PIO devices do not need mode setting. */ + if ((ident_buf->capabilities1 & ATA_SUPPORT_IORDY) == 0) + goto modedone; PROBE_SET_ACTION(softc, PROBE_SETMODE); xpt_release_ccb(done_ccb); xpt_schedule(periph, priority); @@ -700,7 +703,7 @@ case PROBE_SETMODE: { if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) { - if (path->device->protocol == PROTO_ATA) { +modedone: if (path->device->protocol == PROTO_ATA) { path->device->flags &= ~CAM_DEV_UNCONFIGURED; done_ccb->ccb_h.func_code = XPT_GDEV_TYPE; xpt_action(done_ccb); From owner-p4-projects@FreeBSD.ORG Tue Sep 22 11:36:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E26B1065697; Tue, 22 Sep 2009 11:36:02 +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 1286A1065693 for ; Tue, 22 Sep 2009 11:36:02 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DC3CE8FC13 for ; Tue, 22 Sep 2009 11:36: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 n8MBa1Vk029755 for ; Tue, 22 Sep 2009 11:36:01 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8MBa16Y029753 for perforce@freebsd.org; Tue, 22 Sep 2009 11:36:01 GMT (envelope-from mav@freebsd.org) Date: Tue, 22 Sep 2009 11:36:01 GMT Message-Id: <200909221136.n8MBa16Y029753@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 Cc: Subject: PERFORCE change 168766 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, 22 Sep 2009 11:36:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=168766 Change 168766 by mav@mav_mavbook on 2009/09/22 11:35:26 Add IORDY capability constant. Affected files ... .. //depot/projects/scottl-camlock/src/sys/sys/ata.h#11 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/sys/ata.h#11 (text+ko) ==== @@ -67,6 +67,8 @@ /*049*/ u_int16_t capabilities1; #define ATA_SUPPORT_DMA 0x0100 #define ATA_SUPPORT_LBA 0x0200 +#define ATA_SUPPORT_IORDY 0x0400 +#define ATA_SUPPORT_IORDYDIS 0x0800 #define ATA_SUPPORT_OVERLAP 0x4000 /*050*/ u_int16_t capabilities2; From owner-p4-projects@FreeBSD.ORG Tue Sep 22 11:40:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D76F91065695; Tue, 22 Sep 2009 11:40:06 +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 9C83C1065693 for ; Tue, 22 Sep 2009 11:40:06 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7232A8FC23 for ; Tue, 22 Sep 2009 11:40:06 +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 n8MBe6Gm030036 for ; Tue, 22 Sep 2009 11:40:06 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8MBe6Tg030034 for perforce@freebsd.org; Tue, 22 Sep 2009 11:40:06 GMT (envelope-from stas@freebsd.org) Date: Tue, 22 Sep 2009 11:40:06 GMT Message-Id: <200909221140.n8MBe6Tg030034@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168767 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, 22 Sep 2009 11:40:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=168767 Change 168767 by stas@stas_yandex on 2009/09/22 11:39:24 - Add suppression for libc puts leak. Affected files ... .. //depot/projects/valgrind/freebsd.supp#3 edit Differences ... ==== //depot/projects/valgrind/freebsd.supp#3 (text+ko) ==== @@ -9,3 +9,13 @@ Memcheck:Cond obj:/libexec/ld-elf.so.1 } +{ + libc puts leak + Memcheck:Leak + fun:malloc + obj:/lib/libc.so.7 + obj:/lib/libc.so.7 + obj:/lib/libc.so.7 + fun:puts + fun:main +} From owner-p4-projects@FreeBSD.ORG Tue Sep 22 12:40:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3DEC106566C; Tue, 22 Sep 2009 12:40: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 6819B10656C4 for ; Tue, 22 Sep 2009 12:40:12 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 579978FC23 for ; Tue, 22 Sep 2009 12:40: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 n8MCeCMo035273 for ; Tue, 22 Sep 2009 12:40:12 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8MCeCEo035271 for perforce@freebsd.org; Tue, 22 Sep 2009 12:40:12 GMT (envelope-from stas@freebsd.org) Date: Tue, 22 Sep 2009 12:40:12 GMT Message-Id: <200909221240.n8MCeCEo035271@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168770 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, 22 Sep 2009 12:40:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=168770 Change 168770 by stas@stas_yandex on 2009/09/22 12:39:47 - Use correct prefix for printing long long variables. Affected files ... .. //depot/projects/valgrind/memcheck/tests/amd64/more_x87_fp.c#3 edit Differences ... ==== //depot/projects/valgrind/memcheck/tests/amd64/more_x87_fp.c#3 (text+ko) ==== @@ -106,8 +106,8 @@ la = a; printf("(float)%e = %e\n", a, fa); printf("(long double)%f = %Lf\n", a, la); - printf("a=%016Lx\n", *(long long *)&a); - printf("la=%016Lx %04x\n", *(long long *)&la, + printf("a=%016llx\n", *(long long *)&a); + printf("la=%016llx %04x\n", *(long long *)&la, *(unsigned short *)((char *)(&la) + 8)); /* test all roundings */ From owner-p4-projects@FreeBSD.ORG Tue Sep 22 13:15:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D66B41065697; Tue, 22 Sep 2009 13:15:51 +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 9A3091065679 for ; Tue, 22 Sep 2009 13:15:51 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 89CFA8FC33 for ; Tue, 22 Sep 2009 13:15: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 n8MDFp9e048949 for ; Tue, 22 Sep 2009 13:15:51 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8MDFpCt048947 for perforce@freebsd.org; Tue, 22 Sep 2009 13:15:51 GMT (envelope-from stas@freebsd.org) Date: Tue, 22 Sep 2009 13:15:51 GMT Message-Id: <200909221315.n8MDFpCt048947@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168772 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, 22 Sep 2009 13:15:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=168772 Change 168772 by stas@stas_yandex on 2009/09/22 13:15:47 - Do not try to read stabs on amd64, it doesn't work well. The reader is broken on amd64-linux as well. Affected files ... .. //depot/projects/valgrind/coregrind/m_debuginfo/readelf.c#10 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_debuginfo/readelf.c#10 (text+ko) ==== @@ -2007,9 +2007,9 @@ } /* Read the stabs and/or dwarf2 debug information, if any. It - appears reading stabs stuff on amd64-linux doesn't work, so - we ignore it. */ -# if !defined(VGP_amd64_linux) + appears reading stabs stuff on amd64-linux and amd64-freebsd + doesn't work, so we ignore it. */ +# if !defined(VGP_amd64_linux) && !defined(VGP_amd64_freebsd) if (stab_img && stabstr_img) { ML_(read_debuginfo_stabs) ( di, stab_img, stab_sz, stabstr_img, stabstr_sz ); From owner-p4-projects@FreeBSD.ORG Tue Sep 22 15:45:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5288E106568D; Tue, 22 Sep 2009 15:45:35 +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 99CC9106566C for ; Tue, 22 Sep 2009 15:45:35 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 874378FC1E for ; Tue, 22 Sep 2009 15:45: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 n8MFjZqL061860 for ; Tue, 22 Sep 2009 15:45:35 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8MFjZBL061858 for perforce@freebsd.org; Tue, 22 Sep 2009 15:45:35 GMT (envelope-from trasz@freebsd.org) Date: Tue, 22 Sep 2009 15:45:35 GMT Message-Id: <200909221545.n8MFjZBL061858@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 168776 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, 22 Sep 2009 15:45:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=168776 Change 168776 by trasz@trasz_victim on 2009/09/22 15:45:14 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ACCESS.9#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/acl.9#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess.9#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/NOTES#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#41 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#51 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.amd64#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-marvell.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis.c#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/kbd/kbd.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/if_mxge.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/es137x.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/t4dwave.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/NOTES#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#51 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#33 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#34 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.359 2009/08/23 07:48:11 julian Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.360 2009/09/22 15:15:03 trasz Exp $ MAN= accept_filter.9 \ accf_data.9 \ ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ACCESS.9#9 (text+ko) ==== @@ -27,9 +27,9 @@ .\" (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/share/man/man9/VOP_ACCESS.9,v 1.26 2009/06/01 07:48:27 trasz Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_ACCESS.9,v 1.27 2009/09/22 15:15:03 trasz Exp $ .\" -.Dd June 1, 2009 +.Dd September 18, 2009 .Os .Dt VOP_ACCESS 9 .Sh NAME ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/acl.9#8 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/acl.9,v 1.19 2009/05/24 20:34:29 trasz Exp $ +.\" $FreeBSD: src/share/man/man9/acl.9,v 1.20 2009/09/22 15:15:03 trasz Exp $ .\" -.Dd December 23, 1999 +.Dd September 18, 2009 .Os .Dt ACL 9 .Sh NAME @@ -207,6 +207,7 @@ .El .Sh SEE ALSO .Xr acl 3 , +.Xr vaccess_acl_nfs4 9 , .Xr vaccess_acl_posix1e 9 , .Xr vaccess_acl_nfs4 9 , .Xr VFS 9 , ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess.9#4 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/vaccess.9,v 1.10 2008/10/28 13:44:11 trasz Exp $ +.\" $FreeBSD: src/share/man/man9/vaccess.9,v 1.11 2009/09/22 15:15:03 trasz Exp $ .\" -.Dd August 22, 2001 +.Dd September 18, 2009 .Os .Dt VACCESS 9 .Sh NAME @@ -117,6 +117,7 @@ appropriate privileges or to the owner of a file or other resource. .El .Sh SEE ALSO +.Xr vaccess_acl_nfs4 9 , .Xr vaccess_acl_posix1e 9 , .Xr vnode 9 , .Xr VOP_ACCESS 9 ==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/NOTES#13 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.95 2009/09/21 07:08:20 delphij Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.96 2009/09/21 23:58:29 delphij Exp $ # # @@ -160,6 +160,11 @@ # Turn on extra debugging checks and output for VESA support. options VESA_DEBUG +device dpms # DPMS suspend & resume via VESA BIOS + +# x86 real mode BIOS emulator, required by atkbdc/dpms/vesa +options X86BIOS + # # Optional devices: # ==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#41 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1556 2009/09/21 08:17:57 delphij Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1557 2009/09/21 23:58:29 delphij Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2757,5 +2757,3 @@ options BROOKTREE_ALLOC_PAGES=(217*4+1) options MAXFILES=999 -# x86 real mode emulator -options X86BIOS ==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#51 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1468 2009/09/21 08:24:22 delphij Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1470 2009/09/22 15:15:03 trasz Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2009,6 +2009,7 @@ kern/serdev_if.m standard kern/stack_protector.c standard \ compile-with "${NORMAL_C:N-fstack-protector*}" +kern/subr_acl_nfs4.c standard kern/subr_acl_posix1e.c standard kern/subr_acl_nfs4.c standard kern/subr_autoconf.c standard @@ -2829,8 +2830,3 @@ dev/xen/xenpci/xenpci.c optional xenpci dev/xen/xenpci/evtchn.c optional xenpci dev/xen/xenpci/machine_reboot.c optional xenpci -dev/x86bios/x86bios.c optional x86bios | atkbd | dpms | vesa -dev/x86bios/x86bios_alloc.c optional x86bios | atkbd | dpms | vesa -contrib/x86emu/x86emu.c optional x86bios | atkbd | dpms | vesa -contrib/x86emu/x86emu_util.c optional x86bios | atkbd | dpms | vesa - ==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.amd64#19 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.143 2009/09/21 07:08:20 delphij Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.144 2009/09/22 07:10:23 delphij Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -294,3 +294,11 @@ # libkern/memmove.c standard libkern/memset.c standard +# +# x86 real mode BIOS emulator, required by atkbdc/dpms/vesa +# +dev/x86bios/x86bios.c optional x86bios | atkbd | dpms | vesa +dev/x86bios/x86bios_alloc.c optional x86bios | atkbd | dpms | vesa +contrib/x86emu/x86emu.c optional x86bios | atkbd | dpms | vesa +contrib/x86emu/x86emu_util.c optional x86bios | atkbd | dpms | vesa + ==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#21 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.629 2009/09/21 07:08:20 delphij Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.630 2009/09/22 07:10:23 delphij Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -378,3 +378,10 @@ i386/xbox/xboxfb.c optional xboxfb dev/fb/boot_font.c optional xboxfb i386/xbox/pic16l.s optional xbox +# +# x86 real mode BIOS emulator, required by atkbdc/dpms/vesa +# +dev/x86bios/x86bios.c optional x86bios | atkbd | dpms | vesa +dev/x86bios/x86bios_alloc.c optional x86bios | atkbd | dpms | vesa +contrib/x86emu/x86emu.c optional x86bios | atkbd | dpms | vesa +contrib/x86emu/x86emu_util.c optional x86bios | atkbd | dpms | vesa ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-marvell.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-marvell.c,v 1.11 2009/09/08 13:19:05 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-marvell.c,v 1.12 2009/09/22 11:47:21 marius Exp $"); #include "opt_ata.h" #include @@ -227,6 +227,8 @@ work = ch->dma.work_bus; /* clear work area */ bzero(ch->dma.work, 1024+256); + bus_dmamap_sync(ch->dma.work_tag, ch->dma.work_map, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* set legacy ATA resources */ for (i = ATA_DATA; i <= ATA_COMMAND; i++) { @@ -310,7 +312,11 @@ static int ata_marvell_edma_ch_detach(device_t dev) { + struct ata_channel *ch = device_get_softc(dev); + if (ch->dma.work_tag && ch->dma.work_map) + bus_dmamap_sync(ch->dma.work_tag, ch->dma.work_map, + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); ata_dmafini(dev); return (0); } @@ -344,8 +350,6 @@ struct ata_channel *ch = device_get_softc(request->parent); u_int32_t req_in; u_int8_t *bytep; - u_int16_t *wordp; - u_int32_t *quadp; int i; int error, slot; @@ -374,13 +378,14 @@ slot = (((req_in & ~0xfffffc00) >> 5) + 0) & 0x1f; bytep = (u_int8_t *)(ch->dma.work); bytep += (slot << 5); - wordp = (u_int16_t *)bytep; - quadp = (u_int32_t *)bytep; /* fill in this request */ - quadp[0] = (long)request->dma->sg_bus & 0xffffffff; - quadp[1] = (u_int64_t)request->dma->sg_bus >> 32; - wordp[4] = (request->flags & ATA_R_READ ? 0x01 : 0x00) | (request->tag<<1); + le32enc(bytep + 0 * sizeof(u_int32_t), + request->dma->sg_bus & 0xffffffff); + le32enc(bytep + 1 * sizeof(u_int32_t), + (u_int64_t)request->dma->sg_bus >> 32); + le16enc(bytep + 4 * sizeof(u_int16_t), + (request->flags & ATA_R_READ ? 0x01 : 0x00) | (request->tag << 1)); i = 10; bytep[i++] = (request->u.ata.count >> 8) & 0xff; @@ -409,6 +414,9 @@ bytep[i++] = request->u.ata.command; bytep[i++] = 0x90 | ATA_COMMAND; + bus_dmamap_sync(ch->dma.work_tag, ch->dma.work_map, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); + /* enable EDMA machinery if needed */ if (!(ATA_INL(ctlr->r_res1, 0x02028 + ATA_MV_EDMA_BASE(ch)) & 0x00000001)) { ATA_OUTL(ctlr->r_res1, 0x02028 + ATA_MV_EDMA_BASE(ch), 0x00000001); @@ -451,6 +459,8 @@ slot = (((rsp_in & ~0xffffff00) >> 3)) & 0x1f; rsp_out &= 0xffffff00; rsp_out += (slot << 3); + bus_dmamap_sync(ch->dma.work_tag, ch->dma.work_map, + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); response = (struct ata_marvell_response *) (ch->dma.work + 1024 + (slot << 3)); @@ -525,6 +535,7 @@ prd[i].addrlo = htole32(segs[i].ds_addr); prd[i].count = htole32(segs[i].ds_len); prd[i].addrhi = htole32((u_int64_t)segs[i].ds_addr >> 32); + prd[i].reserved = 0; } prd[i - 1].count |= htole32(ATA_DMA_EOT); KASSERT(nsegs <= ATA_DMA_ENTRIES, ("too many DMA segment entries\n")); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis.c#21 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.166 2009/07/20 23:21:19 cokane Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.167 2009/09/22 12:36:51 cokane Exp $"); #include #include @@ -1012,7 +1012,12 @@ ndis_vap_delete(struct ieee80211vap *vap) { struct ndis_vap *nvp = NDIS_VAP(vap); + struct ieee80211com *ic = vap->iv_ic; + struct ifnet *ifp = ic->ic_ifp; + struct ndis_softc *sc = ifp->if_softc; + ndis_stop(sc); + callout_drain(&sc->ndis_scan_callout); ieee80211_vap_detach(vap); free(nvp, M_80211_VAP); } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/kbd/kbd.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/kbd/kbd.c,v 1.51 2009/09/19 17:56:26 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/kbd/kbd.c,v 1.52 2009/09/22 11:29:11 ed Exp $"); #include "opt_kbd.h" @@ -728,7 +728,7 @@ size_t len; u_char *cp; int mode; - int c; + u_int c; /* assert(KBD_IS_VALID(kbd)) */ sc = (genkbd_softc_t *)arg; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/if_mxge.c#11 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.65 2009/09/21 14:41:07 gallatin Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.66 2009/09/21 20:16:10 gallatin Exp $"); #include #include @@ -144,7 +144,7 @@ static int mxge_load_firmware(mxge_softc_t *sc, int adopt); static int mxge_send_cmd(mxge_softc_t *sc, uint32_t cmd, mxge_cmd_t *data); -static int mxge_close(mxge_softc_t *sc); +static int mxge_close(mxge_softc_t *sc, int down); static int mxge_open(mxge_softc_t *sc); static void mxge_tick(void *arg); @@ -1309,8 +1309,7 @@ ss->lro_queued = 0; ss->lro_flushed = 0; if (ss->fw_stats != NULL) { - ss->fw_stats->valid = 0; - ss->fw_stats->send_done_count = 0; + bzero(ss->fw_stats, sizeof *ss->fw_stats); } } sc->rdma_tags_available = 15; @@ -1421,7 +1420,7 @@ ifp->if_capenable |= IFCAP_LRO; sc->lro_cnt = lro_cnt; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - mxge_close(sc); + mxge_close(sc, 0); err = mxge_open(sc); } return err; @@ -1537,6 +1536,10 @@ "read_write_dma_MBs", CTLFLAG_RD, &sc->read_write_dma, 0, "DMA concurrent Read/Write speed in MB/s"); + SYSCTL_ADD_INT(ctx, children, OID_AUTO, + "watchdog_resets", + CTLFLAG_RD, &sc->watchdog_resets, + 0, "Number of times NIC was reset"); /* performance related tunables */ @@ -3648,7 +3651,7 @@ } static int -mxge_close(mxge_softc_t *sc) +mxge_close(mxge_softc_t *sc, int down) { mxge_cmd_t cmd; int err, old_down_cnt; @@ -3665,21 +3668,23 @@ } #endif sc->ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - old_down_cnt = sc->down_cnt; - wmb(); - err = mxge_send_cmd(sc, MXGEFW_CMD_ETHERNET_DOWN, &cmd); - if (err) { - device_printf(sc->dev, "Couldn't bring down link\n"); + if (!down) { + old_down_cnt = sc->down_cnt; + wmb(); + err = mxge_send_cmd(sc, MXGEFW_CMD_ETHERNET_DOWN, &cmd); + if (err) { + device_printf(sc->dev, + "Couldn't bring down link\n"); + } + if (old_down_cnt == sc->down_cnt) { + /* wait for down irq */ + DELAY(10 * sc->intr_coal_delay); + } + wmb(); + if (old_down_cnt == sc->down_cnt) { + device_printf(sc->dev, "never got down irq\n"); + } } - if (old_down_cnt == sc->down_cnt) { - /* wait for down irq */ - DELAY(10 * sc->intr_coal_delay); - } - wmb(); - if (old_down_cnt == sc->down_cnt) { - device_printf(sc->dev, "never got down irq\n"); - } - mxge_free_mbufs(sc); return 0; @@ -3732,8 +3737,9 @@ mxge_watchdog_reset(mxge_softc_t *sc, int slice) { struct pci_devinfo *dinfo; + struct mxge_slice_state *ss; mxge_tx_ring_t *tx; - int err; + int err, running, s, num_tx_slices = 1; uint32_t reboot; uint16_t cmd; @@ -3767,6 +3773,30 @@ reboot = mxge_read_reboot(sc); device_printf(sc->dev, "NIC rebooted, status = 0x%x\n", reboot); + running = sc->ifp->if_drv_flags & IFF_DRV_RUNNING; + if (running) { + + /* + * quiesce NIC so that TX routines will not try to + * xmit after restoration of BAR + */ + + /* Mark the link as down */ + if (sc->link_state) { + sc->link_state = 0; + if_link_state_change(sc->ifp, + LINK_STATE_DOWN); + } +#ifdef IFNET_BUF_RING + num_tx_slices = sc->num_slices; +#endif + /* grab all TX locks to ensure no tx */ + for (s = 0; s < num_tx_slices; s++) { + ss = &sc->ss[s]; + mtx_lock(&ss->tx.mtx); + } + mxge_close(sc, 1); + } /* restore PCI configuration space */ dinfo = device_get_ivars(sc->dev); pci_cfg_restore(sc->dev, dinfo); @@ -3774,10 +3804,22 @@ /* and redo any changes we made to our config space */ mxge_setup_cfg_space(sc); - if (sc->ifp->if_drv_flags & IFF_DRV_RUNNING) { - mxge_close(sc); - err = mxge_open(sc); + /* reload f/w */ + err = mxge_load_firmware(sc, 0); + if (err) { + device_printf(sc->dev, + "Unable to re-load f/w\n"); + } + if (running) { + if (!err) + err = mxge_open(sc); + /* release all TX locks */ + for (s = 0; s < num_tx_slices; s++) { + ss = &sc->ss[s]; + mtx_unlock(&ss->tx.mtx); + } } + sc->watchdog_resets++; } else { tx = &sc->ss[slice].tx; device_printf(sc->dev, @@ -3793,6 +3835,9 @@ be32toh(sc->ss->fw_stats->send_done_count)); device_printf(sc->dev, "not resetting\n"); } + if (err) + device_printf(sc->dev, "watchdog reset failed\n"); + return (err); } @@ -3908,11 +3953,11 @@ old_mtu = ifp->if_mtu; ifp->if_mtu = mtu; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - mxge_close(sc); + mxge_close(sc, 0); err = mxge_open(sc); if (err != 0) { ifp->if_mtu = old_mtu; - mxge_close(sc); + mxge_close(sc, 0); (void) mxge_open(sc); } } @@ -3970,7 +4015,7 @@ } } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - mxge_close(sc); + mxge_close(sc, 0); } } mtx_unlock(&sc->driver_mtx); @@ -4700,7 +4745,7 @@ mtx_lock(&sc->driver_mtx); sc->dying = 1; if (sc->ifp->if_drv_flags & IFF_DRV_RUNNING) - mxge_close(sc); + mxge_close(sc, 0); mtx_unlock(&sc->driver_mtx); ether_ifdetach(sc->ifp); callout_drain(&sc->co_hdl); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/es137x.c#3 (text+ko) ==== @@ -1,10 +1,33 @@ /*- - * Support the ENSONIQ AudioPCI board and Creative Labs SoundBlaster PCI - * boards based on the ES1370, ES1371 and ES1373 chips. + * Copyright (c) 1999 Russell Cattelan + * Copyright (c) 1998 Joachim Kuebart + * 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. * - * Copyright (c) 1999 Russell Cattelan + * 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. + */ + +/*- * Copyright (c) 1999 Cameron Grant - * Copyright (c) 1998 by Joachim Kuebart. All rights reserved. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -40,12 +63,14 @@ */ /* + * Support the ENSONIQ AudioPCI board and Creative Labs SoundBlaster PCI + * boards based on the ES1370, ES1371 and ES1373 chips. + * * Part of this code was heavily inspired by the linux driver from * Thomas Sailer (sailer@ife.ee.ethz.ch) * Just about everything has been touched and reworked in some way but * the all the underlying sequences/timing/register values are from * Thomas' code. - * */ #ifdef HAVE_KERNEL_OPTION_HEADERS @@ -63,7 +88,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/es137x.c,v 1.72 2009/06/07 19:12:08 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/es137x.c,v 1.73 2009/09/22 13:23:59 joel Exp $"); #define MEM_MAP_REG 0x14 ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/es137x.h#2 (text+ko) ==== @@ -1,26 +1,21 @@ /*- - * This supports the ENSONIQ AudioPCI board based on the ES1370. - * - * Copyright (c) 1998 Joachim Kuebart + * Copyright (c) 1998 Joachim Kuebart * 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 immediately at the beginning of the file, without modification, - * this list of conditions, and the following disclaimer. + * 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. - * 3. Absolutely no warranty of function or purpose is made by the author - * Joachim Kuebart. - * 4. Modifications may be freely made to this file if the above conditions - * are met. * - * $FreeBSD: src/sys/dev/sound/pci/es137x.h,v 1.6 2005/07/31 13:19:38 netchild Exp $ + * $FreeBSD: src/sys/dev/sound/pci/es137x.h,v 1.7 2009/09/22 13:23:59 joel Exp $ */ +/* This supports the ENSONIQ AudioPCI board based on the ES1370. */ + #ifndef _ES1370_REG_H #define _ES1370_REG_H ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/t4dwave.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/t4dwave.c,v 1.55 2009/06/07 19:12:08 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/t4dwave.c,v 1.56 2009/09/22 11:38:45 marius Exp $"); /* -------------------------------------------------------------------- */ @@ -45,18 +45,22 @@ #define SPA_PCI_ID 0x70181039 #define TR_DEFAULT_BUFSZ 0x1000 +/* For ALi M5451 the DMA transfer size appears to be fixed to 64k. */ +#define ALI_BUFSZ 0x10000 +#define TR_BUFALGN 0x8 #define TR_TIMEOUT_CDC 0xffff +#define TR_MAXHWCH 64 +#define ALI_MAXHWCH 32 #define TR_MAXPLAYCH 4 +#define ALI_MAXPLAYCH 1 /* - * Though, it's not clearly documented in trident datasheet, trident - * audio cards can't handle DMA addresses located above 1GB. The LBA - * (loop begin address) register which holds DMA base address is 32bits - * register. - * But the MSB 2bits are used for other purposes(I guess it is really - * bad idea). This effectivly limits the DMA address space up to 1GB. + * Though, it's not clearly documented in the 4DWAVE datasheet, the + * DX and NX chips can't handle DMA addresses located above 1GB as the + * LBA (loop begin address) register which holds the DMA base address + * is 32-bit, but the two MSBs are used for other purposes. */ -#define TR_MAXADDR ((1 << 30) - 1) - +#define TR_MAXADDR ((1U << 30) - 1) +#define ALI_MAXADDR ((1U << 31) - 1) struct tr_info; @@ -97,6 +101,7 @@ struct mtx *lock; + u_int32_t hwchns; u_int32_t playchns; unsigned int bufsz; @@ -398,7 +403,10 @@ ch->ec &= 0x00000fff; ch->alpha &= 0x00000fff; ch->delta &= 0x0000ffff; - ch->lba &= 0x3fffffff; + if (tr->type == ALI_PCI_ID) + ch->lba &= ALI_MAXADDR; + else + ch->lba &= TR_MAXADDR; cr[1]=ch->lba; cr[3]=(ch->fmc<<14) | (ch->rvol<<7) | (ch->cvol); @@ -441,7 +449,10 @@ snd_mtxunlock(tr->lock); - ch->lba= (cr[1] & 0x3fffffff); + if (tr->type == ALI_PCI_ID) + ch->lba=(cr[1] & ALI_MAXADDR); + else + ch->lba=(cr[1] & TR_MAXADDR); ch->fmc= (cr[3] & 0x0000c000) >> 14; ch->rvol= (cr[3] & 0x00003f80) >> 7; ch->cvol= (cr[3] & 0x0000007f); @@ -628,7 +639,6 @@ tr_wr(tr, TR_REG_SBCTRL, i, 1); return 0; - } static u_int32_t @@ -729,7 +739,7 @@ intsrc = tr_rd(tr, TR_REG_MISCINT, 4); if (intsrc & TR_INT_ADDR) { chnum = 0; - while (chnum < 64) { + while (chnum < tr->hwchns) { mask = 0x00000001; active = tr_rd(tr, (chnum < 32)? TR_REG_ADDRINTA : TR_REG_ADDRINTB, 4); bufhalf = tr_rd(tr, (chnum < 32)? TR_REG_CSPF_A : TR_REG_CSPF_B, 4); @@ -815,8 +825,13 @@ u_int32_t data; struct tr_info *tr; struct ac97_info *codec = 0; + bus_addr_t lowaddr; int i, dacn; char status[SND_STATUSLEN]; +#ifdef __sparc64__ + device_t *children; + int nchildren; +#endif tr = malloc(sizeof(*tr), M_DEVBUF, M_WAITOK | M_ZERO); tr->type = pci_get_devid(dev); @@ -834,7 +849,7 @@ } else { switch (tr->type) { case ALI_PCI_ID: - dacn = 1; + dacn = ALI_MAXPLAYCH; break; default: dacn = TR_MAXPLAYCH; @@ -859,8 +874,6 @@ goto bad; } - tr->bufsz = pcm_getbuffersize(dev, 4096, TR_DEFAULT_BUFSZ, 65536); - if (tr_init(tr) == -1) { device_printf(dev, "unable to initialize the card\n"); goto bad; @@ -879,12 +892,59 @@ goto bad; } - if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + if (tr->type == ALI_PCI_ID) { + /* + * The M5451 generates 31 bit of DMA and in order to do + * 32-bit DMA, the 31st bit can be set via its accompanying + * ISA bridge. Note that we can't predict whether bus_dma(9) + * will actually supply us with a 32-bit buffer and even when + * using a low address of BUS_SPACE_MAXADDR_32BIT for both + * we might end up with the play buffer being in the 32-bit + * range while the record buffer isn't or vice versa. So we + * limit enabling the 31st bit to sparc64, where the IOMMU + * guarantees that we're using a 32-bit address (and in turn + * requires it). + */ + lowaddr = ALI_MAXADDR; +#ifdef __sparc64__ + if (device_get_children(device_get_parent(dev), &children, + &nchildren) == 0) { + for (i = 0; i < nchildren; i++) { + if (pci_get_devid(children[i]) == 0x153310b9) { + lowaddr = BUS_SPACE_MAXADDR_32BIT; + data = pci_read_config(children[i], + 0x7e, 1); + if (bootverbose) + device_printf(dev, + "M1533 0x7e: 0x%x -> ", + data); + data |= 0x1; + if (bootverbose) + printf("0x%x\n", data); + pci_write_config(children[i], 0x7e, + data, 1); + break; + } + } + } + free(children, M_TEMP); +#endif + tr->hwchns = ALI_MAXHWCH; + tr->bufsz = ALI_BUFSZ; + } else { + lowaddr = TR_MAXADDR; + tr->hwchns = TR_MAXHWCH; + tr->bufsz = pcm_getbuffersize(dev, 4096, TR_DEFAULT_BUFSZ, + 65536); + } + + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), + /*alignment*/TR_BUFALGN, /*boundary*/0, - /*lowaddr*/TR_MAXADDR, + /*lowaddr*/lowaddr, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, - /*maxsize*/tr->bufsz, /*nsegments*/1, /*maxsegz*/0x3ffff, + /*maxsize*/tr->bufsz, /*nsegments*/1, /*maxsegz*/tr->bufsz, /*flags*/0, /*lockfunc*/busdma_lock_mutex, /*lockarg*/&Giant, &tr->parent_dmat) != 0) { device_printf(dev, "unable to create dma tag\n"); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/NOTES#16 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1279 2009/09/21 07:08:20 delphij Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1280 2009/09/21 23:58:29 delphij Exp $ # # @@ -361,6 +361,9 @@ device dpms # DPMS suspend & resume via VESA BIOS +# x86 real mode BIOS emulator, required by atkbdc/dpms/vesa +options X86BIOS + # # The Numeric Processing eXtension driver. This is non-optional. device npx ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#51 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2009 Edward Tomasz NapieraÅ‚a + * Copyright (c) 2008-2009 Edward Tomasz NapieraÅ‚a * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -32,7 +32,7 @@ #ifdef _KERNEL #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/kern/subr_acl_nfs4.c,v 1.2 2009/09/22 15:15:03 trasz Exp $"); #include #include @@ -49,7 +49,7 @@ #include #define KASSERT(a, b) assert(a) #define CTASSERT(a) -#endif +#endif /* _KERNEL */ #ifdef _KERNEL @@ -162,6 +162,11 @@ if (accmode & VADMIN) must_be_owner = 1; + /* + * Ignore VSYNCHRONIZE permission. + */ + accmode &= ~VSYNCHRONIZE; + access_mask = _access_mask_from_accmode(accmode); if (type == VDIR) @@ -232,9 +237,9 @@ !priv_check_cred(cred, PRIV_VFS_ADMIN, 0)) priv_granted |= VADMIN_PERMS; - if ((accmode & (VSTAT_PERMS | VSYNCHRONIZE)) && + if ((accmode & VSTAT_PERMS) && !priv_check_cred(cred, PRIV_VFS_STAT, 0)) - priv_granted |= (VSTAT_PERMS | VSYNCHRONIZE); + priv_granted |= VSTAT_PERMS; if ((accmode & priv_granted) == accmode) { if (privused != NULL) @@ -248,12 +253,9 @@ else denied = EACCES; - /* - * Nie wydostaniecie siÄ™. Drzwi zamkniÄ™te. - */ return (denied); } -#endif +#endif /* _KERNEL */ static int _acl_entry_matches(struct acl_entry *entry, acl_tag_t tag, acl_perm_t perm, @@ -999,7 +1001,7 @@ return (trivial); } -#endif +#endif /* _KERNEL */ int acl_nfs4_check(const struct acl *aclp, int is_directory) ==== //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#33 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.629 2009/09/21 08:17:57 delphij Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.630 2009/09/21 23:58:29 delphij Exp $ .include @@ -298,7 +298,7 @@ wlan_xauth \ ${_wpi} \ ${_wpifw} \ - x86bios \ + ${_x86bios} \ ${_xe} \ xfs \ xl \ @@ -456,6 +456,7 @@ _s3= s3 _twa= twa _vesa= vesa +_x86bios= x86bios .elif ${MACHINE} == "pc98" _canbepm= canbepm _canbus= canbus @@ -539,6 +540,7 @@ _tmpfs= tmpfs _twa= twa _vesa= vesa +_x86bios= x86bios _wi= wi _wpi= wpi _wpifw= wpifw ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#34 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)vnode.h 8.7 (Berkeley) 2/4/94 - * $FreeBSD: src/sys/sys/vnode.h,v 1.360 2009/06/28 21:49:43 stas Exp $ + * $FreeBSD: src/sys/sys/vnode.h,v 1.361 2009/09/22 15:15:03 trasz Exp $ */ #ifndef _SYS_VNODE_H_ @@ -614,6 +614,9 @@ int vaccess(enum vtype type, mode_t file_mode, uid_t file_uid, gid_t file_gid, accmode_t accmode, struct ucred *cred, int *privused); +int vaccess_acl_nfs4(enum vtype type, uid_t file_uid, gid_t file_gid, + struct acl *aclp, accmode_t accmode, struct ucred *cred, + int *privused); int vaccess_acl_posix1e(enum vtype type, uid_t file_uid, gid_t file_gid, struct acl *acl, accmode_t accmode, struct ucred *cred, int *privused); From owner-p4-projects@FreeBSD.ORG Tue Sep 22 15:57:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A448210656A6; Tue, 22 Sep 2009 15:57: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 68E42106568B for ; Tue, 22 Sep 2009 15:57:49 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3E3608FC17 for ; Tue, 22 Sep 2009 15:57: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 n8MFvnnH062775 for ; Tue, 22 Sep 2009 15:57:49 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8MFvnTj062773 for perforce@freebsd.org; Tue, 22 Sep 2009 15:57:49 GMT (envelope-from trasz@freebsd.org) Date: Tue, 22 Sep 2009 15:57:49 GMT Message-Id: <200909221557.n8MFvnTj062773@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 168778 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, 22 Sep 2009 15:57:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=168778 Change 168778 by trasz@trasz_victim on 2009/09/22 15:57:19 Fix mismerges. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/acl.9#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_nfs4.9#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#52 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#35 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/acl.9#9 (text+ko) ==== @@ -209,7 +209,6 @@ .Xr acl 3 , .Xr vaccess_acl_nfs4 9 , .Xr vaccess_acl_posix1e 9 , -.Xr vaccess_acl_nfs4 9 , .Xr VFS 9 , .Xr vnaccess 9 , .Xr VOP_ACLCHECK 9 , ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_nfs4.9#5 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/share/man/man9/vaccess_acl_nfs4.9,v 1.1 2009/09/22 15:15:03 trasz Exp $ .\" -.Dd August 22, 2001 +.Dd September 18, 2009 .Os .Dt VACCESS_ACL_NFS4 9 .Sh NAME ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#9 (text+ko) ==== @@ -2354,9 +2354,6 @@ if (error == 0) { int resume_err; -#ifdef FREEBSD_NAMECACHE - cache_purgevfs(zfsvfs->z_vfs); -#endif ASSERT(strcmp(osname, zc->zc_name) == 0); error = dmu_objset_rollback(os); resume_err = zfs_resume_fs(zfsvfs, osname, mode); @@ -2543,9 +2540,6 @@ if (error == 0) { int resume_err; -#ifdef FREEBSD_NAMECACHE - cache_purgevfs(zfsvfs->z_vfs); -#endif error = dmu_recv_end(&drc); resume_err = zfs_resume_fs(zfsvfs, osname, mode); error = error ? error : resume_err; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#52 (text+ko) ==== @@ -2011,7 +2011,6 @@ compile-with "${NORMAL_C:N-fstack-protector*}" kern/subr_acl_nfs4.c standard kern/subr_acl_posix1e.c standard -kern/subr_acl_nfs4.c standard kern/subr_autoconf.c standard kern/subr_blist.c standard kern/subr_bus.c standard ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#35 (text+ko) ==== @@ -620,9 +620,6 @@ int vaccess_acl_posix1e(enum vtype type, uid_t file_uid, gid_t file_gid, struct acl *acl, accmode_t accmode, struct ucred *cred, int *privused); -int vaccess_acl_nfs4(enum vtype type, uid_t file_uid, gid_t file_gid, - struct acl *aclp, accmode_t accmode, struct ucred *cred, - int *privused); void vattr_null(struct vattr *vap); int vcount(struct vnode *vp); void vdrop(struct vnode *); From owner-p4-projects@FreeBSD.ORG Tue Sep 22 16:27:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 366D2106568D; Tue, 22 Sep 2009 16:27:23 +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 EDE631065693 for ; Tue, 22 Sep 2009 16:27:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DABBD8FC13 for ; Tue, 22 Sep 2009 16:27:22 +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 n8MGRM3r065910 for ; Tue, 22 Sep 2009 16:27:22 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8MGRLeC065908 for perforce@freebsd.org; Tue, 22 Sep 2009 16:27:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 22 Sep 2009 16:27:21 GMT Message-Id: <200909221627.n8MGRLeC065908@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 168781 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, 22 Sep 2009 16:27:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=168781 Change 168781 by hselasky@hselasky_laptop001 on 2009/09/22 16:26:34 IFC @ 168777 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#17 integrate .. //depot/projects/usb/src/sys/amd64/amd64/initcpu.c#7 integrate .. //depot/projects/usb/src/sys/amd64/amd64/msi.c#11 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#30 integrate .. //depot/projects/usb/src/sys/amd64/amd64/trap.c#17 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#21 integrate .. //depot/projects/usb/src/sys/amd64/include/_align.h#1 branch .. //depot/projects/usb/src/sys/amd64/include/param.h#9 integrate .. //depot/projects/usb/src/sys/amd64/include/specialreg.h#15 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_proto.h#10 integrate .. //depot/projects/usb/src/sys/arm/include/_align.h#1 branch .. //depot/projects/usb/src/sys/arm/include/param.h#5 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/pxe.c#3 integrate .. //depot/projects/usb/src/sys/boot/pc98/Makefile.inc#4 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#22 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_cd.c#11 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_target.c#7 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#5 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#7 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/proc.h#4 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/vfs.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#8 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#8 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#9 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#8 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#14 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#8 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#21 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#20 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#19 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#23 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_proto.h#5 integrate .. //depot/projects/usb/src/sys/conf/NOTES#46 integrate .. //depot/projects/usb/src/sys/conf/files#79 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#24 integrate .. //depot/projects/usb/src/sys/conf/files.i386#29 integrate .. //depot/projects/usb/src/sys/conf/newvers.sh#12 integrate .. //depot/projects/usb/src/sys/conf/options#40 integrate .. //depot/projects/usb/src/sys/conf/options.amd64#10 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/acpica_prep.sh#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmtable.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asldefine.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslfiles.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslglobal.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslload.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asllookup.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslmain.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslmap.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslstubs.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asltypes.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evgpe.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exutils.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acdebug.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acglobal.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/achware.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acinterp.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/aclocal.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acobject.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acparser.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpredef.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actbl.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actbl1.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actbl2.h#1 branch .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actypes.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/amlcode.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utids.c#1 branch .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate .. //depot/projects/usb/src/sys/contrib/x86emu/x86emu.c#1 branch .. //depot/projects/usb/src/sys/contrib/x86emu/x86emu.h#1 branch .. //depot/projects/usb/src/sys/contrib/x86emu/x86emu_regs.h#1 branch .. //depot/projects/usb/src/sys/contrib/x86emu/x86emu_util.c#1 branch .. //depot/projects/usb/src/sys/dev/aac/aac.c#10 integrate .. //depot/projects/usb/src/sys/dev/aac/aacvar.h#5 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_ibm.c#9 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi.c#22 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_cpu.c#13 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_pcib_acpi.c#8 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpivar.h#11 integrate .. //depot/projects/usb/src/sys/dev/ae/if_ae.c#5 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_i810.c#9 integrate .. //depot/projects/usb/src/sys/dev/amdtemp/amdtemp.c#4 integrate .. //depot/projects/usb/src/sys/dev/amr/amr.c#11 integrate .. //depot/projects/usb/src/sys/dev/asmc/asmc.c#8 integrate .. //depot/projects/usb/src/sys/dev/asmc/asmcvar.h#5 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-raid.c#10 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-acerlabs.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-marvell.c#8 integrate .. //depot/projects/usb/src/sys/dev/ath/ah_osdep.c#10 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah.c#8 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#32 integrate .. //depot/projects/usb/src/sys/dev/atkbdc/atkbd.c#5 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#22 integrate .. //depot/projects/usb/src/sys/dev/ciss/ciss.c#17 integrate .. //depot/projects/usb/src/sys/dev/ciss/cissreg.h#4 integrate .. //depot/projects/usb/src/sys/dev/ciss/cissvar.h#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#19 integrate .. //depot/projects/usb/src/sys/dev/dpms/dpms.c#1 branch .. //depot/projects/usb/src/sys/dev/drm/drm_pciids.h#11 integrate .. //depot/projects/usb/src/sys/dev/drm/r600_blit.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.c#13 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#14 integrate .. //depot/projects/usb/src/sys/dev/ep/if_ep.c#5 integrate .. //depot/projects/usb/src/sys/dev/ep/if_epreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/fb/s3_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/fb/vesa.c#1 branch .. //depot/projects/usb/src/sys/dev/fb/vesa.h#1 branch .. //depot/projects/usb/src/sys/dev/fb/vga.c#3 integrate .. //depot/projects/usb/src/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/usb/src/sys/dev/firewire/fwdev.c#8 integrate .. //depot/projects/usb/src/sys/dev/fxp/if_fxp.c#15 integrate .. //depot/projects/usb/src/sys/dev/hptiop/hptiop.c#5 integrate .. //depot/projects/usb/src/sys/dev/ichwd/ichwd.c#9 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#32 integrate .. //depot/projects/usb/src/sys/dev/iir/iir.c#7 integrate .. //depot/projects/usb/src/sys/dev/isp/isp.c#9 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.c#12 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_stds.h#4 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_tpublic.h#6 delete .. //depot/projects/usb/src/sys/dev/isp/ispmbox.h#6 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.c#13 integrate .. //depot/projects/usb/src/sys/dev/kbd/kbd.c#7 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_raid.c#10 integrate .. //depot/projects/usb/src/sys/dev/msk/if_msk.c#14 integrate .. //depot/projects/usb/src/sys/dev/mwl/if_mwl.c#6 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#16 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge_var.h#14 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#26 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_user.c#6 integrate .. //depot/projects/usb/src/sys/dev/pci/pcireg.h#14 integrate .. //depot/projects/usb/src/sys/dev/pci/pcivar.h#11 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/es137x.c#7 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/es137x.h#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#36 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/t4dwave.c#6 integrate .. //depot/projects/usb/src/sys/dev/syscons/daemon/daemon_saver.c#7 integrate .. //depot/projects/usb/src/sys/dev/syscons/scterm-teken.c#8 integrate .. //depot/projects/usb/src/sys/dev/syscons/scvesactl.c#4 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.c#15 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rumreg.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#8 integrate .. //depot/projects/usb/src/sys/dev/wi/if_wi.c#15 integrate .. //depot/projects/usb/src/sys/dev/x86bios/x86bios.c#1 branch .. //depot/projects/usb/src/sys/dev/x86bios/x86bios.h#1 branch .. //depot/projects/usb/src/sys/dev/x86bios/x86bios_alloc.c#1 branch .. //depot/projects/usb/src/sys/fs/fifofs/fifo_vnops.c#14 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_conv.c#5 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clnode.c#5 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clport.c#4 integrate .. //depot/projects/usb/src/sys/geom/geom_dev.c#12 integrate .. //depot/projects/usb/src/sys/geom/geom_vfs.c#7 integrate .. //depot/projects/usb/src/sys/i386/acpica/acpi_machdep.c#12 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#25 integrate .. //depot/projects/usb/src/sys/i386/cpufreq/hwpstate.c#4 integrate .. //depot/projects/usb/src/sys/i386/i386/identcpu.c#15 integrate .. //depot/projects/usb/src/sys/i386/i386/msi.c#11 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#27 integrate .. //depot/projects/usb/src/sys/i386/i386/trap.c#15 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_proto.h#5 integrate .. //depot/projects/usb/src/sys/i386/include/_align.h#1 branch .. //depot/projects/usb/src/sys/i386/include/param.h#8 integrate .. //depot/projects/usb/src/sys/i386/include/pc/vesa.h#3 delete .. //depot/projects/usb/src/sys/i386/include/specialreg.h#15 integrate .. //depot/projects/usb/src/sys/i386/include/xen/xen-os.h#4 integrate .. //depot/projects/usb/src/sys/i386/isa/dpms.c#2 delete .. //depot/projects/usb/src/sys/i386/isa/vesa.c#6 delete .. //depot/projects/usb/src/sys/i386/linux/linux_proto.h#9 integrate .. //depot/projects/usb/src/sys/i386/xen/locore.s#4 integrate .. //depot/projects/usb/src/sys/i386/xen/pmap.c#14 integrate .. //depot/projects/usb/src/sys/ia64/include/_align.h#1 branch .. //depot/projects/usb/src/sys/ia64/include/param.h#5 integrate .. //depot/projects/usb/src/sys/kern/kern_event.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_exec.c#21 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#32 integrate .. //depot/projects/usb/src/sys/kern/kern_linker.c#21 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#19 integrate .. //depot/projects/usb/src/sys/kern/kern_mib.c#16 integrate .. //depot/projects/usb/src/sys/kern/kern_mutex.c#17 integrate .. //depot/projects/usb/src/sys/kern/kern_shutdown.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_sig.c#17 integrate .. //depot/projects/usb/src/sys/kern/kern_timeout.c#11 integrate .. //depot/projects/usb/src/sys/kern/sched_ule.c#18 integrate .. //depot/projects/usb/src/sys/kern/subr_acl_nfs4.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_bus.c#30 integrate .. //depot/projects/usb/src/sys/kern/subr_devstat.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_smp.c#14 integrate .. //depot/projects/usb/src/sys/kern/sys_generic.c#18 integrate .. //depot/projects/usb/src/sys/kern/sys_pipe.c#14 integrate .. //depot/projects/usb/src/sys/kern/tty.c#30 integrate .. //depot/projects/usb/src/sys/kern/tty_pts.c#19 integrate .. //depot/projects/usb/src/sys/kern/uipc_mqueue.c#12 integrate .. //depot/projects/usb/src/sys/kern/uipc_socket.c#28 integrate .. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#19 integrate .. //depot/projects/usb/src/sys/kern/vfs_aio.c#13 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#25 integrate .. //depot/projects/usb/src/sys/mips/include/_align.h#1 branch .. //depot/projects/usb/src/sys/mips/include/param.h#5 integrate .. //depot/projects/usb/src/sys/modules/Makefile#43 integrate .. //depot/projects/usb/src/sys/modules/acpi/acpi/Makefile#9 integrate .. //depot/projects/usb/src/sys/modules/dpms/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/dtrace/lockstat/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/vesa/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/x86bios/Makefile#1 branch .. //depot/projects/usb/src/sys/net/bpf.c#24 integrate .. //depot/projects/usb/src/sys/net/if.c#41 integrate .. //depot/projects/usb/src/sys/net/if_llatbl.c#8 integrate .. //depot/projects/usb/src/sys/net/if_var.h#29 integrate .. //depot/projects/usb/src/sys/net/if_vlan.c#19 integrate .. //depot/projects/usb/src/sys/net/route.h#12 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_action.c#3 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_proto.h#19 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#3 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#29 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.h#5 integrate .. //depot/projects/usb/src/sys/netinet/in.c#36 integrate .. //depot/projects/usb/src/sys/netinet/in.h#13 integrate .. //depot/projects/usb/src/sys/netinet/in_mcast.c#19 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.c#32 integrate .. //depot/projects/usb/src/sys/netinet/in_proto.c#15 integrate .. //depot/projects/usb/src/sys/netinet/ip_mroute.c#18 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#29 integrate .. //depot/projects/usb/src/sys/netinet/sctp_asconf.c#12 integrate .. //depot/projects/usb/src/sys/netinet/sctp_bsd_addr.c#12 integrate .. //depot/projects/usb/src/sys/netinet/sctp_input.c#20 integrate .. //depot/projects/usb/src/sys/netinet/sctp_os_bsd.h#20 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.c#23 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#19 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.h#14 integrate .. //depot/projects/usb/src/sys/netinet/sctp_structs.h#13 integrate .. //depot/projects/usb/src/sys/netinet/sctp_sysctl.c#16 integrate .. //depot/projects/usb/src/sys/netinet/sctp_timer.c#15 integrate .. //depot/projects/usb/src/sys/netinet/sctp_usrreq.c#17 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#25 integrate .. //depot/projects/usb/src/sys/netinet/tcp_subr.c#29 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timer.c#19 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timer.h#7 integrate .. //depot/projects/usb/src/sys/netinet/tcp_usrreq.c#24 integrate .. //depot/projects/usb/src/sys/netinet/tcp_var.h#23 integrate .. //depot/projects/usb/src/sys/netinet6/in6.c#34 integrate .. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#30 integrate .. //depot/projects/usb/src/sys/netinet6/in6_proto.c#20 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_input.c#30 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.c#26 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.h#10 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_nbr.c#20 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_rtr.c#24 integrate .. //depot/projects/usb/src/sys/netinet6/sctp6_usrreq.c#12 integrate .. //depot/projects/usb/src/sys/netipsec/key.c#26 integrate .. //depot/projects/usb/src/sys/netsmb/smb_dev.c#5 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_node.c#10 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vfsops.c#20 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_serv.c#16 integrate .. //depot/projects/usb/src/sys/pc98/include/_align.h#1 branch .. //depot/projects/usb/src/sys/pc98/include/pc/vesa.h#2 delete .. //depot/projects/usb/src/sys/pci/intpm.c#8 integrate .. //depot/projects/usb/src/sys/pci/intpmreg.h#4 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#23 integrate .. //depot/projects/usb/src/sys/powerpc/include/_align.h#1 branch .. //depot/projects/usb/src/sys/powerpc/include/param.h#6 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm_token.c#15 integrate .. //depot/projects/usb/src/sys/sparc64/include/_align.h#1 branch .. //depot/projects/usb/src/sys/sparc64/include/param.h#7 integrate .. //depot/projects/usb/src/sys/sparc64/pci/ofw_pci.h#6 integrate .. //depot/projects/usb/src/sys/sparc64/pci/psycho.c#12 integrate .. //depot/projects/usb/src/sys/sparc64/pci/schizo.c#5 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/jbusppm.c#3 integrate .. //depot/projects/usb/src/sys/sun4v/include/_align.h#1 branch .. //depot/projects/usb/src/sys/sun4v/include/param.h#5 integrate .. //depot/projects/usb/src/sys/sys/_sockaddr_storage.h#1 branch .. //depot/projects/usb/src/sys/sys/bus.h#11 integrate .. //depot/projects/usb/src/sys/sys/event.h#7 integrate .. //depot/projects/usb/src/sys/sys/imgact_aout.h#2 integrate .. //depot/projects/usb/src/sys/sys/kbio.h#3 integrate .. //depot/projects/usb/src/sys/sys/mman.h#3 integrate .. //depot/projects/usb/src/sys/sys/param.h#45 integrate .. //depot/projects/usb/src/sys/sys/smp.h#8 integrate .. //depot/projects/usb/src/sys/sys/socket.h#10 integrate .. //depot/projects/usb/src/sys/sys/syscallsubr.h#13 integrate .. //depot/projects/usb/src/sys/sys/sysproto.h#16 integrate .. //depot/projects/usb/src/sys/sys/systm.h#19 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#25 integrate .. //depot/projects/usb/src/sys/teken/teken.c#2 integrate .. //depot/projects/usb/src/sys/teken/teken.h#2 integrate .. //depot/projects/usb/src/sys/teken/teken_demo.c#2 integrate .. //depot/projects/usb/src/sys/teken/teken_subr.h#2 integrate .. //depot/projects/usb/src/sys/teken/teken_subr_compat.h#2 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_acl.c#5 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_vnops.c#20 integrate .. //depot/projects/usb/src/sys/vm/vm_mmap.c#21 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#17 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.174 2009/06/30 11:16:32 avg Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.175 2009/09/10 17:27:36 jkim Exp $"); #include "opt_cpu.h" @@ -371,21 +371,21 @@ switch (cpu_vendor_id) { case CPU_VENDOR_AMD: if ((amd_pminfo & AMDPM_TSC_INVARIANT) || - AMD64_CPU_FAMILY(cpu_id) >= 0x10 || + CPUID_TO_FAMILY(cpu_id) >= 0x10 || cpu_id == 0x60fb2) tsc_is_invariant = 1; break; case CPU_VENDOR_INTEL: if ((amd_pminfo & AMDPM_TSC_INVARIANT) || - (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xe) || - (AMD64_CPU_FAMILY(cpu_id) == 0xf && - AMD64_CPU_MODEL(cpu_id) >= 0x3)) + (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xe) || + (CPUID_TO_FAMILY(cpu_id) == 0xf && + CPUID_TO_MODEL(cpu_id) >= 0x3)) tsc_is_invariant = 1; break; case CPU_VENDOR_CENTAUR: - if (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf && + if (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf && (rdmsr(0x1203) & 0x100000000ULL) == 0) tsc_is_invariant = 1; break; ==== //depot/projects/usb/src/sys/amd64/amd64/initcpu.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.54 2009/07/22 14:32:38 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.55 2009/09/10 17:27:36 jkim Exp $"); #include "opt_cpu.h" @@ -154,8 +154,8 @@ pg_nx = PG_NX; } if (cpu_vendor_id == CPU_VENDOR_CENTAUR && - AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf) + CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf) init_via(); /* ==== //depot/projects/usb/src/sys/amd64/amd64/msi.c#11 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.14 2009/07/06 18:23:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.15 2009/09/10 17:27:36 jkim Exp $"); #include #include @@ -275,8 +275,8 @@ case CPU_VENDOR_AMD: break; case CPU_VENDOR_CENTAUR: - if (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf) + if (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf) break; /* FALLTHROUGH */ default: ==== //depot/projects/usb/src/sys/amd64/amd64/pmap.c#30 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.672 2009/09/02 16:47:10 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.673 2009/09/18 17:09:33 alc Exp $"); /* * Manages physical address maps. @@ -701,6 +701,11 @@ * Are large page mappings enabled? */ TUNABLE_INT_FETCH("vm.pmap.pg_ps_enabled", &pg_ps_enabled); + if (pg_ps_enabled) { + KASSERT(MAXPAGESIZES > 1 && pagesizes[1] == 0, + ("pmap_init: can't assign to pagesizes[1]")); + pagesizes[1] = NBPDR; + } /* * Calculate the size of the pv head table for superpages. ==== //depot/projects/usb/src/sys/amd64/amd64/trap.c#17 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.334 2009/08/24 16:19:47 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.335 2009/09/21 09:41:51 kib Exp $"); /* * AMD64 Trap and System call handling @@ -253,6 +253,11 @@ } #endif + if (type == T_RESERVED) { + trap_fatal(frame, 0); + goto out; + } + #ifdef HWPMC_HOOKS /* * CPU PMCs interrupt using an NMI. If the PMC module is ==== //depot/projects/usb/src/sys/amd64/conf/NOTES#21 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.92 2009/08/13 17:09:45 attilio Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.96 2009/09/21 23:58:29 delphij Exp $ # # @@ -154,6 +154,17 @@ ##################################################################### # HARDWARE DEVICE CONFIGURATION +# To include support for VGA VESA video modes +options VESA + +# Turn on extra debugging checks and output for VESA support. +options VESA_DEBUG + +device dpms # DPMS suspend & resume via VESA BIOS + +# x86 real mode BIOS emulator, required by atkbdc/dpms/vesa +options X86BIOS + # # Optional devices: # @@ -213,6 +224,9 @@ # Debugging. options VGA_DEBUG +# Linear framebuffer driver for S3 VESA 1.2 cards. Works on top of VESA. +device s3pci + # 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create # the /dev/3dfx0 device to work with glide implementations. This should get # linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as ==== //depot/projects/usb/src/sys/amd64/include/param.h#9 (text+ko) ==== @@ -36,33 +36,23 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.30 2009/07/05 17:45:48 sam Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.33 2009/09/18 17:04:57 alc Exp $ */ + +#ifndef _AMD64_INCLUDE_PARAM_H_ +#define _AMD64_INCLUDE_PARAM_H_ + +#include + /* * Machine dependent constants for AMD64. */ -/* - * Round p (pointer or byte index) up to a correctly-aligned value - * for all data types (int, long, ...). The result is u_long and - * must be cast to any desired pointer type. - */ -#ifndef _ALIGNBYTES -#define _ALIGNBYTES (sizeof(long) - 1) -#endif -#ifndef _ALIGN -#define _ALIGN(p) (((u_long)(p) + _ALIGNBYTES) &~ _ALIGNBYTES) -#endif -#ifndef _NO_NAMESPACE_POLLUTION - #define __HAVE_ACPI #define __PCI_REROUTE_INTERRUPT -#ifndef _MACHINE_PARAM_H_ -#define _MACHINE_PARAM_H_ - #ifndef MACHINE #define MACHINE "amd64" #endif @@ -118,6 +108,8 @@ #define NBPML4 (1ul<> 4) | \ (((id) & CPUID_EXT_MODEL) >> 12)) -#define AMD64_CPU_FAMILY(id) \ +#define CPUID_TO_FAMILY(id) \ ((((id) & CPUID_FAMILY) >> 8) + \ (((id) & CPUID_EXT_FAMILY) >> 20)) ==== //depot/projects/usb/src/sys/amd64/linux32/linux32_proto.h#10 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.39 2008/11/29 14:57:58 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.40 2009/09/10 13:20:27 des Exp $ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib */ @@ -1257,6 +1257,13 @@ #endif /* COMPAT_FREEBSD6 */ + +#ifdef COMPAT_FREEBSD7 + +#define nosys linux_nosys + +#endif /* COMPAT_FREEBSD7 */ + #define LINUX_SYS_AUE_linux_fork AUE_FORK #define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4 ==== //depot/projects/usb/src/sys/arm/include/param.h#5 (text+ko) ==== @@ -35,35 +35,23 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $FreeBSD: src/sys/arm/include/param.h,v 1.16 2009/07/05 17:45:48 sam Exp $ + * $FreeBSD: src/sys/arm/include/param.h,v 1.18 2009/09/18 17:04:57 alc Exp $ */ +#ifndef _ARM_INCLUDE_PARAM_H_ +#define _ARM_INCLUDE_PARAM_H_ + /* * Machine dependent constants for StrongARM */ -/* - * Round p (pointer or byte index) up to a correctly-aligned value - * for all data types (int, long, ...). The result is unsigned int - * and must be cast to any desired pointer type. - */ -#ifndef _ALIGNBYTES -#define _ALIGNBYTES (sizeof(int) - 1) -#endif -#ifndef _ALIGN -#define _ALIGN(p) (((unsigned)(p) + _ALIGNBYTES) & ~_ALIGNBYTES) -#endif +#include #define STACKALIGNBYTES (8 - 1) #define STACKALIGN(p) ((u_int)(p) & ~STACKALIGNBYTES) -#ifndef _NO_NAMESPACE_POLLUTION - #define __PCI_REROUTE_INTERRUPT -#ifndef _MACHINE_PARAM_H_ -#define _MACHINE_PARAM_H_ - #ifndef MACHINE #define MACHINE "arm" #endif @@ -104,6 +92,8 @@ #define NBPDR (1 << PDR_SHIFT) #define NPDEPG (1 << (32 - PDR_SHIFT)) +#define MAXPAGESIZES 1 /* maximum number of supported page sizes */ + #ifndef KSTACK_PAGES #define KSTACK_PAGES 2 #endif /* !KSTACK_PAGES */ @@ -136,5 +126,4 @@ #define pgtok(x) ((x) * (PAGE_SIZE / 1024)) -#endif /* !_MACHINE_PARAM_H_ */ -#endif /* !_NO_NAMESPACE_POLLUTION */ +#endif /* !_ARM_INCLUDE_PARAM_H_ */ ==== //depot/projects/usb/src/sys/boot/i386/libi386/pxe.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.23 2007/10/12 17:09:43 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.24 2009/09/10 22:05:43 emaste Exp $"); #include #include @@ -282,7 +282,7 @@ bootp(pxe_sock, BOOTP_PXE); if (rootip.s_addr == 0) rootip.s_addr = bootplayer.sip; - if (!rootpath[1]) + if (!rootpath[0]) strcpy(rootpath, PXENFSROOTPATH); for (i = 0; rootpath[i] != '\0' && i < FNAME_SIZE; i++) ==== //depot/projects/usb/src/sys/boot/pc98/Makefile.inc#4 (text+ko) ==== @@ -1,10 +1,10 @@ # Common defines for all of /sys/boot/pc98/ # -# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.8 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.9 2009/09/13 11:20:17 nyan Exp $ BINDIR?= /boot -LOADER_ADDRESS?=0x100000 +LOADER_ADDRESS?=0x200000 CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \ -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \ -Os ==== //depot/projects/usb/src/sys/cam/cam_xpt.c#22 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.223 2009/09/06 19:06:50 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.224 2009/09/15 00:15:24 ken Exp $"); #include #include @@ -794,8 +794,9 @@ * processed. */ xpt_lock_buses(); - msleep(&xsoftc.ccb_scanq, &xsoftc.xpt_topo_lock, PRIBIO, - "ccb_scanq", 0); + if (TAILQ_EMPTY(&xsoftc.ccb_scanq)) + msleep(&xsoftc.ccb_scanq, &xsoftc.xpt_topo_lock, PRIBIO, + "ccb_scanq", 0); TAILQ_INIT(&queue); TAILQ_CONCAT(&queue, &xsoftc.ccb_scanq, sim_links.tqe); xpt_unlock_buses(); @@ -806,9 +807,12 @@ sim = ccb->ccb_h.path->bus->sim; CAM_SIM_LOCK(sim); - ccb->ccb_h.func_code = XPT_SCAN_BUS; + if( ccb->ccb_h.path->target->target_id == CAM_TARGET_WILDCARD ) + ccb->ccb_h.func_code = XPT_SCAN_BUS; + else + ccb->ccb_h.func_code = XPT_SCAN_LUN; ccb->ccb_h.cbfcnp = xptdone; - xpt_setup_ccb(&ccb->ccb_h, ccb->ccb_h.path, 5); + xpt_setup_ccb(&ccb->ccb_h, ccb->ccb_h.path, 1); cam_periph_runccb(ccb, NULL, 0, 0, NULL); xpt_free_path(ccb->ccb_h.path); xpt_free_ccb(ccb); @@ -828,6 +832,7 @@ xpt_lock_buses(); TAILQ_FOREACH(hdr, &xsoftc.ccb_scanq, sim_links.tqe) { if (xpt_path_comp(hdr->path, ccb->ccb_h.path) == 0) { + wakeup(&xsoftc.ccb_scanq); xpt_unlock_buses(); xpt_print(ccb->ccb_h.path, "rescan already queued\n"); xpt_free_path(ccb->ccb_h.path); ==== //depot/projects/usb/src/sys/cam/scsi/scsi_cd.c#11 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.107 2009/07/10 08:18:08 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.110 2009/09/08 16:09:28 scottl Exp $"); #include "opt_cd.h" @@ -2528,7 +2528,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(¶ms, M_SCSICD); + free(¶ms.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; } ==== //depot/projects/usb/src/sys/cam/scsi/scsi_target.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.78 2009/06/25 18:46:30 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.80 2009/09/19 20:25:54 mjacob Exp $"); #include @@ -42,6 +42,9 @@ #include #include #include +/* Includes to support callout */ +#include +#include #include #include @@ -50,6 +53,7 @@ #include #include + /* Transaction information attached to each CCB sent by the user */ struct targ_cmd_descr { struct cam_periph_map_info mapinfo; @@ -92,6 +96,8 @@ targ_state state; struct selinfo read_select; struct devstat device_stats; + struct callout destroy_dev_callout; + struct mtx destroy_mtx; }; static d_open_t targopen; @@ -103,8 +109,11 @@ static d_kqfilter_t targkqfilter; static void targreadfiltdetach(struct knote *kn); static int targreadfilt(struct knote *kn, long hint); -static struct filterops targread_filtops = - { 1, NULL, targreadfiltdetach, targreadfilt }; +static struct filterops targread_filtops = { + .f_isfd = 1, + .f_detach = targreadfiltdetach, + .f_event = targreadfilt, +}; static struct cdevsw targ_cdevsw = { .d_version = D_VERSION, @@ -151,6 +160,7 @@ static void notify_user(struct targ_softc *softc); static int targcamstatus(cam_status status); static size_t targccblen(xpt_opcode func_code); +static void targdestroy(void *); static struct periph_driver targdriver = { @@ -208,10 +218,18 @@ int error; softc = (struct targ_softc *)dev->si_drv1; - if ((softc->periph == NULL) || - (softc->state & TARG_STATE_LUN_ENABLED) == 0) { + mtx_init(&softc->destroy_mtx, "targ_destroy", "SCSI Target dev destroy", MTX_DEF); + callout_init_mtx(&softc->destroy_dev_callout, &softc->destroy_mtx, CALLOUT_RETURNUNLOCKED); + if (softc->periph == NULL) { +#if 0 destroy_dev(dev); free(softc, M_TARG); +#endif + printf("%s: destroying non-enabled target\n", __func__); + mtx_lock(&softc->destroy_mtx); + callout_reset(&softc->destroy_dev_callout, hz / 2, + (void *)targdestroy, (void *)dev); + mtx_unlock(&softc->destroy_mtx); return (0); } @@ -223,18 +241,23 @@ cam_periph_acquire(periph); cam_periph_lock(periph); error = targdisable(softc); - if (error == CAM_REQ_CMP) { - dev->si_drv1 = 0; - if (softc->periph != NULL) { - cam_periph_invalidate(softc->periph); - softc->periph = NULL; - } - destroy_dev(dev); - free(softc, M_TARG); + if (softc->periph != NULL) { + cam_periph_invalidate(softc->periph); + softc->periph = NULL; } cam_periph_unlock(periph); cam_periph_release(periph); +#if 0 + destroy_dev(dev); + free(softc, M_TARG); +#endif + + printf("%s: close finished error(%d)\n", __func__, error); + mtx_lock(&softc->destroy_mtx); + callout_reset(&softc->destroy_dev_callout, hz / 2, + (void *)targdestroy, (void *)dev); + mtx_unlock(&softc->destroy_mtx); return (error); } @@ -818,7 +841,9 @@ case XPT_CONT_TARGET_IO: TAILQ_INSERT_TAIL(&softc->user_ccb_queue, &done_ccb->ccb_h, periph_links.tqe); + cam_periph_unlock(softc->periph); notify_user(softc); + cam_periph_lock(softc->periph); break; default: panic("targdone: impossible xpt opcode %#x", @@ -966,13 +991,19 @@ int ccb_len; ccb_len = targccblen(type); - ccb = malloc(ccb_len, M_TARG, M_WAITOK); + ccb = malloc(ccb_len, M_TARG, M_NOWAIT); CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("getccb %p\n", ccb)); - + if (ccb == NULL) { + return (ccb); + } xpt_setup_ccb(&ccb->ccb_h, softc->path, priority); ccb->ccb_h.func_code = type; ccb->ccb_h.cbfcnp = targdone; ccb->ccb_h.targ_descr = targgetdescr(softc); + if (ccb->ccb_h.targ_descr == NULL) { + free (ccb, M_TARG); + ccb = NULL; + } return (ccb); } @@ -1010,8 +1041,10 @@ struct targ_cmd_descr *descr; descr = malloc(sizeof(*descr), M_TARG, - M_WAITOK); - descr->mapinfo.num_bufs_used = 0; + M_NOWAIT); + if (descr) { + descr->mapinfo.num_bufs_used = 0; + } return (descr); } @@ -1091,8 +1124,11 @@ /* If we aborted anything from the work queue, wakeup user. */ if (!TAILQ_EMPTY(&softc->user_ccb_queue) - || !TAILQ_EMPTY(&softc->abort_queue)) + || !TAILQ_EMPTY(&softc->abort_queue)) { + cam_periph_unlock(softc->periph); notify_user(softc); + cam_periph_lock(softc->periph); + } } /* Notify the user that data is ready */ @@ -1185,3 +1221,25 @@ return (len); } + +/* + * work around to destroy targ device + * outside of targclose + */ +static void +targdestroy(void *dev) +{ + struct cdev *device = (struct cdev *)dev; + struct targ_softc *softc = (struct targ_softc *)device->si_drv1; + +#if 0 + callout_stop(&softc->destroy_dev_callout); +#endif + + mtx_unlock(&softc->destroy_mtx); + mtx_destroy(&softc->destroy_mtx); + free(softc, M_TARG); + device->si_drv1 = 0; + destroy_dev(device); + printf("%s: destroyed dev\n", __func__); +} >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 22 16:45:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5AC61065694; Tue, 22 Sep 2009 16:45: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 7A3881065676 for ; Tue, 22 Sep 2009 16:45:43 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 696F58FC08 for ; Tue, 22 Sep 2009 16:45: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 n8MGjhnS067504 for ; Tue, 22 Sep 2009 16:45:43 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8MGjhCb067502 for perforce@freebsd.org; Tue, 22 Sep 2009 16:45:43 GMT (envelope-from stas@freebsd.org) Date: Tue, 22 Sep 2009 16:45:43 GMT Message-Id: <200909221645.n8MGjhCb067502@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168783 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, 22 Sep 2009 16:45:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=168783 Change 168783 by stas@stas_yandex on 2009/09/22 16:45:41 - MAP_STACK mappings are anonymous mappings too. This fixes pthread-related failures in valgrind when it misses the allocated stack space. Affected files ... .. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-linux.c#7 edit .. //depot/projects/valgrind/include/vki/vki-freebsd.h#19 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-linux.c#7 (text+ko) ==== @@ -1993,13 +1993,13 @@ needDiscard = any_Ts_in_range( a, len ); init_nsegment( &seg ); - seg.kind = (flags & VKI_MAP_ANONYMOUS) ? SkAnonC : SkFileC; + seg.kind = (flags & (VKI_MAP_ANONYMOUS | VKI_MAP_STACK)) ? SkAnonC : SkFileC; seg.start = a; seg.end = a + len - 1; seg.hasR = toBool(prot & VKI_PROT_READ); seg.hasW = toBool(prot & VKI_PROT_WRITE); seg.hasX = toBool(prot & VKI_PROT_EXEC); - if (!(flags & VKI_MAP_ANONYMOUS)) { + if (!(flags & (VKI_MAP_ANONYMOUS | VKI_MAP_STACK))) { // Nb: We ignore offset requests in anonymous mmaps (see bug #126722) seg.offset = offset; if (ML_(am_get_fd_d_i_m)(fd, &dev, &ino, &mode)) { ==== //depot/projects/valgrind/include/vki/vki-freebsd.h#19 (text+ko) ==== @@ -1343,6 +1343,7 @@ #define VKI_MAP_PRIVATE 0x02 /* Changes are private */ #define VKI_MAP_FIXED 0x10 /* Interpret addr exactly */ #define VKI_MAP_NORESERVE 0x0040 /* don't check for reservations */ +#define VKI_MAP_STACK 0x400 #define VKI_MAP_ANON 0x1000 /* don't use a file */ #define VKI_MAP_ANONYMOUS VKI_MAP_ANON From owner-p4-projects@FreeBSD.ORG Tue Sep 22 18:19:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD04D10656CC; Tue, 22 Sep 2009 18:19: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 96DD11065696 for ; Tue, 22 Sep 2009 18:19:27 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 334168FC1E for ; Tue, 22 Sep 2009 18:19: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 n8MIJQ9f086359 for ; Tue, 22 Sep 2009 18:19:26 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8MIJQCe086357 for perforce@freebsd.org; Tue, 22 Sep 2009 18:19:26 GMT (envelope-from mav@freebsd.org) Date: Tue, 22 Sep 2009 18:19:26 GMT Message-Id: <200909221819.n8MIJQCe086357@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 Cc: Subject: PERFORCE change 168788 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, 22 Sep 2009 18:19:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=168788 Change 168788 by mav@mav_mavtest on 2009/09/22 18:18:39 Reduce code duplication. Affected files ... .. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#22 edit Differences ... ==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#22 (text+ko) ==== @@ -1055,23 +1055,22 @@ printf("\n"); printf("PIO supported PIO"); - if (parm->atavalid & ATA_FLAG_64_70) { - if (parm->apiomodes & 0x02) - printf("4"); - else if (parm->apiomodes & 0x01) - printf("3"); - } else if (parm->mwdmamodes & 0x04) + switch (ata_max_pmode(parm)) { + case ATA_PIO4: printf("4"); - else if (parm->mwdmamodes & 0x02) + break; + case ATA_PIO3: printf("3"); - else if (parm->mwdmamodes & 0x01) + break; + case ATA_PIO2: printf("2"); - else if ((parm->retired_piomode & ATA_RETIRED_PIO_MASK) == 0x200) - printf("2"); - else if ((parm->retired_piomode & ATA_RETIRED_PIO_MASK) == 0x100) + break; + case ATA_PIO1: printf("1"); - else + break; + default: printf("0"); + } printf("\n"); printf("DMA%ssupported ", From owner-p4-projects@FreeBSD.ORG Tue Sep 22 20:25:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BEEF1065672; Tue, 22 Sep 2009 20:25:47 +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 1F855106566C for ; Tue, 22 Sep 2009 20:25:47 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0F6438FC0C for ; Tue, 22 Sep 2009 20:25:47 +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 n8MKPkSM097410 for ; Tue, 22 Sep 2009 20:25:46 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8MKPkjN097408 for perforce@freebsd.org; Tue, 22 Sep 2009 20:25:46 GMT (envelope-from mav@freebsd.org) Date: Tue, 22 Sep 2009 20:25:46 GMT Message-Id: <200909222025.n8MKPkjN097408@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 Cc: Subject: PERFORCE change 168796 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, 22 Sep 2009 20:25:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=168796 Change 168796 by mav@mav_mavtest on 2009/09/22 20:25:10 If on sense request device returns no sence, give up and return, or we may loop forever. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#34 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#34 (text+ko) ==== @@ -1033,8 +1033,13 @@ cam_error_print(saved_ccb, CAM_ESF_ALL, CAM_EPF_ALL); #endif - xpt_done_ccb = TRUE; + } else { + saved_ccb->ccb_h.status &= + ~CAM_STATUS_MASK; + saved_ccb->ccb_h.status |= + CAM_AUTOSENSE_FAIL; } + xpt_done_ccb = TRUE; } } bcopy(done_ccb->ccb_h.saved_ccb_ptr, done_ccb, From owner-p4-projects@FreeBSD.ORG Tue Sep 22 21:56:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF6B21065676; Tue, 22 Sep 2009 21:56: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 85D5C106566C for ; Tue, 22 Sep 2009 21:56:26 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 75DBF8FC08 for ; Tue, 22 Sep 2009 21:56: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 n8MLuQUf015303 for ; Tue, 22 Sep 2009 21:56:26 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8MLuQOO015301 for perforce@freebsd.org; Tue, 22 Sep 2009 21:56:26 GMT (envelope-from mav@freebsd.org) Date: Tue, 22 Sep 2009 21:56:26 GMT Message-Id: <200909222156.n8MLuQOO015301@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 Cc: Subject: PERFORCE change 168798 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, 22 Sep 2009 21:56:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=168798 Change 168798 by mav@mav_mavtest on 2009/09/22 21:55:38 Lock bus scan. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/vpo.c#10 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ppbus/vpo.c#10 (text+ko) ==== @@ -176,9 +176,6 @@ return (ENXIO); } ppb_unlock(ppbus); - - /* all went ok */ - vpo_cam_rescan(vpo); /* have CAM rescan the bus */ return (0); @@ -194,12 +191,15 @@ static void vpo_cam_rescan(struct vpo_data *vpo) { + device_t ppbus = device_get_parent(vpo->vpo_dev); struct cam_path *path; union ccb *ccb = malloc(sizeof(union ccb), M_TEMP, M_WAITOK | M_ZERO); + ppb_lock(ppbus); if (xpt_create_path(&path, xpt_periph, cam_sim_path(vpo->sim), 0, 0) != CAM_REQ_CMP) { /* A failure is benign as the user can do a manual rescan */ + ppb_unlock(ppbus); free(ccb, M_TEMP); return; } @@ -209,6 +209,7 @@ ccb->ccb_h.cbfcnp = vpo_cam_rescan_callback; ccb->crcn.flags = CAM_FLAG_NONE; xpt_action(ccb); + ppb_unlock(ppbus); /* The scan is in progress now. */ } From owner-p4-projects@FreeBSD.ORG Tue Sep 22 22:29:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 877E91065696; Tue, 22 Sep 2009 22:29:02 +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 4BE86106568B for ; Tue, 22 Sep 2009 22:29:02 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3BE798FC1A for ; Tue, 22 Sep 2009 22:29:02 +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 n8MMT2U2018664 for ; Tue, 22 Sep 2009 22:29:02 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8MMT2vH018662 for perforce@freebsd.org; Tue, 22 Sep 2009 22:29:02 GMT (envelope-from mav@freebsd.org) Date: Tue, 22 Sep 2009 22:29:02 GMT Message-Id: <200909222229.n8MMT2vH018662@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 Cc: Subject: PERFORCE change 168800 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, 22 Sep 2009 22:29:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=168800 Change 168800 by mav@mav_mavbook on 2009/09/22 22:28:20 Fix missed conflict resolve. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#22 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#22 (text+ko) ==== @@ -24,13 +24,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. * ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/ahci/ahci.h#1 - * $FreeBSD: src/sys/dev/ahci/ahci.h,v 1.1 2009/07/10 08:18:08 scottl Exp $ -==== THEIRS //depot/vendor/freebsd/src/sys/dev/ahci/ahci.h#2 * $FreeBSD: src/sys/dev/ahci/ahci.h,v 1.2 2009/08/30 15:20:13 mav Exp $ -==== YOURS //mav_mavbook/scottl-camlock/src/sys/dev/ahci/ahci.h - * $FreeBSD$ -<<<< */ /* ATA register defines */ From owner-p4-projects@FreeBSD.ORG Wed Sep 23 10:15:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9900B106568B; Wed, 23 Sep 2009 10:15: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 4544A106566B for ; Wed, 23 Sep 2009 10:15:54 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 342A58FC13 for ; Wed, 23 Sep 2009 10:15: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 n8NAFsTs012366 for ; Wed, 23 Sep 2009 10:15:54 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8NAFrWa012364 for perforce@freebsd.org; Wed, 23 Sep 2009 10:15:53 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 23 Sep 2009 10:15:53 GMT Message-Id: <200909231015.n8NAFrWa012364@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 Cc: Subject: PERFORCE change 168808 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: Wed, 23 Sep 2009 10:15:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=168808 Change 168808 by pgj@beehive on 2009/09/23 10:15:35 IFC Affected files ... .. //depot/projects/docproj_hu/doc/share/sgml/mirrors.xml#11 integrate .. //depot/projects/docproj_hu/www/hu/platforms/sparc.sgml#15 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#69 integrate Differences ... ==== //depot/projects/docproj_hu/doc/share/sgml/mirrors.xml#11 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.85 2009/09/20 13:25:06 erwin Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.86 2009/09/23 08:19:30 erwin Exp $ @@ -102,6 +102,7 @@ ftp14.FreeBSD.org ftp://ftp14.FreeBSD.org/pub/FreeBSD/ + ftp://ftp14.FreeBSD.org/pub/FreeBSD/ @@ -186,6 +187,8 @@ ftp1.am.FreeBSD.org ftp://ftp1.am.FreeBSD.org/pub/FreeBSD/ + http://ftp1.am.FreeBSD.org/pub/FreeBSD/ + @@ -320,6 +323,7 @@ ftp2.br.FreeBSD.org ftp://ftp2.br.FreeBSD.org/pub/FreeBSD/ + http://ftp2.br.FreeBSD.org/pub/FreeBSD/ @@ -1177,6 +1181,7 @@ ftp.lt.FreeBSD.org ftp://ftp.lt.FreeBSD.org/pub/FreeBSD/ + http://ftp.lt.FreeBSD.org/pub/FreeBSD/ @@ -1423,6 +1428,8 @@ ftp1.ro.FreeBSD.org ftp://ftp1.ro.FreeBSD.org/pub/FreeBSD/ + http://ftp1.ro.FreeBSD.org/pub/FreeBSD/ + http://ftp1.ro.FreeBSD.org/pub/FreeBSD/ @@ -1789,6 +1796,7 @@ ftp.ch.FreeBSD.org ftp://ftp.ch.FreeBSD.org/pub/FreeBSD/ + http://ftp.ch.FreeBSD.org/pub/FreeBSD/ ==== //depot/projects/docproj_hu/www/hu/platforms/sparc.sgml#15 (text+ko) ==== @@ -1,6 +1,6 @@ - + ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#69 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.270 2009/09/16 15:41:40 miwi Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.271 2009/09/21 20:05:13 blackend Exp $ @@ -36,6 +36,23 @@ 9 + 21 + + + &os; 8.0-RC1 Available + +

    The first of the Release Candidates for the &os;-8.0 + release cycle is now available. ISO images for Tier-1 + architectures and a memory stick image for + amd64/i386 are now available + on most of the &os; + mirror sites.

    +     +     + + 15

    New committer: Wen From owner-p4-projects@FreeBSD.ORG Wed Sep 23 10:30:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E7831065676; Wed, 23 Sep 2009 10:30: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 E7464106566C for ; Wed, 23 Sep 2009 10:30:09 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D748C8FC13 for ; Wed, 23 Sep 2009 10:30: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 n8NAU9DX013374 for ; Wed, 23 Sep 2009 10:30:09 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8NAU9NP013372 for perforce@freebsd.org; Wed, 23 Sep 2009 10:30:09 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 23 Sep 2009 10:30:09 GMT Message-Id: <200909231030.n8NAU9NP013372@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 Cc: Subject: PERFORCE change 168809 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: Wed, 23 Sep 2009 10:30:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=168809 Change 168809 by pgj@beehive on 2009/09/23 10:29:28 MFen (www): 1.270 -> 1.271 hu/share/sgml/news.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#52 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#52 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,25 @@ 9 + 21 + + + Megjelent a &os; 8.0-RC1! + +

    Megjelent a &os;-8.0 kiadási ciklusának + elsõ kiadásra jelölt változata. A + legtöbb &os; + tükrözésrõl mostantól letölthetõek + ISO lemezképek az összes Tier 1 + architektúrára, valamint pendrive + formátumú telepítõkészletek + amd64 és i386 architektúrákra.

    +     +     + + 15 From owner-p4-projects@FreeBSD.ORG Wed Sep 23 14:15:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED2D61065697; Wed, 23 Sep 2009 14:15: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 B1BC3106568D for ; Wed, 23 Sep 2009 14:15:16 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A051A8FC2E for ; Wed, 23 Sep 2009 14:15: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 n8NEFG67044569 for ; Wed, 23 Sep 2009 14:15:16 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8NEFGQF044567 for perforce@freebsd.org; Wed, 23 Sep 2009 14:15:16 GMT (envelope-from stas@freebsd.org) Date: Wed, 23 Sep 2009 14:15:16 GMT Message-Id: <200909231415.n8NEFGQF044567@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168816 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: Wed, 23 Sep 2009 14:15:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=168816 Change 168816 by stas@stas_yandex on 2009/09/23 14:15:03 - Fix pthread_barrier check. Affected files ... .. //depot/projects/valgrind/configure.in#15 edit Differences ... ==== //depot/projects/valgrind/configure.in#15 (text+ko) ==== @@ -1547,6 +1547,8 @@ AC_CHECK_LIB([rt], [clock_gettime]) +safe_CFLAGS=$CFLAGS +CFLAGS="${CFLAGS} -pthread" AC_CHECK_FUNCS([ \ clock_gettime\ epoll_create \ @@ -1577,6 +1579,7 @@ timerfd \ utimensat \ ]) +CFLAGS=$safe_CFLAGS # AC_CHECK_LIB adds any library found to the variable LIBS, and links these # libraries with any shared object and/or executable. This is NOT what we From owner-p4-projects@FreeBSD.ORG Wed Sep 23 14:21:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 820A5106568B; Wed, 23 Sep 2009 14:21:23 +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 46A95106566C for ; Wed, 23 Sep 2009 14:21:23 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 358828FC18 for ; Wed, 23 Sep 2009 14:21:23 +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 n8NELNCN045081 for ; Wed, 23 Sep 2009 14:21:23 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8NELNek045079 for perforce@freebsd.org; Wed, 23 Sep 2009 14:21:23 GMT (envelope-from stas@freebsd.org) Date: Wed, 23 Sep 2009 14:21:23 GMT Message-Id: <200909231421.n8NELNek045079@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168817 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: Wed, 23 Sep 2009 14:21:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=168817 Change 168817 by stas@stas_yandex on 2009/09/23 14:21:00 - Fix hellgrind build. Affected files ... .. //depot/projects/valgrind/helgrind/hg_intercepts.c#4 edit Differences ... ==== //depot/projects/valgrind/helgrind/hg_intercepts.c#4 (text+ko) ==== @@ -1159,7 +1159,7 @@ //----------------------------------------------------------- // glibc: pthread_spin_destroy // darwin: (doesn't appear to exist) -#if defined(VGO_linux) +#if defined(VGO_linux) || defined(VGO_freebsd) PTH_FUNC(int, pthreadZuspinZudestroy, // pthread_spin_destroy pthread_spinlock_t* lock) @@ -1196,7 +1196,7 @@ //----------------------------------------------------------- // glibc: pthread_spin_lock // darwin: (doesn't appear to exist) -#if defined(VGO_linux) +#if defined(VGO_linux) || defined(VGO_freebsd) PTH_FUNC(int, pthreadZuspinZulock, // pthread_spin_lock pthread_spinlock_t* lock) @@ -1241,7 +1241,7 @@ //----------------------------------------------------------- // glibc: pthread_spin_trylock // darwin: (doesn't appear to exist) -#if defined(VGO_linux) +#if defined(VGO_linux) || defined(VGO_freebsd) PTH_FUNC(int, pthreadZuspinZutrylock, // pthread_spin_trylock pthread_spinlock_t* lock) From owner-p4-projects@FreeBSD.ORG Wed Sep 23 14:24:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10E421065672; Wed, 23 Sep 2009 14:24: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 C99F4106566B for ; Wed, 23 Sep 2009 14:24:26 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9ECEF8FC2E for ; Wed, 23 Sep 2009 14:24: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 n8NEOQsr045289 for ; Wed, 23 Sep 2009 14:24:26 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8NEOQKV045287 for perforce@freebsd.org; Wed, 23 Sep 2009 14:24:26 GMT (envelope-from stas@freebsd.org) Date: Wed, 23 Sep 2009 14:24:26 GMT Message-Id: <200909231424.n8NEOQKV045287@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168818 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: Wed, 23 Sep 2009 14:24:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=168818 Change 168818 by stas@stas_yandex on 2009/09/23 14:24:18 - Fix hellgrind test suite build. Affected files ... .. //depot/projects/valgrind/helgrind/tests/tc20_verifywrap.c#3 edit Differences ... ==== //depot/projects/valgrind/helgrind/tests/tc20_verifywrap.c#3 (text+ko) ==== @@ -18,7 +18,7 @@ #include #include -#if !defined(_AIX) && !defined(__APPLE__) +#if !defined(_AIX) && !defined(__APPLE__) && !defined(__FreeBSD__) #if !defined(__GLIBC_PREREQ) # error "This program needs __GLIBC_PREREQ (in /usr/include/features.h)" From owner-p4-projects@FreeBSD.ORG Wed Sep 23 15:45:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F4531065672; Wed, 23 Sep 2009 15:45: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 53B7610656BB for ; Wed, 23 Sep 2009 15:45:56 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2917E8FC27 for ; Wed, 23 Sep 2009 15:45:56 +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 n8NFjumM052984 for ; Wed, 23 Sep 2009 15:45:56 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8NFjuAJ052982 for perforce@freebsd.org; Wed, 23 Sep 2009 15:45:56 GMT (envelope-from trasz@freebsd.org) Date: Wed, 23 Sep 2009 15:45:56 GMT Message-Id: <200909231545.n8NFjuAJ052982@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 168825 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: Wed, 23 Sep 2009 15:45:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=168825 Change 168825 by trasz@trasz_victim on 2009/09/23 15:45:08 Rename. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/aclfuzzer.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/fuzzer.sh#5 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Sep 23 15:46:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE79310656B0; Wed, 23 Sep 2009 15:46:57 +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 99EC210656A7 for ; Wed, 23 Sep 2009 15:46:57 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 87FAE8FC1F for ; Wed, 23 Sep 2009 15:46:57 +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 n8NFkv2x053056 for ; Wed, 23 Sep 2009 15:46:57 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8NFkvt8053054 for perforce@freebsd.org; Wed, 23 Sep 2009 15:46:57 GMT (envelope-from trasz@freebsd.org) Date: Wed, 23 Sep 2009 15:46:57 GMT Message-Id: <200909231546.n8NFkvt8053054@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 168827 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: Wed, 23 Sep 2009 15:46:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=168827 Change 168827 by trasz@trasz_victim on 2009/09/23 15:46:19 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#42 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/camcontrol/camcontrol.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/procfs.5#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_periph.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#35 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#53 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/newvers.sh#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpi_support/acpi_aiboost.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_video.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/atkbdc/atkbd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/vesa.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/pmc_events.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pci.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/vpo.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/twe/twe.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/twe/twevar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/procfs/procfs.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/procfs/procfs.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/procfs/procfs_osrel.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/machdep.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_event.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/procfs/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.h#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_hwmp.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_mesh.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_mesh.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/event.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#37 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_gjournal.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/00.t#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/sockets/accf_data_attach/accf_data_attach.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/gcore/elfcore.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/inet.c#10 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#42 (text+ko) ==== @@ -22,6 +22,10 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090922: + 802.11s D3.03 support was committed. This is incompatible with the + previous code, which was based on D3.0. + 20090910: ZFS snapshots are now mounted with MNT_IGNORE flag. Use -v option for mount(8) and -a option for df(1) to see them. @@ -975,4 +979,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.639 2009/09/14 21:10:40 pjd Exp $ +$FreeBSD: src/UPDATING,v 1.640 2009/09/22 18:19:18 rpaulo Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/camcontrol/camcontrol.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.63 2009/09/04 18:21:40 mav Exp $"); +__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.64 2009/09/22 22:17:14 mav Exp $"); #include #include @@ -1055,23 +1055,22 @@ printf("\n"); printf("PIO supported PIO"); - if (parm->atavalid & ATA_FLAG_64_70) { - if (parm->apiomodes & 0x02) - printf("4"); - else if (parm->apiomodes & 0x01) - printf("3"); - } else if (parm->mwdmamodes & 0x04) + switch (ata_max_pmode(parm)) { + case ATA_PIO4: printf("4"); - else if (parm->mwdmamodes & 0x02) + break; + case ATA_PIO3: printf("3"); - else if (parm->mwdmamodes & 0x01) + break; + case ATA_PIO2: printf("2"); - else if ((parm->retired_piomode & ATA_RETIRED_PIO_MASK) == 0x200) - printf("2"); - else if ((parm->retired_piomode & ATA_RETIRED_PIO_MASK) == 0x100) + break; + case ATA_PIO1: printf("1"); - else + break; + default: printf("0"); + } printf("\n"); printf("DMA%ssupported ", ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/procfs.5#3 (text+ko) ==== @@ -1,8 +1,8 @@ -.\" $FreeBSD: src/share/man/man5/procfs.5,v 1.34 2009/07/09 16:40:00 trasz Exp $ +.\" $FreeBSD: src/share/man/man5/procfs.5,v 1.35 2009/09/23 12:10:13 kib Exp $ .\" Written by Garrett Wollman .\" This file is in the public domain. .\" -.Dd July 9, 2009 +.Dd September 22, 2009 .Dt PROCFS 5 .Os .Sh NAME @@ -117,6 +117,12 @@ .It Pa notepg Used for sending signal to the process group. Not implemented. +.It Pa osrel +Allows read and write of the kernel osrel value assigned to the process. +It affects the compatibility shims that are turned on and off +depending on the value. +Initial process value is read from the ABI note tag in the executed ELF image, +and is zero if the tag not supported by binary format or was not found. .It Pa regs Allows read and write access to the process' register set. This file contains a binary data structure @@ -237,6 +243,8 @@ used for signaling the process .It Pa /proc/curproc/notepg used for signaling the process group +.It Pa /proc/curproc/osrel +the process osrel value .It Pa /proc/curproc/regs the process register set .It Pa /proc/curproc/rlimit ==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/machdep.c#14 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.709 2009/08/20 22:58:05 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.710 2009/09/22 16:51:00 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1192,6 +1192,77 @@ u_int basemem; +static int +add_smap_entry(struct bios_smap *smap, vm_paddr_t *physmap, int *physmap_idxp) +{ + int i, insert_idx, physmap_idx; + + physmap_idx = *physmap_idxp; + + if (boothowto & RB_VERBOSE) + printf("SMAP type=%02x base=%016lx len=%016lx\n", + smap->type, smap->base, smap->length); + + if (smap->type != SMAP_TYPE_MEMORY) + return (1); + + if (smap->length == 0) + return (0); + + /* + * Find insertion point while checking for overlap. Start off by + * assuming the new entry will be added to the end. + */ + insert_idx = physmap_idx + 2; + for (i = 0; i <= physmap_idx; i += 2) { + if (smap->base < physmap[i + 1]) { + if (smap->base + smap->length <= physmap[i]) { + insert_idx = i; + break; + } + if (boothowto & RB_VERBOSE) + printf( + "Overlapping memory regions, ignoring second region\n"); + return (1); + } + } + + /* See if we can prepend to the next entry. */ + if (insert_idx <= physmap_idx && + smap->base + smap->length == physmap[insert_idx]) { + physmap[insert_idx] = smap->base; + return (1); + } + + /* See if we can append to the previous entry. */ + if (insert_idx > 0 && smap->base == physmap[insert_idx - 1]) { + physmap[insert_idx - 1] += smap->length; + return (1); + } + + physmap_idx += 2; + *physmap_idxp = physmap_idx; + if (physmap_idx == PHYSMAP_SIZE) { + printf( + "Too many segments in the physical address map, giving up\n"); + return (0); + } + + /* + * Move the last 'N' entries down to make room for the new + * entry if needed. + */ + for (i = physmap_idx; i > insert_idx; i -= 2) { + physmap[i] = physmap[i - 2]; + physmap[i + 1] = physmap[i - 1]; + } + + /* Insert the new entry. */ + physmap[insert_idx] = smap->base; + physmap[insert_idx + 1] = smap->base + smap->length; + return (1); +} + /* * Populate the (physmap) array with base/bound pairs describing the * available physical memory in the system, then test this memory and @@ -1235,40 +1306,9 @@ smapsize = *((u_int32_t *)smapbase - 1); smapend = (struct bios_smap *)((uintptr_t)smapbase + smapsize); - for (smap = smapbase; smap < smapend; smap++) { - if (boothowto & RB_VERBOSE) - printf("SMAP type=%02x base=%016lx len=%016lx\n", - smap->type, smap->base, smap->length); - - if (smap->type != SMAP_TYPE_MEMORY) - continue; - - if (smap->length == 0) - continue; - - for (i = 0; i <= physmap_idx; i += 2) { - if (smap->base < physmap[i + 1]) { - if (boothowto & RB_VERBOSE) - printf( - "Overlapping or non-monotonic memory region, ignoring second region\n"); - continue; - } - } - - if (smap->base == physmap[physmap_idx + 1]) { - physmap[physmap_idx + 1] += smap->length; - continue; - } - - physmap_idx += 2; - if (physmap_idx == PHYSMAP_SIZE) { - printf( - "Too many segments in the physical address map, giving up\n"); + for (smap = smapbase; smap < smapend; smap++) + if (!add_smap_entry(smap, physmap, &physmap_idx)) break; - } - physmap[physmap_idx] = smap->base; - physmap[physmap_idx + 1] = smap->base + smap->length; - } /* * Find the 'base memory' segment for SMP ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_periph.c#9 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.80 2009/07/10 08:18:08 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.81 2009/09/22 22:23:52 mav Exp $"); #include #include @@ -1034,8 +1034,13 @@ cam_error_print(saved_ccb, CAM_ESF_ALL, CAM_EPF_ALL); #endif - xpt_done_ccb = TRUE; + } else { + saved_ccb->ccb_h.status &= + ~CAM_STATUS_MASK; + saved_ccb->ccb_h.status |= + CAM_AUTOSENSE_FAIL; } + xpt_done_ccb = TRUE; } } bcopy(done_ccb->ccb_h.saved_ccb_ptr, done_ccb, ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#7 (text+ko) ==== @@ -1841,7 +1841,7 @@ fgid = zfs_fuid_create_cred(zfsvfs, ZFS_GROUP, tx, cr, fuidp); #ifdef __FreeBSD__ - gid = parent->z_phys->zp_gid; + gid = fgid = parent->z_phys->zp_gid; #else gid = crgetgid(cr); #endif ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#35 (text+ko) ==== @@ -4860,7 +4860,7 @@ vsecattr_t vsecattr; if (ap->a_type != ACL_TYPE_NFS4) - return (EOPNOTSUPP); + return (EINVAL); vsecattr.vsa_mask = VSA_ACE | VSA_ACECNT; if (error = zfs_getsecattr(ap->a_vp, &vsecattr, 0, ap->a_cred, NULL)) @@ -4889,7 +4889,7 @@ aclent_t *aaclp; if (ap->a_type != ACL_TYPE_NFS4) - return (EOPNOTSUPP); + return (EINVAL); if (ap->a_aclp->acl_cnt < 1 || ap->a_aclp->acl_cnt > MAX_ACL_ENTRIES) return (EINVAL); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#53 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1470 2009/09/22 15:15:03 trasz Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1472 2009/09/23 12:08:08 kib Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1792,6 +1792,7 @@ fs/procfs/procfs_map.c optional procfs fs/procfs/procfs_mem.c optional procfs fs/procfs/procfs_note.c optional procfs +fs/procfs/procfs_osrel.c optional procfs fs/procfs/procfs_regs.c optional procfs fs/procfs/procfs_rlimit.c optional procfs fs/procfs/procfs_status.c optional procfs @@ -2634,7 +2635,7 @@ ufs/ufs/ufs_bmap.c optional ffs ufs/ufs/ufs_dirhash.c optional ffs ufs/ufs/ufs_extattr.c optional ffs -ufs/ufs/ufs_gjournal.c optional ffs +ufs/ufs/ufs_gjournal.c optional ffs UFS_GJOURNAL ufs/ufs/ufs_inode.c optional ffs ufs/ufs/ufs_lookup.c optional ffs ufs/ufs/ufs_quota.c optional ffs ==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/newvers.sh#11 (text+ko) ==== @@ -28,7 +28,7 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.86 2009/09/19 21:46:12 mlaier Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.87 2009/09/23 14:48:13 mlaier Exp $ TYPE="FreeBSD" REVISION="9.0" @@ -114,9 +114,16 @@ svn=`$git_cmd svn find-rev $git 2>/dev/null` if [ -n "$svn" ] ; then svn=" r${svn}" - git="-${git}" + git="=${git}" else - git=" ${git}" + svn=`$git_cmd log | fgrep 'git-svn-id:' | head -1 | \ + sed -n 's/^.*@\([0-9][0-9]*\).*$/\1/p'` + if [ -n $svn ] ; then + svn=" r${svn}" + git="+${git}" + else + git=" ${git}" + fi fi if $git_cmd --work-tree=${SRCDIR} diff-index \ --name-only HEAD | read dummy; then ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpi_support/acpi_aiboost.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_aiboost.c,v 1.4 2009/06/05 18:44:36 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_aiboost.c,v 1.5 2009/09/22 18:34:23 jhb Exp $"); #include "opt_acpi.h" #include @@ -46,7 +46,6 @@ #define DESCSTRLEN 32 struct acpi_aiboost_element{ - ACPI_HANDLE h; uint32_t id; char desc[DESCSTRLEN]; }; @@ -127,22 +126,23 @@ for(i = 1 ; i < o->Package.Count; i++){ elem = &o->Package.Elements[i]; - if(elem->Type != ACPI_TYPE_ANY){ - printf("NOREF\n"); - goto error; - } - c->elem[ i - 1].h = elem->Reference.Handle; + if (elem->Type == ACPI_TYPE_ANY) { + buf2.Pointer = NULL; + buf2.Length = ACPI_ALLOCATE_BUFFER; - buf2.Pointer = NULL; - buf2.Length = ACPI_ALLOCATE_BUFFER; - - status = AcpiEvaluateObject(c->elem[i - 1].h, NULL, NULL, - &buf2); - if(ACPI_FAILURE(status)){ - printf("FETCH OBJECT\n"); + status = AcpiEvaluateObject(elem->Reference.Handle, + NULL, NULL, &buf2); + if (ACPI_FAILURE(status)){ + printf("FETCH OBJECT\n"); + goto error; + } + subobj = buf2.Pointer; + } else if (elem->Type == ACPI_TYPE_PACKAGE) + subobj = elem; + else { + printf("NO PACKAGE\n"); goto error; } - subobj = buf2.Pointer; if(ACPI_FAILURE(acpi_PkgInt32(subobj,0, &c->elem[i -1].id))){ printf("ID FAILED\n"); goto error; @@ -151,15 +151,17 @@ sizeof(c->elem[i - 1].desc)); if(ACPI_FAILURE(status)){ if(status == E2BIG){ - c->elem[i-1].desc[DESCSTRLEN-1] = 0; + c->elem[i - 1].desc[DESCSTRLEN-1] = 0; }else{ printf("DESC FAILED %d\n", i-1); goto error; } } - if(buf2.Pointer) - AcpiOsFree(buf2.Pointer); + if (buf2.Pointer) { + AcpiOsFree(buf2.Pointer); + buf2.Pointer = NULL; + } } if(buf.Pointer) ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_video.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_video.c,v 1.14 2009/06/05 18:44:36 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_video.c,v 1.15 2009/09/23 15:39:54 jhb Exp $"); #include #include @@ -282,8 +282,7 @@ acpi_video_notify_handler); ACPI_SERIAL_BEGIN(video); - for (vo = STAILQ_FIRST(&sc->vid_outputs); vo != NULL; vo = vn) { - vn = STAILQ_NEXT(vo, vo_next); + STAILQ_FOREACH_SAFE(vo, &sc->vid_outputs, vo_next, vn) { acpi_video_vo_destroy(vo); } ACPI_SERIAL_END(video); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/atkbdc/atkbd.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd.c,v 1.55 2009/09/21 08:24:22 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd.c,v 1.56 2009/09/22 20:12:10 delphij Exp $"); #include "opt_compat.h" #include "opt_kbd.h" @@ -44,7 +44,7 @@ #include #include -#if defined(__i386__) || defined(__amd64__) +#if 0 #include #include #include @@ -1089,7 +1089,7 @@ static int get_typematic(keyboard_t *kbd) { -#if defined(__i386__) || defined(__amd64__) +#if 0 /* * Only some systems allow us to retrieve the keyboard repeat * rate previously set via the BIOS... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/vesa.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fb/vesa.c,v 1.5 2009/09/21 08:53:26 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fb/vesa.c,v 1.6 2009/09/23 02:45:02 delphij Exp $"); #include "opt_vga.h" #include "opt_vesa.h" @@ -221,6 +221,7 @@ { x86regs_t regs; + bzero(®s, sizeof(regs)); regs.R_EAX = 0x0000 | mode; x86biosCall(®s, 0x10); @@ -236,6 +237,7 @@ int offs; u_char *buf; + bzero(®s, sizeof(regs)); regs.R_EAX = 0x4f01; regs.R_ECX = mode; @@ -263,6 +265,7 @@ { x86regs_t regs; + bzero(®s, sizeof(regs)); regs.R_EAX = 0x4f02; regs.R_EBX = mode; @@ -276,6 +279,7 @@ { x86regs_t regs; + bzero(®s, sizeof(regs)); regs.R_EAX = 0x4f08; regs.R_EBX = 1; @@ -292,6 +296,7 @@ { x86regs_t regs; + bzero(®s, sizeof(regs)); regs.R_EAX = 0x4f08; regs.R_EBX = (bits << 8); @@ -311,6 +316,7 @@ u_char *p; int i; + bzero(®s, sizeof(regs)); regs.R_EAX = 0x4f09; regs.R_EBX = 1; regs.R_ECX = colors; @@ -349,6 +355,7 @@ u_char *p; int i; + bzero(®s, sizeof(regs)); regs.R_EAX = 0x4f09; regs.R_EBX = 1; regs.R_ECX = colors; @@ -396,6 +403,7 @@ p[i*4 + 3] = 0; } + bzero(®s, sizeof(regs)); regs.R_EAX = 0x4f09; regs.R_EBX = 0; regs.R_ECX = colors; @@ -431,6 +439,7 @@ p[i*4 + 3] = 0; } + bzero(®s, sizeof(regs)); regs.R_EAX = 0x4f09; regs.R_EBX = 0; regs.R_ECX = colors; @@ -452,6 +461,7 @@ { x86regs_t regs; + bzero(®s, sizeof(regs)); regs.R_EAX = 0x4f04; regs.R_ECX = STATE_ALL; regs.R_EDX = STATE_SIZE; @@ -474,6 +484,7 @@ if (size > VESA_BIOS_BUFSIZE) return (1); + bzero(®s, sizeof(regs)); regs.R_EAX = 0x4f04; regs.R_ECX = STATE_ALL; regs.R_EDX = code; @@ -499,6 +510,7 @@ { x86regs_t regs; + bzero(®s, sizeof(regs)); regs.R_EAX = 0x4f06; regs.R_EBX = 1; @@ -515,6 +527,7 @@ { x86regs_t regs; + bzero(®s, sizeof(regs)); regs.R_EAX = 0x4f06; regs.R_EBX = 0; regs.R_ECX = pixel; @@ -541,6 +554,7 @@ { x86regs_t regs; + bzero(®s, sizeof(regs)); regs.R_EAX = 0x4f07; regs.R_EBX = 1; @@ -561,6 +575,7 @@ { x86regs_t regs; + bzero(®s, sizeof(regs)); regs.R_EAX = 0x4f07; regs.R_EBX = 0x80; regs.R_EDX = y; @@ -662,6 +677,7 @@ vmbuf = (u_char *)x86biosAlloc(1, &offs); bcopy("VBE2", vmbuf, 4); /* try for VBE2 data */ + bzero(®s, sizeof(regs)); regs.R_EAX = 0x4f00; regs.R_ES = SEG_ADDR(offs); regs.R_DI = SEG_OFF(offs); @@ -1262,6 +1278,7 @@ { x86regs_t regs; + bzero(®s, sizeof(regs)); regs.R_EAX = 0x4f05; regs.R_EBX = 0x10; @@ -1296,6 +1313,7 @@ if (adp->va_window_gran == 0) return 1; + bzero(®s, sizeof(regs)); regs.R_EAX = 0x4f05; regs.R_EBX = 0; regs.R_EDX = offset / adp->va_window_gran; @@ -1304,6 +1322,7 @@ if ((regs.R_AX & 0xff) != 0x4f) return 1; + bzero(®s, sizeof(regs)); regs.R_EAX = 0x4f05; regs.R_EBX = 1; regs.R_EDX = offset / adp->va_window_gran; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/pmc_events.h#7 (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/dev/hwpmc/pmc_events.h,v 1.10 2009/09/01 17:55:37 gnn Exp $ + * $FreeBSD: src/sys/dev/hwpmc/pmc_events.h,v 1.11 2009/09/22 17:45:28 rpaulo Exp $ */ #ifndef _DEV_HWPMC_PMC_EVENTS_H_ @@ -1979,7 +1979,31 @@ #define PMC_EV_TSC_FIRST PMC_EV_TSC_TSC #define PMC_EV_TSC_LAST PMC_EV_TSC_TSC + /* + * Intel XScale events from "Intel XScale Core Developer's Manual", + * January 2004, #27347302 + */ +#define __PMC_EV_XSCALE() \ + __PMC_EV(XSCALE, IC_FETCH) \ + __PMC_EV(XSCALE, IC_MISS) \ + __PMC_EV(XSCALE, DATA_DEPENDENCY_STALL) \ + __PMC_EV(XSCALE, ITLB_MISS) \ + __PMC_EV(XSCALE, DTLB_MISS) \ + __PMC_EV(XSCALE, BRANCH_EXECUTED) \ + __PMC_EV(XSCALE, BRANCH_MISPRED) \ + __PMC_EV(XSCALE, INSTR_EXECUTED) \ + __PMC_EV(XSCALE, DC_FULL_CYCLE) \ + __PMC_EV(XSCALE, DC_FULL_CONTIG) \ + __PMC_EV(XSCALE, DC_ACCESS) \ + __PMC_EV(XSCALE, DC_MISS) \ + __PMC_EV(XSCALE, DC_WRITEBACK) \ + __PMC_EV(XSCALE, PC_CHANGE) + +#define PMC_EV_XSCALE_FIRST PMC_EV_XSCALE_IC_FETCH +#define PMC_EV_XSCALE_LAST PMC_EV_XSCALE_PC_CHANGE + +/* * All known PMC events. * * PMC event numbers are allocated sparsely to allow new PMC events to @@ -1996,6 +2020,7 @@ * 0x11000 0x0080 INTEL Pentium 4 events * 0x11080 0x0080 INTEL Pentium MMX events * 0x11100 0x0100 INTEL Pentium Pro/P-II/P-III/Pentium-M events + * 0x11200 0x00FF INTEL XScale events */ #define __PMC_EVENTS() \ __PMC_EV_BLOCK(TSC, 0x01000) \ @@ -2013,9 +2038,11 @@ __PMC_EV_BLOCK(P5, 0x11080) \ __PMC_EV_P5() \ __PMC_EV_BLOCK(P6, 0x11100) \ - __PMC_EV_P6() + __PMC_EV_P6() \ + __PMC_EV_BLOCK(XSCALE, 0x11200) \ + __PMC_EV_XSCALE() #define PMC_EVENT_FIRST PMC_EV_TSC_TSC -#define PMC_EVENT_LAST PMC_EV_P6_LAST +#define PMC_EVENT_LAST PMC_EV_XSCALE_LAST #endif /* _DEV_HWPMC_PMC_EVENTS_H_ */ ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pci.c#16 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.386 2009/07/21 19:06:39 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.387 2009/09/22 15:43:03 jhb Exp $"); #include "opt_bus.h" @@ -2149,62 +2149,38 @@ int pci_enable_io_method(device_t dev, device_t child, int space) { - uint16_t command; uint16_t bit; - char *error; - - bit = 0; - error = NULL; switch(space) { case SYS_RES_IOPORT: bit = PCIM_CMD_PORTEN; - error = "port"; break; case SYS_RES_MEMORY: bit = PCIM_CMD_MEMEN; - error = "memory"; break; default: return (EINVAL); } pci_set_command_bit(dev, child, bit); - /* Some devices seem to need a brief stall here, what do to? */ - command = PCI_READ_CONFIG(dev, child, PCIR_COMMAND, 2); - if (command & bit) - return (0); - device_printf(child, "failed to enable %s mapping!\n", error); - return (ENXIO); + return (0); } int pci_disable_io_method(device_t dev, device_t child, int space) { - uint16_t command; uint16_t bit; - char *error; - - bit = 0; - error = NULL; switch(space) { case SYS_RES_IOPORT: bit = PCIM_CMD_PORTEN; - error = "port"; break; case SYS_RES_MEMORY: bit = PCIM_CMD_MEMEN; - error = "memory"; break; default: return (EINVAL); } pci_clear_command_bit(dev, child, bit); - command = PCI_READ_CONFIG(dev, child, PCIR_COMMAND, 2); - if (command & bit) { - device_printf(child, "failed to disable %s mapping!\n", error); - return (ENXIO); - } return (0); } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/vpo.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppbus/vpo.c,v 1.40 2009/08/18 08:46:54 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppbus/vpo.c,v 1.41 2009/09/22 22:20:43 mav Exp $"); #include #include @@ -176,9 +176,6 @@ return (ENXIO); } ppb_unlock(ppbus); - - /* all went ok */ - vpo_cam_rescan(vpo); /* have CAM rescan the bus */ return (0); @@ -194,12 +191,15 @@ static void vpo_cam_rescan(struct vpo_data *vpo) { + device_t ppbus = device_get_parent(vpo->vpo_dev); struct cam_path *path; union ccb *ccb = malloc(sizeof(union ccb), M_TEMP, M_WAITOK | M_ZERO); + ppb_lock(ppbus); if (xpt_create_path(&path, xpt_periph, cam_sim_path(vpo->sim), 0, 0) != CAM_REQ_CMP) { /* A failure is benign as the user can do a manual rescan */ + ppb_unlock(ppbus); free(ccb, M_TEMP); return; } @@ -209,6 +209,7 @@ ccb->ccb_h.cbfcnp = vpo_cam_rescan_callback; ccb->crcn.flags = CAM_FLAG_NONE; xpt_action(ccb); + ppb_unlock(ppbus); /* The scan is in progress now. */ } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/twa/tw_cl_io.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twa/tw_cl_io.c,v 1.4 2007/10/09 17:43:57 scottl Exp $ + * $FreeBSD: src/sys/dev/twa/tw_cl_io.c,v 1.5 2009/09/22 16:28:07 rdivacky Exp $ */ /* @@ -396,7 +396,7 @@ * non-zero-- failure */ TW_INT32 -tw_cl_ioctl(struct tw_cl_ctlr_handle *ctlr_handle, TW_INT32 cmd, TW_VOID *buf) +tw_cl_ioctl(struct tw_cl_ctlr_handle *ctlr_handle, u_long cmd, TW_VOID *buf) { struct tw_cli_ctlr_context *ctlr = (struct tw_cli_ctlr_context *)(ctlr_handle->cl_ctlr_ctxt); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/twa/tw_cl_share.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twa/tw_cl_share.h,v 1.4 2007/10/09 17:43:57 scottl Exp $ + * $FreeBSD: src/sys/dev/twa/tw_cl_share.h,v 1.5 2009/09/22 16:28:07 rdivacky Exp $ */ /* @@ -565,7 +565,7 @@ /* CL's ioctl handler. */ extern TW_INT32 tw_cl_ioctl(struct tw_cl_ctlr_handle *ctlr_handle, - TW_INT32 cmd, TW_VOID *buf); + u_long cmd, TW_VOID *buf); #ifdef TW_OSL_DEBUG ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/twe/twe.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twe/twe.c,v 1.28 2009/08/20 19:17:53 jhb Exp $ + * $FreeBSD: src/sys/dev/twe/twe.c,v 1.29 2009/09/22 16:28:07 rdivacky Exp $ */ /* @@ -487,7 +487,7 @@ * Handle controller-specific control operations. */ int -twe_ioctl(struct twe_softc *sc, int ioctlcmd, void *addr) +twe_ioctl(struct twe_softc *sc, u_long ioctlcmd, void *addr) { struct twe_usercommand *tu = (struct twe_usercommand *)addr; struct twe_paramcommand *tp = (struct twe_paramcommand *)addr; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/twe/twevar.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twe/twevar.h,v 1.13 2004/06/11 18:42:44 vkashyap Exp $ + * $FreeBSD: src/sys/dev/twe/twevar.h,v 1.14 2009/09/22 16:28:07 rdivacky Exp $ */ #define TWE_DRIVER_VERSION_STRING "1.50.01.002" @@ -150,7 +150,7 @@ extern int twe_start(struct twe_request *tr); extern int twe_dump_blocks(struct twe_softc *sc, int unit, /* crashdump block write */ u_int32_t lba, void *data, int nblks); -extern int twe_ioctl(struct twe_softc *sc, int cmd, +extern int twe_ioctl(struct twe_softc *sc, u_long cmd, void *addr); /* handle user request */ extern void twe_describe_controller(struct twe_softc *sc); /* print controller info */ extern void twe_print_controller(struct twe_softc *sc); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/fs/procfs/procfs.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ * * @(#)procfs_vfsops.c 8.7 (Berkeley) 5/10/95 * - * $FreeBSD: src/sys/fs/procfs/procfs.c,v 1.20 2009/02/16 15:17:26 des Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs.c,v 1.21 2009/09/23 12:08:08 kib Exp $ */ #include @@ -108,7 +108,8 @@ else if (strcmp(pn->pn_name, "mem") == 0 || strcmp(pn->pn_name, "regs") == 0 || strcmp(pn->pn_name, "dbregs") == 0 || - strcmp(pn->pn_name, "fpregs") == 0) + strcmp(pn->pn_name, "fpregs") == 0 || + strcmp(pn->pn_name, "osrel") == 0) vap->va_mode = 0600; if (p != NULL) { @@ -186,6 +187,8 @@ NULL, NULL, NULL, PFS_RD); pfs_create_file(dir, "status", procfs_doprocstatus, NULL, NULL, NULL, PFS_RD); + pfs_create_file(dir, "osrel", procfs_doosrel, + procfs_attr, procfs_candebug, NULL, PFS_RDWR); pfs_create_link(dir, "file", procfs_doprocfile, NULL, procfs_notsystem, NULL, 0); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/fs/procfs/procfs.h#2 (text+ko) ==== @@ -33,12 +33,13 @@ * @(#)procfs.h 8.9 (Berkeley) 5/14/95 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 23 15:54:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB1A91065697; Wed, 23 Sep 2009 15:54:05 +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 76ACD1065692 for ; Wed, 23 Sep 2009 15:54:05 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 64C268FC1D for ; Wed, 23 Sep 2009 15:54:05 +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 n8NFs51F053601 for ; Wed, 23 Sep 2009 15:54:05 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8NFs5s0053599 for perforce@freebsd.org; Wed, 23 Sep 2009 15:54:05 GMT (envelope-from trasz@freebsd.org) Date: Wed, 23 Sep 2009 15:54:05 GMT Message-Id: <200909231554.n8NFs5s0053599@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 168828 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: Wed, 23 Sep 2009 15:54:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=168828 Change 168828 by trasz@trasz_victim on 2009/09/23 15:53:23 Fix mismerge. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/03.t#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/aclfuzzer.sh#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-crossfs.test#4 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/03.t#4 (text+ko) ==== @@ -1,7 +1,36 @@ #!/bin/sh # -# This is a wrapper script to run tools-crossfs.test, intended to verify -# whether cp(1) and mv(1) do the correct thing wrt ACLs. +# Copyright (c) 2008, 2009 Edward Tomasz NapieraÅ‚a +# 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 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/tools/regression/acltools/03.t,v 1.1 2009/09/23 15:12:20 trasz Exp $ +# + +# This is a wrapper script to run tools-crossfs.test between UFS without +# ACLs, UFS with POSIX.1e ACLs, and ZFS with NFSv4 ACLs. +# +# WARNING: It uses hardcoded ZFS pool name "acltools" # # Output should be obvious. @@ -16,13 +45,12 @@ MNTROOT=`mktemp -dt acltools` # Set up the test filesystems. -MD1=`mdconfig -at swap -s 10m` +MD1=`mdconfig -at swap -s 64m` MNT1=$MNTROOT/nfs4 mkdir $MNT1 -newfs /dev/$MD1 > /dev/null -mount -o nfs4acls /dev/$MD1 $MNT1 +zpool create -R $MNT1 acltools /dev/$MD1 if [ $? -ne 0 ]; then - echo "not ok 1 - mount failed." + echo "not ok 1 - 'zpool create' failed." exit 1 fi @@ -72,7 +100,7 @@ rmdir $MNT2 mdconfig -du $MD2 -umount -f $MNT1 +zpool destroy -f acltools rmdir $MNT1 mdconfig -du $MD1 ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/aclfuzzer.sh#2 (text+ko) ==== @@ -1,8 +1,35 @@ #!/bin/sh -# This is an NFSv4 ACL fuzzer. It expects to be run by non-root -# in a scratch directory on a filesystem with NFSv4 ACLs support. -# It generates the output that is expected to be fed to -# /usr/src/tools/regression/acltools/run script. +# +# Copyright (c) 2008, 2009 Edward Tomasz NapieraÅ‚a +# 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 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/tools/regression/acltools/aclfuzzer.sh,v 1.1 2009/09/23 15:06:51 trasz Exp $ +# + +# This is an NFSv4 ACL fuzzer. It expects to be run by non-root in a scratch +# directory on a filesystem with NFSv4 ACLs support. Output it generates +# is expected to be fed to /usr/src/tools/regression/acltools/run script. NUMBER_OF_COMMANDS=300 @@ -150,11 +177,11 @@ run_command "mv -f $from $to" } -# XXX: chown(8), setting times with touch(1). +# XXX: To be implemented: chown(8), setting times with touch(1). switch_to_random_user() { -# echo "switch" + # XXX: To be implemented. } execute_random_command() ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-crossfs.test#4 (text+ko) ==== @@ -1,5 +1,33 @@ -# This is a tools-level test whether cp(1) and mv(1) do the correct -# thing wrt ACLs. Run it as root using ACL-enabled kernel: +# Copyright (c) 2008, 2009 Edward Tomasz NapieraÅ‚a +# 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 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/tools/regression/acltools/tools-crossfs.test,v 1.1 2009/09/23 15:12:20 trasz Exp $ +# + +# This is a tools-level test intended to verify that cp(1) and mv(1) +# do the right thing with respect to ACLs. Run it as root using +# ACL-enabled kernel: # # /usr/src/tools/regression/acltools/run /usr/src/tools/regression/acltools/tools-nfs4.test # @@ -51,7 +79,7 @@ # mv from POSIX.1e to NFSv4. $ rm -f nfs4/xxx $ mv posix/yyy nfs4/xxx -> mv: ACL brand of source is POSIX.1e, but destination is NFSv4; ACL not copied +> mv: failed to set acl entries for nfs4/xxx: Invalid argument $ getfacl -nq nfs4/xxx > owner@:-wxp----------:------:deny > owner@:r------A-W-Co-:------:allow @@ -77,13 +105,14 @@ # mv from NFSv4 to POSIX.1e. $ rm -f posix/xxx $ mv nfs4/yyy posix/xxx -> mv: ACL brand of source is NFSv4, but destination is POSIX.1e; ACL not copied +> mv: failed to set acl entries for posix/xxx: Invalid argument $ ls -l posix/xxx | cut -d' ' -f1 > -r--rwxrw- # mv from POSIX.1e to none. $ setfacl -m u:42:x,g:43:w posix/xxx $ mv posix/xxx none/xxx +> mv: failed to set acl entries for none/xxx: Operation not supported $ ls -l none/xxx | cut -d' ' -f1 > -r--rwxrw- @@ -119,7 +148,7 @@ # mv from POSIX.1e to NFSv4. $ rm -f nfs4/xxx $ cp -p posix/xxx nfs4/xxx -> cp: failed to set acl entries for nfs4/xxx: Operation not supported +> cp: failed to set acl entries for nfs4/xxx: Invalid argument $ ls -l nfs4/xxx | cut -d' ' -f1 > -rw-rwxr-- @@ -140,7 +169,7 @@ # cp from NFSv4 to POSIX.1e. $ rm -f posix/xxx $ cp -p nfs4/xxx posix/xxx -> cp: failed to set acl entries for posix/xxx: Operation not supported +> cp: failed to set acl entries for posix/xxx: Invalid argument $ ls -l posix/xxx | cut -d' ' -f1 > -rw-rwxr-- From owner-p4-projects@FreeBSD.ORG Wed Sep 23 17:12:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AF9D106568D; Wed, 23 Sep 2009 17:12: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 33BB6106566B for ; Wed, 23 Sep 2009 17:12:31 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 22E3F8FC0C for ; Wed, 23 Sep 2009 17:12:31 +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 n8NHCVjS071435 for ; Wed, 23 Sep 2009 17:12:31 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8NHCVMC071433 for perforce@freebsd.org; Wed, 23 Sep 2009 17:12:31 GMT (envelope-from stas@freebsd.org) Date: Wed, 23 Sep 2009 17:12:31 GMT Message-Id: <200909231712.n8NHCVMC071433@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168829 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: Wed, 23 Sep 2009 17:12:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=168829 Change 168829 by stas@stas_yandex on 2009/09/23 17:12:03 - Fix pthread functions redirection. This also need to be tweaked to support libkse as well. Affected files ... .. //depot/projects/valgrind/helgrind/hg_intercepts.c#5 edit .. //depot/projects/valgrind/include/pub_tool_redir.h#4 edit Differences ... ==== //depot/projects/valgrind/helgrind/hg_intercepts.c#5 (text+ko) ==== @@ -256,7 +256,7 @@ return pthread_create_WRK(thread, attr, start, arg); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZucreateZAZa, // pthread_create@* + PTH_FUNC(int, pthreadZucreate, // pthread_create pthread_t *thread, const pthread_attr_t *attr, void *(*start) (void *), void *arg) { return pthread_create_WRK(thread, attr, start, arg); @@ -314,7 +314,7 @@ return pthread_join_WRK(thread, value_pointer); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZujoinZAZa, // pthread_join@* + PTH_FUNC(int, pthreadZujoin, // pthread_join pthread_t thread, void** value_pointer) { return pthread_join_WRK(thread, value_pointer); } @@ -686,7 +686,7 @@ return pthread_cond_wait_WRK(cond, mutex); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZucondZuwaitZAZa, // pthread_cond_wait@* + PTH_FUNC(int, pthreadZucondZuwait, // pthread_cond_wait pthread_cond_t* cond, pthread_mutex_t* mutex) { return pthread_cond_wait_WRK(cond, mutex); } @@ -771,7 +771,7 @@ return pthread_cond_timedwait_WRK(cond, mutex, abstime); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZucondZutimedwaitZAZa, // pthread_cond_timedwait@* + PTH_FUNC(int, pthreadZucondZutimedwait, // pthread_cond_timedwait pthread_cond_t* cond, pthread_mutex_t* mutex, struct timespec* abstime) { return pthread_cond_timedwait_WRK(cond, mutex, abstime); @@ -836,7 +836,7 @@ return pthread_cond_signal_WRK(cond); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZucondZusignalZAZa, // pthread_cond_signal@* + PTH_FUNC(int, pthreadZucondZusignal, // pthread_cond_signal pthread_cond_t* cond) { return pthread_cond_signal_WRK(cond); } @@ -892,7 +892,7 @@ return pthread_cond_broadcast_WRK(cond); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZucondZubroadcastZAZa, // pthread_cond_broadcast@* + PTH_FUNC(int, pthreadZucondZubroadcast, // pthread_cond_broadcast pthread_cond_t* cond) { return pthread_cond_broadcast_WRK(cond); } @@ -945,7 +945,7 @@ return pthread_cond_destroy_WRK(cond); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZucondZudestroyZAZa, // pthread_cond_destroy@* + PTH_FUNC(int, pthreadZucondZudestroy, // pthread_cond_destroy pthread_cond_t* cond) { return pthread_cond_destroy_WRK(cond); } @@ -1141,7 +1141,7 @@ return pthread_spin_init_or_unlock_WRK(lock, 0/*pshared*/); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZuspinZuinitZAZa, // pthread_spin_init@* + PTH_FUNC(int, pthreadZuspinZuinit, // pthread_spin_init pthread_spinlock_t* lock, int pshared) { return pthread_spin_init_or_unlock_WRK(lock, pshared); } @@ -1337,7 +1337,7 @@ return pthread_rwlock_init_WRK(rwl, attr); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZurwlockZuinitZAZa, // pthread_rwlock_init@* + PTH_FUNC(int, pthreadZurwlockZuinit, // pthread_rwlock_init pthread_rwlock_t *rwl, pthread_rwlockattr_t* attr) { return pthread_rwlock_init_WRK(rwl, attr); @@ -1387,7 +1387,7 @@ return pthread_rwlock_destroy_WRK(rwl); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZurwlockZudestroyZAZa, // pthread_rwlock_destroy@* + PTH_FUNC(int, pthreadZurwlockZudestroy, // pthread_rwlock_destroy pthread_rwlock_t *rwl) { return pthread_rwlock_destroy_WRK(rwl); } @@ -1439,7 +1439,7 @@ return pthread_rwlock_wrlock_WRK(rwlock); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZurwlockZuwrlockZAZa, // pthread_rwlock_wrlock@* + PTH_FUNC(int, pthreadZurwlockZuwrlock, // pthread_rwlock_wrlock pthread_rwlock_t* rwlock) { return pthread_rwlock_wrlock_WRK(rwlock); } @@ -1491,7 +1491,7 @@ return pthread_rwlock_rdlock_WRK(rwlock); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZurwlockZurdlockZAZa, // pthread_rwlock_rdlock@* + PTH_FUNC(int, pthreadZurwlockZurdlock, // pthread_rwlock_rdlock pthread_rwlock_t* rwlock) { return pthread_rwlock_rdlock_WRK(rwlock); } @@ -1549,7 +1549,7 @@ return pthread_rwlock_trywrlock_WRK(rwlock); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZurwlockZutrywrlockZAZa, // pthread_rwlock_trywrlock@* + PTH_FUNC(int, pthreadZurwlockZutrywrlock, // pthread_rwlock_trywrlock pthread_rwlock_t* rwlock) { return pthread_rwlock_trywrlock_WRK(rwlock); } @@ -1607,7 +1607,7 @@ return pthread_rwlock_tryrdlock_WRK(rwlock); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZurwlockZutryrdlockZAZa, // pthread_rwlock_tryrdlock + PTH_FUNC(int, pthreadZurwlockZutryrdlock, // pthread_rwlock_tryrdlock pthread_rwlock_t* rwlock) { return pthread_rwlock_tryrdlock_WRK(rwlock); } @@ -1657,7 +1657,7 @@ return pthread_rwlock_unlock_WRK(rwlock); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZurwlockZuunlockZAZa, // pthread_rwlock_unlock@* + PTH_FUNC(int, pthreadZurwlockZuunlock, // pthread_rwlock_unlock pthread_rwlock_t* rwlock) { return pthread_rwlock_unlock_WRK(rwlock); } @@ -1735,7 +1735,7 @@ return sem_init_WRK(sem, pshared, value); } #elif defined(VGO_freebsd) - PTH_FUNC(int, semZuinitZAZa, // sem_init@* + PTH_FUNC(int, semZuinit, // sem_init sem_t* sem, int pshared, unsigned long value) { return sem_init_WRK(sem, pshared, value); } @@ -1786,7 +1786,7 @@ return sem_destroy_WRK(sem); } #elif defined(VGO_freebsd) - PTH_FUNC(int, semZudestroyZAZa, // sem_destroy* + PTH_FUNC(int, semZudestroy, // sem_destroy sem_t* sem) { return sem_destroy_WRK(sem); } @@ -1843,7 +1843,7 @@ return sem_wait_WRK(sem); } #elif defined(VGO_freebsd) - PTH_FUNC(int, semZuwaitZAZa, sem_t* sem) { /* sem_wait@* */ + PTH_FUNC(int, semZuwait, sem_t* sem) { /* sem_wait */ return sem_wait_WRK(sem); } #elif defined(VGO_darwin) @@ -1900,7 +1900,7 @@ return sem_post_WRK(sem); } #elif defined(VGO_freebsd) - PTH_FUNC(int, semZupostZAZa, sem_t* sem) { /* sem_post@* */ + PTH_FUNC(int, semZupost, sem_t* sem) { /* sem_post */ return sem_post_WRK(sem); } #elif defined(VGO_darwin) ==== //depot/projects/valgrind/include/pub_tool_redir.h#4 (text+ko) ==== @@ -203,8 +203,10 @@ /* --- Soname of the pthreads library. --- */ -#if defined(VGO_linux) || defined(VGO_aix5) || defined(VGO_freebsd) +#if defined(VGO_linux) || defined(VGO_aix5) # define VG_Z_LIBPTHREAD_SONAME libpthreadZdsoZd0 // libpthread.so.0 +#elif defined(VGO_freebsd) +# define VG_Z_LIBPTHREAD_SONAME libthrZdsoZa // libthr.so* #elif defined(VGO_darwin) # define VG_Z_LIBPTHREAD_SONAME libSystemZdZaZddylib // libSystem.*.dylib #else From owner-p4-projects@FreeBSD.ORG Wed Sep 23 18:20:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A5D41065672; Wed, 23 Sep 2009 18:20: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 25A181065670 for ; Wed, 23 Sep 2009 18:20:46 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 15B0D8FC17 for ; Wed, 23 Sep 2009 18:20:46 +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 n8NIKjrs077351 for ; Wed, 23 Sep 2009 18:20:45 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8NIKj7F077349 for perforce@freebsd.org; Wed, 23 Sep 2009 18:20:45 GMT (envelope-from trasz@freebsd.org) Date: Wed, 23 Sep 2009 18:20:45 GMT Message-Id: <200909231820.n8NIKj7F077349@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 168831 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: Wed, 23 Sep 2009 18:20:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=168831 Change 168831 by trasz@trasz_victim on 2009/09/23 18:20:02 Cosmetic fixes. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#24 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#24 (text+ko) ==== @@ -179,7 +179,8 @@ if (vfs_getopt(mp->mnt_optnew, "nfs4acls", NULL, NULL) == 0) { if (mntorflags & MNT_ACLS) { - printf("WARNING: both acls and nfs4acls specified\n"); + printf("WARNING: \"acls\" and \"nfs4acls\" " + "options are mutually exclusive\n"); return (EINVAL); } mntorflags |= MNT_NFS4ACLS; @@ -844,7 +845,8 @@ MNT_ILOCK(mp); if (mp->mnt_flag & MNT_NFS4ACLS) - printf("WARNING: ACLs flag on fs conflicts with nfs4acls mount option; flag ignored\n"); + printf("WARNING: ACLs flag on fs conflicts with " + "\"nfs4acls\" mount option; flag ignored\n"); else mp->mnt_flag |= MNT_ACLS; From owner-p4-projects@FreeBSD.ORG Wed Sep 23 20:20:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CED931065693; Wed, 23 Sep 2009 20:20:57 +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 7AB6F1065670 for ; Wed, 23 Sep 2009 20:20:57 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 677558FC2E for ; Wed, 23 Sep 2009 20:20:57 +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 n8NKKv4N088525 for ; Wed, 23 Sep 2009 20:20:57 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8NKKvdo088523 for perforce@freebsd.org; Wed, 23 Sep 2009 20:20:57 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 23 Sep 2009 20:20:57 GMT Message-Id: <200909232020.n8NKKvdo088523@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 Cc: Subject: PERFORCE change 168833 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: Wed, 23 Sep 2009 20:20:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=168833 Change 168833 by rene@rene_self on 2009/09/23 20:20:02 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#44 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml#11 integrate .. //depot/projects/docproj_nl/share/sgml/mirrors.xml#9 integrate .. //depot/projects/docproj_nl/www/en/platforms/sparc.sgml#4 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#51 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#44 (text+ko) ==== @@ -1,7 +1,7 @@ 9.0-CURRENT after importing x86emu, a software emulator for real mode x86 CPU from OpenBSD. + + 900002 + September 23, 2009 + 9.0-CURRENT after implementing the EVFILT_USER + kevent filter functionality. + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -881,19 +881,14 @@ ÅëÝãîôå ôçí åíüôçôá "Files" óôï áñ÷åßï /etc/X11/xorg.conf. Èá ðñÝðåé íá - ðñïóèÝóåôå ôéò ðáñáêÜôù ãñáììÝò ðñéí + ðñïóèÝóåôå ôçí ðáñáêÜôù ãñáììÞ ðñéí áðü ïðïéáäÞðïôå Üëëç êáôá÷þñéóç FontPath: - FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/misc" -FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/75dpi" -FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/100dpi" + FontPath "/usr/local/lib/X11/fonts/cyrillic" - Áí ÷ñçóéìïðïéåßôå õøçëÞ áíÜëõóç óôçí ïèüíç óáò, áíôéóôñÝøôå - ìåôáîý ôïõò ôéò ãñáììÝò ãéá 75 êáé 100 dpi. - - Äåßôå ôá ports ãéá ðåñéóóüôåñåò êõñéëëéêÝò + Äåßôå óôçí ÓõëëïãÞ ôùí Ports ãéá ðåñéóóüôåñåò êõñéëëéêÝò ãñáììáôïóåéñÝò.     ==== //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#6 (text+ko) ==== @@ -1,4 +1,4 @@ - + + @@ -811,15 +811,10 @@ Check the "Files" section in your /etc/X11/xorg.conf file. The following - lines must be added before any other + line must be added before any other FontPath entries: - FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/misc" -FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/75dpi" -FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/100dpi" - - If you use a high resolution video mode, swap the 75 dpi - and 100 dpi lines. + FontPath "/usr/local/lib/X11/fonts/cyrillic" See ports for more cyrillic fonts. ==== //depot/projects/str91xx/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ 9.0-CURRENT after importing x86emu, a software emulator for real mode x86 CPU from OpenBSD. + + 900002 + September 23, 2009 + 9.0-CURRENT after implementing the EVFILT_USER + kevent filter functionality. + ==== //depot/projects/str91xx/doc/en_US.ISO8859-1/share/sgml/authors.ent#5 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.488 2009/08/10 16:50:10 fluffy Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.489 2009/09/16 14:58:25 wen Exp $ --> aaron@FreeBSD.org"> @@ -1152,6 +1152,8 @@ weongyo@FreeBSD.org"> +wen@FreeBSD.org"> + wes@FreeBSD.org"> wxs@FreeBSD.org"> ==== //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml#2 (text+ko) ==== @@ -1,12 +1,12 @@ @@ -1151,19 +1151,12 @@ Ellenõrizzük a /etc/X11/xorg.conf állományban a "Files" - szakaszt. Az alábbi sorokat mindegyik más + szakaszt. Az alábbi sort mindegyik más FontPath bejegyzés elõtt kell szerepeltetnünk: - FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/misc" -FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/75dpi" -FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/100dpi" - - Ha nagy felbontású - megjelenítést használunk, - cseréljük meg a 75 és a 100 dpi-s - sorokat. + FontPath "/usr/X11R6/lib/X11/fonts/cyrillic" A portok között találhatunk ==== //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#3 (text+ko) ==== @@ -1,13 +1,13 @@ @@ -3069,6 +3069,15 @@     + RELENG_8 + + + A FreeBSD-8.X fejlesztési ága, más + néven a FreeBSD 8-STABLE + + + + RELENG_7 ==== //depot/projects/str91xx/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -797,16 +797,11 @@ багцыг Ñуулгана.     Өөрийн /etc/X11/xorg.conf файлын - "Files" Ñ…ÑÑгийг шалгаарай. Дараах мөрүүд + "Files" Ñ…ÑÑгийг шалгаарай. Дараах мөр аль ч FontPath Ð¾Ñ€ÑƒÑƒÐ»Ð³ÑƒÑƒÐ´Ð°Ð°Ñ Ó©Ð¼Ð½Ó© нÑмÑгдÑÑн байх шаардлагатай: - FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/misc" -FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/75dpi" -FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/100dpi" - - Ð¥ÑÑ€Ñв та өндөр нарийвчлалтай видео горимыг ашиглаж байгаа бол - 75 dpi болон 100 dpi мөрүүдийг Ñолиорой. + FontPath "/usr/local/lib/X11/fonts/cyrillic" Ó¨Ó©Ñ€ илүү олон кирилл фонтуудыг авахыг Ñ…Ò¯ÑвÑл Ð¿Ð¾Ñ€Ñ‚ÑƒÑƒÐ´Ð°Ð°Ñ Ò¯Ð·Ð½Ñ Ò¯Ò¯. ==== //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml#2 (text+ko) ==== @@ -1,11 +1,10 @@ @@ -927,20 +926,15 @@ Controleer de "Files" sectie in /etc/X11/xorg.conf bestand. Zorg - dat de volgende regels + dat de volgende regel vóór andere FontPath regels staan: - FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/misc" -FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/75dpi" -FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/100dpi" - - Er er een hoge resolutie videomodus wordt gebruikt - dan kunnen de 75dpi en 100dpi regels gewisseld - worden. - - Zie de Ports Collectie voor meer cyrillic - fonts. + FontPath "/usr/local/lib/X11/fonts/cyrillic" + + Zie de Ports Collectie voor meer cyrillic + fonts. + ==== //depot/projects/str91xx/doc/share/sgml/mirrors.xml#2 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.81 2009/05/21 21:02:58 joerg Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.87 2009/09/23 10:08:43 erwin Exp $ @@ -16,6 +16,9 @@ ftp.FreeBSD.org ftp://ftp.FreeBSD.org/pub/FreeBSD/ + + http://ftp.FreeBSD.org/pub/FreeBSD/ + http://ftp.FreeBSD.org/pub/FreeBSD/ @@ -43,6 +46,9 @@ ftp4.FreeBSD.org ftp://ftp4.FreeBSD.org/pub/FreeBSD/ + + http://ftp4.FreeBSD.org/pub/FreeBSD/ + http://ftp4.FreeBSD.org/pub/FreeBSD/ @@ -73,6 +79,9 @@ ftp10.FreeBSD.org ftp://ftp10.FreeBSD.org/pub/FreeBSD/ + + http://ftp10.FreeBSD.org/pub/FreeBSD/ + http://ftp10.FreeBSD.org/pub/FreeBSD/ @@ -93,6 +102,7 @@ ftp14.FreeBSD.org ftp://ftp14.FreeBSD.org/pub/FreeBSD/ + http://ftp14.FreeBSD.org/pub/FreeBSD/ @@ -177,6 +187,8 @@ ftp1.am.FreeBSD.org ftp://ftp1.am.FreeBSD.org/pub/FreeBSD/ + http://ftp1.am.FreeBSD.org/pub/FreeBSD/ + @@ -311,6 +323,7 @@ ftp2.br.FreeBSD.org ftp://ftp2.br.FreeBSD.org/pub/FreeBSD/ + http://ftp2.br.FreeBSD.org/pub/FreeBSD/ @@ -536,6 +549,8 @@ ftp.dk.FreeBSD.org ftp://ftp.dk.FreeBSD.org/pub/FreeBSD/ + http://ftp.dk.FreeBSD.org/pub/FreeBSD/ + http://ftp.dk.FreeBSD.org/pub/FreeBSD/ @@ -626,6 +641,7 @@ ftp1.fr.FreeBSD.org ftp://ftp1.fr.FreeBSD.org/pub/FreeBSD/ + http://ftp1.fr.FreeBSD.org/pub/FreeBSD/ @@ -1090,6 +1106,7 @@ ftp2.kr.FreeBSD.org ftp://ftp2.kr.FreeBSD.org/pub/FreeBSD/ + http://ftp2.kr.FreeBSD.org/pub/FreeBSD/ @@ -1164,6 +1181,7 @@ ftp.lt.FreeBSD.org ftp://ftp.lt.FreeBSD.org/pub/FreeBSD/ + http://ftp.lt.FreeBSD.org/pub/FreeBSD/ @@ -1410,6 +1428,8 @@ ftp1.ro.FreeBSD.org ftp://ftp1.ro.FreeBSD.org/pub/FreeBSD/ + http://ftp1.ro.FreeBSD.org/pub/FreeBSD/ + http://ftp1.ro.FreeBSD.org/pub/FreeBSD/ @@ -1776,6 +1796,7 @@ ftp.ch.FreeBSD.org ftp://ftp.ch.FreeBSD.org/pub/FreeBSD/ + http://ftp.ch.FreeBSD.org/pub/FreeBSD/ @@ -2202,6 +2223,8 @@ ftp4.us.FreeBSD.org ftp://ftp4.us.FreeBSD.org/pub/FreeBSD/ + http://ftp4.us.FreeBSD.org/pub/FreeBSD/ + http://ftp4.us.FreeBSD.org/pub/FreeBSD/ ==== //depot/projects/str91xx/ports/GIDs#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: ports/GIDs,v 1.80 2009/09/06 21:16:04 flz Exp $ +# $FreeBSD: ports/GIDs,v 1.83 2009/09/18 09:17:36 pav Exp $ # Please keep this file sorted by GID! smmsp:*:25: bind:*:53: @@ -68,6 +68,7 @@ undernet:*:134: rabbitmq:*:135: dhcpd:*:136: +ladvd:*:142: dovecot:*:143: rbldns:*:153: sfs:*:171: @@ -81,6 +82,7 @@ cups:*:193: sympa:*:200: dspam:*:202: +git:*:211: bs:*:220: postgrey:*:225: aprsd:*:240: @@ -108,6 +110,7 @@ ldap:*:389: tiarra:*:398: drweb:*:426: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 24 13:50:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F6EB1065693; Thu, 24 Sep 2009 13:50: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 00CDF1065679 for ; Thu, 24 Sep 2009 13:50:04 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E40058FC13 for ; Thu, 24 Sep 2009 13:50:03 +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 n8ODo3IK032069 for ; Thu, 24 Sep 2009 13:50:03 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8ODo33l032067 for perforce@freebsd.org; Thu, 24 Sep 2009 13:50:03 GMT (envelope-from trasz@freebsd.org) Date: Thu, 24 Sep 2009 13:50:03 GMT Message-Id: <200909241350.n8ODo33l032067@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 168845 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: Thu, 24 Sep 2009 13:50:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=168845 Change 168845 by trasz@trasz_victim on 2009/09/24 13:49:06 Add default implementation of VOP_ACCESS, as wrapper around VOP_ACCESSX, so that NFSv4-enabled filesystems don't have to implement both. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_default.c#12 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#36 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_default.c#12 (text+ko) ==== @@ -89,6 +89,7 @@ .vop_default = NULL, .vop_bypass = VOP_EOPNOTSUPP, + .vop_access = vop_stdaccess, .vop_accessx = vop_stdaccessx, .vop_advlock = vop_stdadvlock, .vop_advlockasync = vop_stdadvlockasync, @@ -326,6 +327,16 @@ } int +vop_stdaccess(struct vop_access_args *ap) +{ + + KASSERT((ap->a_accmode & ~(VEXEC | VWRITE | VREAD | VADMIN | + VAPPEND)) == 0, ("invalid bit in accmode")); + + return (VOP_ACCESSX(ap->a_vp, ap->a_accmode, ap->a_cred, ap->a_td)); +} + +int vop_stdaccessx(struct vop_accessx_args *ap) { int error; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#36 (text+ko) ==== @@ -685,6 +685,7 @@ int vop_stdputpages(struct vop_putpages_args *); int vop_stdunlock(struct vop_unlock_args *); int vop_nopoll(struct vop_poll_args *); +int vop_stdaccess(struct vop_access_args *ap); int vop_stdaccessx(struct vop_accessx_args *ap); int vop_stdadvlock(struct vop_advlock_args *ap); int vop_stdadvlockasync(struct vop_advlockasync_args *ap); From owner-p4-projects@FreeBSD.ORG Thu Sep 24 13:51:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7155C106568B; Thu, 24 Sep 2009 13:51:05 +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 3615A106566B for ; Thu, 24 Sep 2009 13:51:05 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 251F78FC0C for ; Thu, 24 Sep 2009 13:51:05 +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 n8ODp5ti032184 for ; Thu, 24 Sep 2009 13:51:05 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8ODp5ma032182 for perforce@freebsd.org; Thu, 24 Sep 2009 13:51:05 GMT (envelope-from trasz@freebsd.org) Date: Thu, 24 Sep 2009 13:51:05 GMT Message-Id: <200909241351.n8ODp5ma032182@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 168846 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: Thu, 24 Sep 2009 13:51:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=168846 Change 168846 by trasz@trasz_victim on 2009/09/24 13:50:35 Fix errno - no ACL support at all is EOPNOTSUPP, no support for this particular type of ACL is EINVAL. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#21 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#21 (text+ko) ==== @@ -147,7 +147,7 @@ struct inode *ip = VTOI(ap->a_vp); if ((ap->a_vp->v_mount->mnt_flag & MNT_NFS4ACLS) == 0) - return (EOPNOTSUPP); + return (EINVAL); len = sizeof(*ap->a_aclp); bzero(ap->a_aclp, len); @@ -265,7 +265,7 @@ * ACLs, remove this check. */ if ((ap->a_vp->v_mount->mnt_flag & MNT_ACLS) == 0) - return (EOPNOTSUPP); + return (EINVAL); old = malloc(sizeof(*old), M_ACL, M_WAITOK | M_ZERO); @@ -338,6 +338,9 @@ } */ *ap; { + if ((ap->a_vp->v_mount->mnt_flag & (MNT_ACLS | MNT_NFS4ACLS)) == 0) + return (EOPNOTSUPP); + if (ap->a_type == ACL_TYPE_NFS4) return (ufs_getacl_nfs4(ap)); @@ -352,7 +355,7 @@ struct inode *ip = VTOI(ap->a_vp); if ((ap->a_vp->v_mount->mnt_flag & MNT_NFS4ACLS) == 0) - return (EOPNOTSUPP); + return (EINVAL); if (ap->a_vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); @@ -438,7 +441,7 @@ struct oldacl *old; if ((ap->a_vp->v_mount->mnt_flag & MNT_ACLS) == 0) - return (EOPNOTSUPP); + return (EINVAL); /* * If this is a set operation rather than a delete operation, @@ -558,6 +561,8 @@ struct thread *td; } */ *ap; { + if ((ap->a_vp->v_mount->mnt_flag & (MNT_ACLS | MNT_NFS4ACLS)) == 0) + return (EOPNOTSUPP); if (ap->a_type == ACL_TYPE_NFS4) return (ufs_setacl_nfs4(ap)); @@ -571,7 +576,7 @@ int is_directory = 0; if ((ap->a_vp->v_mount->mnt_flag & MNT_NFS4ACLS) == 0) - return (EOPNOTSUPP); + return (EINVAL); if (ap->a_vp->v_type == VDIR) is_directory = 1; @@ -584,7 +589,7 @@ { if ((ap->a_vp->v_mount->mnt_flag & MNT_ACLS) == 0) - return (EOPNOTSUPP); + return (EINVAL); /* * Verify we understand this type of ACL, and that it applies @@ -624,6 +629,9 @@ } */ *ap; { + if ((ap->a_vp->v_mount->mnt_flag & (MNT_ACLS | MNT_NFS4ACLS)) == 0) + return (EOPNOTSUPP); + if (ap->a_type == ACL_TYPE_NFS4) return (ufs_aclcheck_nfs4(ap)); From owner-p4-projects@FreeBSD.ORG Thu Sep 24 14:15:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3DAB1065693; Thu, 24 Sep 2009 14:15:32 +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 96FB41065679 for ; Thu, 24 Sep 2009 14:15:32 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 844B08FC14 for ; Thu, 24 Sep 2009 14:15:32 +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 n8OEFWKL035032 for ; Thu, 24 Sep 2009 14:15:32 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8OEFV7x035030 for perforce@freebsd.org; Thu, 24 Sep 2009 14:15:31 GMT (envelope-from mav@freebsd.org) Date: Thu, 24 Sep 2009 14:15:31 GMT Message-Id: <200909241415.n8OEFV7x035030@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 Cc: Subject: PERFORCE change 168847 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: Thu, 24 Sep 2009 14:15:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=168847 Change 168847 by mav@mav_mavbook on 2009/09/24 14:15:06 IFC Affected files ... .. //depot/projects/scottl-camlock/src/UPDATING#17 integrate .. //depot/projects/scottl-camlock/src/bin/sh/sh.1#5 integrate .. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#8 integrate .. //depot/projects/scottl-camlock/src/etc/rc.subr#5 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/groff/tmac/mdoc.local#5 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/patch/common.h#3 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/patch/pch.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/Makefile.inc#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/Symbol.map#6 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/getpagesizes.3#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/gen/getpagesizes.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/regex/engine.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/regex/grot/tests#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/kqueue.2#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/setfib.2#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/stack_protector.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libdevinfo/devinfo.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libdisk/change.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libjail/jail.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_umtx.h#3 integrate .. //depot/projects/scottl-camlock/src/release/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#4 integrate .. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#23 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/nop/gnop.8#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ipfw/ipfw.8#7 integrate .. //depot/projects/scottl-camlock/src/sbin/mksnap_ffs/mksnap_ffs.8#4 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_nfs/mount_nfs.c#5 integrate .. //depot/projects/scottl-camlock/src/sbin/savecore/savecore.8#3 integrate .. //depot/projects/scottl-camlock/src/share/examples/scsi_target/scsi_target.c#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/acpi_panasonic.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/procfs.5#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#7 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/Makefile#9 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_ACCESS.9#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/acl.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/fail.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_amrr.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_beacon.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_bmiss.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_crypto.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_ddb.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_input.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_node.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_output.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_proto.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_radiotap.9#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_regdomain.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_scan.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_vap.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/vaccess.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/vaccess_acl_nfs4.9#1 branch .. //depot/projects/scottl-camlock/src/share/misc/bsd-family-tree#4 integrate .. //depot/projects/scottl-camlock/src/share/misc/iso3166#3 integrate .. //depot/projects/scottl-camlock/src/share/timedef/hi_IN.ISCII-DEV.src#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/madt.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#33 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#20 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/acpica_machdep.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/param.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/pci/pci_cfgreg.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/param.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#35 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_target.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios_alloc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#36 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#47 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#23 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.i386#23 integrate .. //depot/projects/scottl-camlock/src/sys/conf/newvers.sh#11 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#33 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/x86emu/x86emu.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/x86emu/x86emu_util.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_aiboost.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_ibm.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_video.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpivar.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/atkbd.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ciss/cissreg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ciss/cissvar.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dpms/dpms.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/s3_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/pmc_events.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_stds.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_tpublic.h#11 delete .. //depot/projects/scottl-camlock/src/sys/dev/isp/ispmbox.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/kbd/kbd.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mwl/if_mwl.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge_var.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pcireg.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/vpo.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/es137x.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/es137x.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/t4dwave.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_cl_io.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_cl_share.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twe/twe.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twe/twevar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs_osrel.c#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_machdep.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/madt.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#24 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#35 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/acpica_machdep.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/param.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/pci/pci_cfgreg.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/param.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_event.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mib.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_acl_nfs4.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_devstat.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_smp.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/param.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#36 integrate .. //depot/projects/scottl-camlock/src/sys/modules/procfs/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/x86bios/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/x86emu/Makefile#2 delete .. //depot/projects/scottl-camlock/src/sys/net/if.c#36 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_llatbl.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_var.h#26 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_hwmp.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_mesh.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_mesh.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_mcast.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_proto.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/raw_ip.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_asconf.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_bsd_addr.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_input.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_os_bsd.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_structs.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_sysctl.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_timer.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_usrreq.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_subr.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timer.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timer.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_usrreq.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_var.h#26 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/sctp6_usrreq.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/key.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vfsops.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/pci/intpm.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/param.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/param.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/include/param.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/event.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/sys/kbio.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mman.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#32 integrate .. //depot/projects/scottl-camlock/src/sys/sys/smp.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/sys/systm.h#22 integrate .. //depot/projects/scottl-camlock/src/sys/sys/vnode.h#21 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_gjournal.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_vnops.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_mmap.c#17 integrate .. //depot/projects/scottl-camlock/src/tools/regression/acltools/00.t#3 integrate .. //depot/projects/scottl-camlock/src/tools/regression/acltools/03.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/acltools/aclfuzzer.sh#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/acltools/tools-crossfs.test#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/sockets/accf_data_attach/accf_data_attach.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/multitest.t#4 integrate .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1.10#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1.11#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1.12#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1.13#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1.14#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1.15#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1.16#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1.17#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1.18#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1.2#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1.3#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1.4#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1.4.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1.5#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1.6#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1.7#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1.8#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1.9#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/100_9.10#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/101_9.11#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/102_9.12#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/103_9.13#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/104_9.14#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/105_9.15#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/106_9.16#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/107_9.17#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/108_9.18#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/109_9.19#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/10_1.9#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/110_9.20#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/111_9.21#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/112_9.22#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/113_9.23#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/114_9.24#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/115_9.25#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/116_9.26#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/117_9.27#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/118_9.28#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/119_9.29#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/11_1.10#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/120_9.30#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/121_9.31#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/12_1.11#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/13_1.12#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/14_1.13#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/15_1.14#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/16_1.15#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/17_1.16#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/18_1.17#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/19_1.18#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/1_1.1#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.10#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.11#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.12#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.13#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.14#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.15#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.16#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.17#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.18#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.19#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.2#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.20#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.21#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.22#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.3#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.4#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.5#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.6#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.7#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.8#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2.9#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/20_2.1#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/21_2.2#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/22_2.3#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/23_2.4#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/24_2.5#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/25_2.6#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/26_2.7#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/27_2.8#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/28_2.9#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/29_2.10#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/2_1.2#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/3.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/3.2#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/3.3#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/3.4#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/30_2.11#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/31_2.12#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/32_2.13#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/33_2.14#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/34_2.15#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/35_2.16#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/36_2.17#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/37_2.18#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/38_2.19#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/39_2.20#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/3_1.3#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/4.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/4.2#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/4.3#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/4.4#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/4.5#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/4.6#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/4.7#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/4.8#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/40_2.21#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/40_3.1#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/41_2.22#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/41_3.2#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/42_3.3#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/43_3.4#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/44_4.1#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/45_4.2#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/46_4.3#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/47_4.4#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/48_4.5#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/49_4.6#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/4_1.4#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/5.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/5.2#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/5.3#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/5.4#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/5.5#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/5.6#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/5.7#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/5.8#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/50_4.7#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/51_4.8#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/52_5.1#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/53_5.2#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/54_5.3#3 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/55_5.4#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/56_5.5#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/57_5.6#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/58_5.7#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/59_5.8#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/5_1.4.1#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/6.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/6.2#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/6.3#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/6.4#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/6.5#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/6.6#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/60_6.1#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/61_6.2#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/62_6.3#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/63_6.4#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/64_6.5#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/65_6.6#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/66_7.1#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/67_7.2#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/68_7.3#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/69_7.4#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/6_1.5#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/7.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/7.2#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/7.3#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/7.4#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/7.5#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/7.6#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/7.7#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/7.8#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/70_7.5#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/71_7.6#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/72_7.7#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/73_7.8#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/74_8.1#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/75_8.2#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/76_8.3#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/77_8.4#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/78_8.5#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/79_8.6#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/7_1.6#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.10#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.11#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.12#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.13#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.14#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.15#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.16#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.17#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.18#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.19#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.2#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.20#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.21#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.22#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.23#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.3#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.4#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.5#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.6#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.7#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.8#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8.9#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/80_8.7#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/81_8.8#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/82_8.9#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/83_8.10#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/84_8.11#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/85_8.12#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/86_8.13#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/87_8.14#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/88_8.15#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/89_8.16#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/8_1.7#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.1#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.10#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.11#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.12#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.13#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.14#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.15#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.16#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.17#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.18#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.19#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.2#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.20#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.21#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.22#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.23#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.24#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.25#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.26#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.27#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.28#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.29#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.3#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.30#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.31#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.4#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.5#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.6#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.7#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.8#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9.9#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/90_8.17#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/91_9.1#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/92_9.2#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/93_9.3#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/94_9.4#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/95_9.5#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/96_9.6#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/97_9.7#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/98_9.8#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/99_9.9#2 delete .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/regress.multitest.out/9_1.8#2 delete .. //depot/projects/scottl-camlock/src/tools/tools/mwl/mwlstats/mwlstats.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/find.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/gcore/elfcore.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/inet.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/netstat.1#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/sed/compile.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/crashinfo/crashinfo.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/kbdcontrol/kbdcontrol.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/kbdcontrol/kbdmap.5#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/menus.c#6 integrate Differences ... ==== //depot/projects/scottl-camlock/src/UPDATING#17 (text+ko) ==== @@ -22,6 +22,10 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090922: + 802.11s D3.03 support was committed. This is incompatible with the + previous code, which was based on D3.0. + 20090910: ZFS snapshots are now mounted with MNT_IGNORE flag. Use -v option for mount(8) and -a option for df(1) to see them. @@ -975,4 +979,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.639 2009/09/14 21:10:40 pjd Exp $ +$FreeBSD: src/UPDATING,v 1.640 2009/09/22 18:19:18 rpaulo Exp $ ==== //depot/projects/scottl-camlock/src/bin/sh/sh.1#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.130 2009/06/24 22:04:04 jilles Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.131 2009/09/20 21:42:38 jilles Exp $ .\" .Dd May 31, 2009 .Dt SH 1 @@ -375,6 +375,10 @@ The word starting with .Ql # and the rest of the line are ignored. +.Pp +.Tn ASCII +.Dv NUL +characters (character code 0) are not allowed in shell input. .Ss Quoting Quoting is used to remove the special meaning of certain characters or words to the shell, such as operators, whitespace, keywords, ==== //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#8 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.360 2009/09/12 22:22:31 hrs Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.361 2009/09/17 19:05:47 dougb Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -23,6 +23,7 @@ rc_debug="NO" # Set to YES to enable debugging output from rc.d rc_info="NO" # Enables display of informational messages at boot. +rc_startmsgs="NO" # Show "Starting foo:" messages at boot rcshutdown_timeout="30" # Seconds to wait before terminating rc.shutdown early_late_divider="FILESYSTEMS" # Script that separates early/late # stages of the boot process. Make sure you know ==== //depot/projects/scottl-camlock/src/etc/rc.subr#5 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.89 2009/09/12 22:19:48 hrs Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.90 2009/09/17 19:05:47 dougb Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -708,7 +708,13 @@ # setup the full command to run # - [ -z "${rc_quiet}" ] && echo "Starting ${name}." + _show_startmsgs=1 + if [ -n "${rc_quiet}" ]; then + if ! checkyesno rc_startmsgs; then + unset _show_startmsgs + fi + fi + [ -n "$_show_startmsgs" ] && echo "Starting ${name}." if [ -n "$_chroot" ]; then _doit="\ ${_nice:+nice -n $_nice }\ ==== //depot/projects/scottl-camlock/src/gnu/usr.bin/groff/tmac/mdoc.local#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.69 2009/08/22 23:44:37 kensmith Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.70 2009/09/21 17:19:36 alc Exp $ .\" .\" %beginstrip% . @@ -72,6 +72,8 @@ .ds doc-operating-system-FreeBSD-6.3 6.3 .ds doc-operating-system-FreeBSD-6.4 6.4 .ds doc-operating-system-FreeBSD-7.1 7.1 +.ds doc-operating-system-FreeBSD-7.2 7.2 +.ds doc-operating-system-FreeBSD-7.3 7.3 .ds doc-operating-system-FreeBSD-8.0 8.0 .ds doc-operating-system-FreeBSD-9.0 9.0 . ==== //depot/projects/scottl-camlock/src/gnu/usr.bin/patch/common.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/patch/common.h,v 1.10 2009/05/08 02:18:46 sepotvin Exp $ +/* $FreeBSD: src/gnu/usr.bin/patch/common.h,v 1.11 2009/09/16 19:53:29 sepotvin Exp $ * * $Log: common.h,v $ * Revision 2.0.1.2 88/06/22 20:44:53 lwall @@ -34,6 +34,7 @@ #define Strcpy (void)strcpy #define Strcat (void)strcat #define Strlcpy (void)strlcpy +#define Strncpy (void)strncpy #define Strlcat (void)strlcat /* NeXT declares malloc and realloc incompatibly from us in some of ==== //depot/projects/scottl-camlock/src/gnu/usr.bin/patch/pch.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/patch/pch.c,v 1.22 2009/08/23 12:23:24 ed Exp $ +/* $FreeBSD: src/gnu/usr.bin/patch/pch.c,v 1.23 2009/09/16 19:53:29 sepotvin Exp $ * * $Log: pch.c,v $ * Revision 2.0.2.0 90/05/01 22:17:51 davison @@ -1176,7 +1176,8 @@ indent++; } } - Strlcpy(buf, line, len + 1 - skipped); + Strncpy(buf, line, len - skipped); + buf[len - skipped] = '\0'; } return len; } ==== //depot/projects/scottl-camlock/src/lib/libc/gen/Makefile.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.144 2009/07/13 12:53:43 trasz Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.145 2009/09/19 18:01:32 alc Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -15,7 +15,7 @@ getbootfile.c getbsize.c \ getcap.c getcwd.c getdomainname.c getgrent.c getgrouplist.c \ gethostname.c getloadavg.c getlogin.c getmntinfo.c getnetgrent.c \ - getosreldate.c getpagesize.c \ + getosreldate.c getpagesize.c getpagesizes.c \ getpeereid.c getprogname.c getpwent.c getttyent.c \ getusershell.c getvfsbyname.c glob.c \ initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \ @@ -51,8 +51,8 @@ getbootfile.3 getbsize.3 getcap.3 getcontext.3 getcwd.3 \ getdiskbyname.3 getdomainname.3 getfsent.3 \ getgrent.3 getgrouplist.3 gethostname.3 getloadavg.3 \ - getmntinfo.3 getnetgrent.3 getosreldate.3 \ - getpagesize.3 getpass.3 getpeereid.3 getprogname.3 getpwent.3 \ + getmntinfo.3 getnetgrent.3 getosreldate.3 getpagesize.3 \ + getpagesizes.3 getpass.3 getpeereid.3 getprogname.3 getpwent.3 \ getttyent.3 getusershell.3 getvfsbyname.3 \ glob.3 initgroups.3 isgreater.3 ldexp.3 lockf.3 makecontext.3 \ modf.3 \ ==== //depot/projects/scottl-camlock/src/lib/libc/gen/Symbol.map#6 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.21 2009/06/24 21:10:52 jhb Exp $ + * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.22 2009/09/19 18:01:32 alc Exp $ */ FBSD_1.0 { @@ -366,6 +366,10 @@ tcsetsid; }; +FBSD_1.2 { + getpagesizes; +}; + FBSDprivate_1.0 { /* needed by thread libraries */ __thr_jtable; ==== //depot/projects/scottl-camlock/src/lib/libc/regex/engine.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/regex/engine.c,v 1.21 2007/05/25 12:44:58 delphij Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/regex/engine.c,v 1.23 2009/09/16 06:32:23 dds Exp $"); /* * The matching engine and friends. This file is #included by regexec.c @@ -247,6 +247,8 @@ if (g->moffset > -1) start = ((dp - g->moffset) < start) ? start : dp - g->moffset; + SP("mloop", m->st, *start); + /* this loop does only one repetition except for backrefs */ for (;;) { endp = fast(m, start, stop, gf, gl); @@ -787,6 +789,7 @@ CLEAR(st); SET1(st, startst); + SP("fast", st, *p); st = step(m->g, startst, stopst, st, NOTHING, st); ASSIGN(fresh, st); SP("start", st, *p); @@ -1072,7 +1075,7 @@ OP(s = g->strip[pc+look]) != O_CH; look += OPND(s)) assert(OP(s) == OOR2); - FWD(aft, aft, look); + FWD(aft, aft, look + 1); } break; case OOR2: /* propagate OCH_'s marking */ ==== //depot/projects/scottl-camlock/src/lib/libc/regex/grot/tests#2 (text+ko) ==== @@ -1,5 +1,5 @@ # regular expression test set -# $FreeBSD: src/lib/libc/regex/grot/tests,v 1.3 2007/03/05 09:44:41 delphij Exp $ +# $FreeBSD: src/lib/libc/regex/grot/tests,v 1.4 2009/09/15 21:15:29 dds Exp $ # Lines are at least three fields, separated by one or more tabs. "" stands # for an empty field. First field is an RE. Second field is flags. If # C flag given, regcomp() is expected to fail, and the third field is the @@ -472,3 +472,6 @@ abcdefghijklmnopqrstuv i abcdefghijklmnopqrstuv abcdefghijklmnopqrstuv (ALAK)|(ALT[AB])|(CC[123]1)|(CM[123]1)|(GAMC)|(LC[23][EO ])|(SEM[1234])|(SL[ES][12])|(SLWW)|(SLF )|(SLDT)|(VWH[12])|(WH[34][EW])|(WP1[ESN]) - CC11 CC11 CC[13]1|a{21}[23][EO][123][Es][12]a{15}aa[34][EW]aaaaaaa[X]a - CC11 CC11 +# PR 130504 +(.|())(b) - ab ab +(()|.)(b) - ab ab ==== //depot/projects/scottl-camlock/src/lib/libc/sys/kqueue.2#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/lib/libc/sys/kqueue.2,v 1.46 2007/09/07 13:10:09 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.49 2009/09/16 03:49:54 sson Exp $ .\" -.Dd September 6, 2007 +.Dd September 15, 2009 .Dt KQUEUE 2 .Os .Sh NAME @@ -201,11 +201,25 @@ .Fn kevent will not return it. The filter itself is not disabled. +.It EV_DISPATCH +Disable the event source immediately after delivery of an event. +See +.Dv EV_DISABLE +above. .It EV_DELETE Removes the event from the kqueue. Events which are attached to file descriptors are automatically deleted on the last close of the descriptor. +.It EV_RECEIPT +This flag is useful for making bulk changes to a kqueue without draining +any pending events. +When passed as input, it forces +.Dv EV_ERROR +to always be returned. +When a filter is successfully added the +.Va data +field will be zero. .It EV_ONESHOT Causes the event to return only the first occurrence of the filter being triggered. @@ -441,6 +455,44 @@ On return, .Va fflags contains the events which triggered the filter. +.It Dv EVFILT_USER +Establishes a user event identified by +.Va ident +which is not assosicated with any kernel mechanism but is triggered by +user level code. +The lower 24 bits of the +.Va fflags +may be used for user defined flags and manipulated using the following: +.Bl -tag -width XXNOTE_FFLAGSMASK +.It Dv NOTE_FFNOP +Ignore the input +.Va fflags . +.It Dv NOTE_FFAND +Bitwise AND +.Va fflags . +.It Dv NOTE_FFOR +Bitwise OR +.Va fflags . +.It Dv NOTE_COPY +Copy +.Va fflags . +.It Dv NOTE_FFCTRLMASK +Control mask for +.Va fflags . +.It Dv NOTE_FFLAGSMASK +User defined flag mask for +.Va fflags . +.El +.Pp +A user event is triggered for output with the following: +.Bl -tag -width XXNOTE_FFLAGSMASK +.It Dv NOTE_TRIGGER +Cause the event to be triggered. +.El +.Pp +On return, +.Va fflags +contains the users defined flags in the lower 24 bits. .El .Sh RETURN VALUES The ==== //depot/projects/scottl-camlock/src/lib/libc/sys/setfib.2#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/libc/sys/setfib.2,v 1.5 2009/04/23 08:37:56 brueffer Exp $ +.\" $FreeBSD: src/lib/libc/sys/setfib.2,v 1.6 2009/09/18 14:17:00 brueffer Exp $ .\" .Dd August 8, 2008 .Dt SETFIB 2 @@ -67,8 +67,8 @@ .Fa fib argument is greater than the current system maximum. .Sh SEE ALSO -.Xr setsockopt 2 , -.Xr setfib 8 +.Xr setfib 1 , +.Xr setsockopt 2 .Sh STANDARDS The .Fn setfib ==== //depot/projects/scottl-camlock/src/lib/libc/sys/stack_protector.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.5 2009/07/14 21:19:13 kan Exp $ */ +/* $FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.6 2009/09/17 13:21:53 kan Exp $ */ /* $NetBSD: stack_protector.c,v 1.4 2006/11/22 17:23:25 christos Exp $ */ /* $OpenBSD: stack_protector.c,v 1.10 2006/03/31 05:34:44 deraadt Exp $ */ /* @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.5 2009/07/14 21:19:13 kan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sys/stack_protector.c,v 1.6 2009/09/17 13:21:53 kan Exp $"); #include #include @@ -108,4 +108,8 @@ __fail("buffer overflow detected; terminated"); } +#ifdef PIC __sym_compat(__stack_chk_fail_local, __stack_chk_fail, FBSD_1.0); +#else +__weak_reference(__stack_chk_fail, __stack_chk_fail_local); +#endif ==== //depot/projects/scottl-camlock/src/lib/libdevinfo/devinfo.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libdevinfo/devinfo.h,v 1.5 2005/08/31 14:57:39 rodrigc Exp $ + * $FreeBSD: src/lib/libdevinfo/devinfo.h,v 1.6 2009/09/15 16:59:52 attilio Exp $ */ #ifndef _DEVINFO_H_INCLUDED @@ -41,10 +41,10 @@ */ /* XXX not sure if I want a copy here, or expose sys/bus.h */ typedef enum devinfo_state { - DIS_NOTPRESENT, /* not probed or probe failed */ - DIS_ALIVE, /* probe succeeded */ - DIS_ATTACHED, /* attach method called */ - DIS_BUSY /* device is open */ + DIS_NOTPRESENT = 10, /* not probed or probe failed */ + DIS_ALIVE = 20, /* probe succeeded */ + DIS_ATTACHED = 30, /* attach method called */ + DIS_BUSY = 40 /* device is open */ } devinfo_state_t; struct devinfo_dev { ==== //depot/projects/scottl-camlock/src/lib/libdisk/change.c#4 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/change.c,v 1.29 2009/06/17 06:47:05 lulf Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/change.c,v 1.31 2009/09/21 04:04:02 nyan Exp $"); #include #include @@ -36,17 +36,22 @@ if (disk->bios_cyl >= 65536) sane = 0; - if (disk->bios_hd > 256) +#ifdef PC98 + if (disk->bios_hd >= 256) sane = 0; -#ifdef PC98 if (disk->bios_sect >= 256) + sane = 0; #else + if (disk->bios_hd > 256) + sane = 0; if (disk->bios_sect > 63) + sane = 0; #endif - sane = 0; +#if 0 /* Disable a check on a disk size. It's too strict. */ if (disk->bios_cyl * disk->bios_hd * disk->bios_sect != disk->chunks->size) sane = 0; +#endif if (sane) return; ==== //depot/projects/scottl-camlock/src/lib/libjail/jail.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/libjail/jail.3,v 1.1 2009/06/24 18:18:35 jamie Exp $ +.\" $FreeBSD: src/lib/libjail/jail.3,v 1.2 2009/09/21 08:30:52 ru Exp $ .\" .Dd June 24, 2009 .Dt JAIL 3 @@ -39,7 +39,7 @@ .Nm jailparam_set , .Nm jailparam_get , .Nm jailparam_export , -.Nm jailparam_free , +.Nm jailparam_free .Nd create and manage system jails .Sh LIBRARY .Lb libjail @@ -89,14 +89,16 @@ The .Fn jail_getid function returns the JID of the jail identified by -.Ar name , +.Fa name , or \-1 if the jail does not exist. .Pp The .Fn jail_getname function returns the name of the jail identified by -.Ar jid , -or NULL if the jail does not exist. +.Fa jid , +or +.Dv NULL +if the jail does not exist. .Pp The .Fn jail_setv @@ -116,7 +118,7 @@ The .Fn jailparam_all function sets -.Ar jpp +.Fa jpp to a list of all known jail parameters, and returns the number of parameters. The list should later be freed with @@ -127,14 +129,15 @@ The .Fn jailparam_init function clears a parameter record and copies the -.Ar name -to it. After use, it should be freed with +.Fa name +to it. +After use, it should be freed with .Fn jailparam_free . .Pp The .Fn jailparam_import function adds a -.Ar value +.Fa value to a parameter record, converting it from a string to its native form. The .Fn jailparam_import_raw @@ -151,7 +154,7 @@ .Pp The .Fn jailparam_get -function function passes a list of parameters to +function passes a list of parameters to .Xr jail_get 2 . The parameters are assumed to have been created with .Fn jailparam_init @@ -163,7 +166,7 @@ The .Fn jailparam_export function returns the string equivalent of a parameter value. -The returned string should freed after use. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 24 16:28:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F6481065676; Thu, 24 Sep 2009 16:28: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 EE7FB1065670 for ; Thu, 24 Sep 2009 16:28:58 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DDABB8FC1A for ; Thu, 24 Sep 2009 16:28:58 +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 n8OGSwmV046872 for ; Thu, 24 Sep 2009 16:28:58 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8OGSwrR046870 for perforce@freebsd.org; Thu, 24 Sep 2009 16:28:58 GMT (envelope-from truncs@FreeBSD.org) Date: Thu, 24 Sep 2009 16:28:58 GMT Message-Id: <200909241628.n8OGSwrR046870@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Cc: Subject: PERFORCE change 168852 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: Thu, 24 Sep 2009 16:28:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=168852 Change 168852 by truncs@aditya on 2009/09/24 16:28:35 Finish Orlov Block allocator for FreeBSD. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#8 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#7 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2fs.h#3 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#8 (text+ko) ==== @@ -446,8 +446,60 @@ return (mincg); } + /* + * Count various limits which used for + * optimal allocation of a directory inode. + */ + maxndir = min(avgndir + fs->e2fs_ipg / 16, fs->e2fs_ipg); + minifree = avgifree - avgifree / 4; + if (minifree < 1) + minifree = 1; + minbfree = avgbfree - avgbfree / 4; + if (minbfree < 1) + minbfree = 1; + cgsize = fs->e2fs_fsize * fs->e2fs_fpg; + dirsize = AVGDIRSIZE; + curdirsize = avgndir ? (cgsize - avgbfree * fs->e2fs_bsize) / avgndir : 0; + if (dirsize < curdirsize) + dirsize = curdirsize; + if (dirsize <= 0) + maxcontigdirs = 0; /* dirsize overflowed */ + else + maxcontigdirs = min((avgbfree * fs->e2fs_bsize) / dirsize, 255); + maxcontigdirs = min(maxcontigdirs, fs->fs_ipg / AFPDIR); + if (maxcontigdirs == 0) + maxcontigdirs = 1; - + /* + * Limit number of dirs in one cg and reserve space for + * regular files, but only if we have no deficit in + * inodes or space. + */ + prefcg = ino_to_cg(fs, pip->i_number); + for (cg = prefcg; cg < fs->e2fs_gcount; cg++) + if (fs->e2fs_gd[cg].ext2bgd_ndirs < maxndir && + fs->e2fs_gd[cg].ext2bgd_nifree >= minifree && + fs->e2fs_gd[cg].ext2bgd_nbfree >= minbfree) { + if (fs->e2fs_contigdirs[cg] < maxcontigdirs) + return (cg); + } + for (cg = 0; cg < prefcg; cg++) + if (fs->e2fs_gd[cg].ext2bgd_ndirs < maxndir && + fs->e2fs_gd[cg].ext2bgd_nifree >= minifree && + fs->e2fs_gd[cg].ext2bgd_nbfree >= minbfree) { + if (fs->e2fs_contigdirs[cg] < maxcontigdirs) + return (cg); + } + /* + * This is a backstop when we have deficit in space. + */ + for (cg = prefcg; cg < fs->e2fs_gcount; cg++) + if (fs->e2fs_gd[cg].ext2bgd_nifree >= avgifree) + return (cg); + for (cg = 0; cg < prefcg; cg++) + if (fs->e2fs_gd[cg].ext2bgd_nifree >= avgifree) + break; + return (cg); } /* ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#7 (text+ko) ==== @@ -357,6 +357,8 @@ fs->e2fs_gdbcount = db_count; fs->e2fs_gd = malloc(db_count * fs->e2fs_bsize, M_EXT2MNT, M_WAITOK); + fs->e2fs_contigdirs = malloc(fs->e2fs_gcount * sizeof(*fs->e2fs_contigdirs), + M_EXT2MNT, M_WAITOK); /* * Adjust logic_sb_block. @@ -384,6 +386,7 @@ fs->e2fs_total_dir = 0; for (i=0; i < fs->e2fs_gcount; i++){ fs->e2fs_total_dir += fs->e2fs_gd[i].ext2bgd_ndirs; + fs->e2fs_contigdirs[i] = 0; } uprintf("Total dirs %d", fs->e2fs_total_dir); if (es->e2fs_rev == E2FS_REV0 || @@ -627,6 +630,7 @@ } if (ump) { free(ump->um_e2fs->e2fs_gd, M_EXT2MNT); + free(ump->um_e2fs->e2fs_contigdirs, M_EXT2MNT); free(ump->um_e2fs->e2fs, M_EXT2MNT); free(ump->um_e2fs, M_EXT2MNT); free(ump, M_EXT2MNT); @@ -669,6 +673,7 @@ PICKUP_GIANT(); vrele(ump->um_devvp); free(fs->e2fs_gd, M_EXT2MNT); + free(fs->e2fs_contigdirs, M_EXT2MNT); free(fs->e2fs, M_EXT2MNT); free(fs, M_EXT2MNT); free(ump, M_EXT2MNT); ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2fs.h#3 (text+ko) ==== @@ -188,6 +188,7 @@ uint32_t e2fs_mount_opt; uint32_t e2fs_blocksize_bits; uint32_t e2fs_total_dir; /* Total number of directories */ + uint8_t *e2fs_contigdirs; char e2fs_wasvalid; /* valid at mount time */ off_t e2fs_maxfilesize; struct ext2_gd *e2fs_gd; /* Group Descriptors */ From owner-p4-projects@FreeBSD.ORG Thu Sep 24 16:46:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43201106568B; Thu, 24 Sep 2009 16:46: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 EE3DD106566C for ; Thu, 24 Sep 2009 16:46:17 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DDC258FC15 for ; Thu, 24 Sep 2009 16:46:17 +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 n8OGkH61048146 for ; Thu, 24 Sep 2009 16:46:17 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8OGkHhR048144 for perforce@freebsd.org; Thu, 24 Sep 2009 16:46:17 GMT (envelope-from truncs@FreeBSD.org) Date: Thu, 24 Sep 2009 16:46:17 GMT Message-Id: <200909241646.n8OGkHhR048144@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Cc: Subject: PERFORCE change 168853 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: Thu, 24 Sep 2009 16:46:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=168853 Change 168853 by truncs@aditya on 2009/09/24 16:45:21 Update the orlov block allocator variables when dealing with directory inodes. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#9 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#9 (text+ko) ==== @@ -343,10 +343,15 @@ * else obtain it using ino_to_cg. The preferred inode is always the next * inode. */ - if((mode & IFMT) == IFDIR) + if((mode & IFMT) == IFDIR) { cg = ext2_dirpref(pip); - else + if (fs->e2fs_contigdirs[cg] < 255) + fs->e2fs_contigdirs[cg]++; + } else { cg = ino_to_cg(fs, pip->i_number); + if (fs->e2fs_contigdirs[cg] > 0) + fs->e2fs_contigdirs[cg]--; + } ipref = cg * fs->e2fs->e2fs_ipg + 1; ino = (ino_t)ext2_hashalloc(pip, cg, (long)ipref, mode, ext2_nodealloccg); @@ -418,7 +423,7 @@ avgifree = fs->e2fs->e2fs_ficount / fs->e2fs_gcount; avgbfree = fs->e2fs->e2fs_fbcount / fs->e2fs_gcount; - avgndir = fs->e2fs_total_dir / e2fs->e2fs_gcount; + avgndir = fs->e2fs_total_dir / fs->e2fs_gcount; /* * Force allocation in another cg if creating a first level dir. @@ -466,7 +471,7 @@ maxcontigdirs = 0; /* dirsize overflowed */ else maxcontigdirs = min((avgbfree * fs->e2fs_bsize) / dirsize, 255); - maxcontigdirs = min(maxcontigdirs, fs->fs_ipg / AFPDIR); + maxcontigdirs = min(maxcontigdirs, fs->e2fs_ipg / AFPDIR); if (maxcontigdirs == 0) maxcontigdirs = 1; @@ -748,6 +753,7 @@ fs->e2fs_fmod = 1; if ((mode & IFMT) == IFDIR) { fs->e2fs_gd[cg].ext2bgd_ndirs++; + fs->e2fs_total_dir++; } bdwrite(bp); unlock_super(DEVVP(ip)); @@ -842,6 +848,7 @@ fs->e2fs_gd[cg].ext2bgd_nifree++; if ((mode & IFMT) == IFDIR) { fs->e2fs_gd[cg].ext2bgd_ndirs--; + fs->e2fs_total_dir--; } fs->e2fs_fmod = 1; bdwrite(bp); From owner-p4-projects@FreeBSD.ORG Thu Sep 24 21:27:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BEC11065676; Thu, 24 Sep 2009 21:27:28 +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 D3D58106566B for ; Thu, 24 Sep 2009 21:27:27 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C2FD48FC1E for ; Thu, 24 Sep 2009 21:27:27 +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 n8OLRQqn094572 for ; Thu, 24 Sep 2009 21:27:26 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8OLRQ8Q094570 for perforce@freebsd.org; Thu, 24 Sep 2009 21:27:26 GMT (envelope-from trasz@freebsd.org) Date: Thu, 24 Sep 2009 21:27:26 GMT Message-Id: <200909242127.n8OLRQ8Q094570@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 168865 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: Thu, 24 Sep 2009 21:27:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=168865 Change 168865 by trasz@trasz_victim on 2009/09/24 21:26:29 Make vop_stdaccess() work for fifos as well. Without it, for filesystem using vop_stdaccess(), all fifo operations fail with EBADF. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fifofs/fifo_vnops.c#10 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fifofs/fifo_vnops.c#10 (text+ko) ==== @@ -119,7 +119,6 @@ struct vop_vector fifo_specops = { .vop_default = &default_vnodeops, - .vop_access = VOP_EBADF, .vop_advlock = fifo_advlock, .vop_close = fifo_close, .vop_create = VOP_PANIC, From owner-p4-projects@FreeBSD.ORG Thu Sep 24 21:29:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69B381065670; Thu, 24 Sep 2009 21:29: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 2E06B106566B for ; Thu, 24 Sep 2009 21:29:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 128D08FC22 for ; Thu, 24 Sep 2009 21:29: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 n8OLTS4G094684 for ; Thu, 24 Sep 2009 21:29:28 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8OLTSOv094682 for perforce@freebsd.org; Thu, 24 Sep 2009 21:29:28 GMT (envelope-from trasz@freebsd.org) Date: Thu, 24 Sep 2009 21:29:28 GMT Message-Id: <200909242129.n8OLTSOv094682@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 168866 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: Thu, 24 Sep 2009 21:29:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=168866 Change 168866 by trasz@trasz_victim on 2009/09/24 21:28:41 Instead of calling vfs_unixify_accmode() in vaccess(9) and vaccess_acl_posix1e(9), just KASSERT that there are no NFSv4 bits passed to them and do the 'unixification' in ufs_accessx(). Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#16 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#40 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#34 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#16 (text+ko) ==== @@ -59,7 +59,10 @@ accmode_t dac_granted; accmode_t priv_granted; accmode_t acl_mask_granted; - int group_matched, i, error; + int group_matched, i; + + KASSERT((accmode & ~(VEXEC | VWRITE | VREAD | VADMIN | VAPPEND)) == 0, + ("invalid bit in accmode")); /* * Look for a normal, non-privileged way to access the file/directory @@ -71,10 +74,6 @@ if (privused != NULL) *privused = 0; - error = vfs_unixify_accmode(&accmode); - if (error) - return (error); - /* * Determine privileges now, but don't apply until we've found a DAC * entry that matches but has failed to allow access. ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#40 (text+ko) ==== @@ -3519,7 +3519,9 @@ { accmode_t dac_granted; accmode_t priv_granted; - int error; + + KASSERT((accmode & ~(VEXEC | VWRITE | VREAD | VADMIN | VAPPEND)) == 0, + ("invalid bit in accmode")); /* * Look for a normal, non-privileged way to access the file/directory @@ -3529,10 +3531,6 @@ if (privused != NULL) *privused = 0; - error = vfs_unixify_accmode(&accmode); - if (error) - return (error); - dac_granted = 0; /* Check the owner. */ @@ -3645,13 +3643,6 @@ /* Potentially should be: return (EPERM); */ return (priv_check_cred(cred, PRIV_VFS_EXTATTR_SYSTEM, 0)); case EXTATTR_NAMESPACE_USER: -#ifdef SunOS_doesnt_do_that - if (accmode == VREAD) - return (VOP_ACCESSX(vp, VREAD_NAMED_ATTRS, cred, td)); - if (accmode == VWRITE) - return (VOP_ACCESSX(vp, VWRITE_NAMED_ATTRS, cred, td)); -#endif - /* XXX: Is this possible for "accmode" to not be any of the two above? */ return (VOP_ACCESS(vp, accmode, cred, td)); default: return (EPERM); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#34 (text+ko) ==== @@ -88,7 +88,6 @@ #include -static vop_access_t ufs_access; static vop_accessx_t ufs_accessx; static int ufs_chmod(struct vnode *, int, struct ucred *, struct thread *); static int ufs_chown(struct vnode *, uid_t, gid_t, struct ucred *, struct thread *); @@ -299,19 +298,6 @@ } static int -ufs_access(ap) - struct vop_access_args /* { - struct vnode *a_vp; - accmode_t a_accmode; - struct ucred *a_cred; - struct thread *a_td; - } */ *ap; -{ - - return (VOP_ACCESSX(ap->a_vp, ap->a_accmode, ap->a_cred, ap->a_td)); -} - -static int ufs_accessx(ap) struct vop_accessx_args /* { struct vnode *a_vp; @@ -323,6 +309,7 @@ struct vnode *vp = ap->a_vp; struct inode *ip = VTOI(vp); int error; + accmode_t accmode = ap->a_accmode; #ifdef QUOTA int relocked; #endif @@ -336,7 +323,7 @@ * unless the file is a socket, fifo, or a block or * character device resident on the filesystem. */ - if (ap->a_accmode & VMODIFY_PERMS) { + if (accmode & VMODIFY_PERMS) { switch (vp->v_type) { case VDIR: case VLNK: @@ -382,11 +369,11 @@ } /* - * If immutable bit set, nobody gets to write it. - * "& ~VADMIN_PERMS" is here, because without it, - * it would be impossible to remove the IMMUTABLE flag. + * If immutable bit set, nobody gets to write it. "& ~VADMIN_PERMS" + * is here, because without it, * it would be impossible for the owner + * to remove the IMMUTABLE flag. */ - if ((ap->a_accmode & (VMODIFY_PERMS & ~VADMIN_PERMS)) && + if ((accmode & (VMODIFY_PERMS & ~VADMIN_PERMS)) && (ip->i_flags & (IMMUTABLE | SF_SNAPSHOT))) return (EPERM); @@ -398,39 +385,43 @@ type = ACL_TYPE_ACCESS; acl = acl_alloc(M_WAITOK); - error = VOP_GETACL(vp, type, acl, ap->a_cred, - ap->a_td); + error = VOP_GETACL(vp, type, acl, ap->a_cred, ap->a_td); switch (error) { - case EOPNOTSUPP: - error = vaccess(vp->v_type, ip->i_mode, ip->i_uid, - ip->i_gid, ap->a_accmode, ap->a_cred, NULL); - break; case 0: if (type == ACL_TYPE_NFS4) { error = vaccess_acl_nfs4(vp->v_type, ip->i_uid, - ip->i_gid, acl, ap->a_accmode, ap->a_cred, NULL); + ip->i_gid, acl, accmode, ap->a_cred, NULL); } else { - error = vaccess_acl_posix1e(vp->v_type, ip->i_uid, - ip->i_gid, acl, ap->a_accmode, ap->a_cred, NULL); + error = vfs_unixify_accmode(&accmode); + if (error == 0) + error = vaccess_acl_posix1e(vp->v_type, ip->i_uid, + ip->i_gid, acl, accmode, ap->a_cred, NULL); } break; default: - printf( + if (error != EOPNOTSUPP) + printf( "ufs_accessx(): Error retrieving ACL on object (%d).\n", - error); + error); /* * XXX: Fall back until debugged. Should * eventually possibly log an error, and return * EPERM for safety. */ - error = vaccess(vp->v_type, ip->i_mode, ip->i_uid, - ip->i_gid, ap->a_accmode, ap->a_cred, NULL); + error = vfs_unixify_accmode(&accmode); + if (error == 0) + error = vaccess(vp->v_type, ip->i_mode, ip->i_uid, + ip->i_gid, accmode, ap->a_cred, NULL); } acl_free(acl); - } else + + return (error); + } #endif /* !UFS_ACL */ + error = vfs_unixify_accmode(&accmode); + if (error == 0) error = vaccess(vp->v_type, ip->i_mode, ip->i_uid, ip->i_gid, - ap->a_accmode, ap->a_cred, NULL); + accmode, ap->a_cred, NULL); return (error); } @@ -2634,7 +2625,6 @@ .vop_read = VOP_PANIC, .vop_reallocblks = VOP_PANIC, .vop_write = VOP_PANIC, - .vop_access = ufs_access, .vop_accessx = ufs_accessx, .vop_bmap = ufs_bmap, .vop_cachedlookup = ufs_lookup, @@ -2679,7 +2669,6 @@ struct vop_vector ufs_fifoops = { .vop_default = &fifo_specops, .vop_fsync = VOP_PANIC, - .vop_access = ufs_access, .vop_accessx = ufs_accessx, .vop_close = ufsfifo_close, .vop_getattr = ufs_getattr, From owner-p4-projects@FreeBSD.ORG Fri Sep 25 09:00:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B85B1065676; Fri, 25 Sep 2009 09:00: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 35BC8106566B for ; Fri, 25 Sep 2009 09:00:14 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 252E18FC19 for ; Fri, 25 Sep 2009 09:00: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 n8P90Es0086936 for ; Fri, 25 Sep 2009 09:00:14 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8P90D9V086915 for perforce@freebsd.org; Fri, 25 Sep 2009 09:00:13 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 25 Sep 2009 09:00:13 GMT Message-Id: <200909250900.n8P90D9V086915@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 Cc: Subject: PERFORCE change 168873 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, 25 Sep 2009 09:00:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=168873 Change 168873 by rene@rene_self on 2009/09/25 08:29:57 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#7 integrate .. //depot/projects/docproj_nl/www/en/releases/8.0R/docbook.css#1 branch .. //depot/projects/docproj_nl/www/en/releases/8.0R/schedule.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/releases/Makefile#4 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#16 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#7 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -151,7 +151,8 @@ adding - Lets say we want to add a new SCSI disk to a machine that + The following section will describe how to add a new + SCSI disk to a machine that currently only has a single drive. First turn off the computer and install the drive in the computer following the instructions of the computer, controller, and drive manufacturer. Due to the ==== //depot/projects/docproj_nl/www/en/releases/8.0R/schedule.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -96,34 +96,41 @@ BETA3 13 July 2009 - - + 24 August 2009 Third beta test snapshot. + BETA4 builds + 5 September 2009 + 7 September 2009 + Begin BETA4 builds. + + + RC1 - 27 July 2009 - - + 14 September 2009 + 21 September 2009 First release candidate. RC2 - 17 August 2009 + 21 September 2009 - Second release candidate. RELEASE build - 31 August 2009 + 28 September 2009 - 8.0-RELEASE built. RELEASE announcement - 4 September 2009 + TBD - 8.0-RELEASE announced. ==== //depot/projects/docproj_nl/www/en/releases/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/releases/Makefile,v 1.53 2009/03/17 13:40:36 rwatson Exp $ +# $FreeBSD: www/en/releases/Makefile,v 1.54 2009/09/23 20:03:59 blackend Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -15,7 +15,7 @@ SUBDIR+= 4.6.2R 4.7R 4.8R 4.9R 4.10R 4.11R SUBDIR+= 5.0R 5.1R 5.2R 5.2.1R 5.3R 5.4R 5.5R SUBDIR+= 6.0R 6.1R 6.2R 6.3R 6.4R -SUBDIR+= 7.0R 7.1R 7.2R +SUBDIR+= 7.0R 7.1R 7.2R 8.0R .if defined $(NEW_BUILD) SUBDIR= ==== //depot/projects/docproj_nl/www/share/sgml/release.ent#16 (text+ko) ==== @@ -1,4 +1,4 @@ - + - + - - - - + + + + [Distributie] + [Distributie] [ISO] From owner-p4-projects@FreeBSD.ORG Fri Sep 25 09:44:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFCC21065679; Fri, 25 Sep 2009 09:44:02 +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 744A91065676 for ; Fri, 25 Sep 2009 09:44:02 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 641198FC1D for ; Fri, 25 Sep 2009 09:44:02 +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 n8P9i22P091002 for ; Fri, 25 Sep 2009 09:44:02 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8P9i2bM091000 for perforce@freebsd.org; Fri, 25 Sep 2009 09:44:02 GMT (envelope-from truncs@FreeBSD.org) Date: Fri, 25 Sep 2009 09:44:02 GMT Message-Id: <200909250944.n8P9i2bM091000@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Cc: Subject: PERFORCE change 168877 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, 25 Sep 2009 09:44:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=168877 Change 168877 by truncs@aditya on 2009/09/25 09:43:05 Make the comment more verbose. Explain about AFPDIR and AVGDIRSIZE. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/fs.h#3 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/fs.h#3 (text+ko) ==== @@ -57,10 +57,15 @@ /* * The path name on which the file system is mounted is maintained * in fs_fsmnt. MAXMNTLEN defines the amount of space allocated in - * the super block for this name. + * the super block for this name. AVFPDIR is the expected number of + * files per directory. AVGDIRSIZE is obtained by multiplying AVFPDIR + * and AVFILESIZ which is assumed to be 16384. Both AVFPDIR and AVFFIZSIZ + * are taken from UFS and they are used in implementation of Orlov Block + * Allocator. */ -#define MAXMNTLEN 512 - +#define MAXMNTLEN 512 +#define AFPDIR 64 +#define AVGDIRSIZE 1048576 /* * Macros for access to superblock array structures */ From owner-p4-projects@FreeBSD.ORG Fri Sep 25 12:51:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05B121065672; Fri, 25 Sep 2009 12:51: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 BE3B6106566B for ; Fri, 25 Sep 2009 12:51:27 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC9EB8FC12 for ; Fri, 25 Sep 2009 12:51:27 +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 n8PCpRRw017554 for ; Fri, 25 Sep 2009 12:51:27 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8PCpRNJ017552 for perforce@freebsd.org; Fri, 25 Sep 2009 12:51:27 GMT (envelope-from stas@freebsd.org) Date: Fri, 25 Sep 2009 12:51:27 GMT Message-Id: <200909251251.n8PCpRNJ017552@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168880 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, 25 Sep 2009 12:51:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=168880 Change 168880 by stas@stas_yandex on 2009/09/25 12:50:58 - Implement sched_yield syscall wrapper. Affected files ... .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#43 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#43 (text+ko) ==== @@ -872,6 +872,11 @@ PRE_REG_READ0(long, "yield"); } +PRE(sys_sched_yield) +{ + PRINT("sched_yield()"); +} + #if 0 PRE(sys_sysinfo) { @@ -3626,7 +3631,7 @@ // BSDXY(__NR_sched_getparam, sys_sched_getparam), // 328 // BSDX_(__NR_sched_setscheduler, sys_sched_setscheduler), // 329 // BSDX_(__NR_sched_getscheduler, sys_sched_getscheduler), // 330 -// BSDX_(__NR_sched_yield, sys_sched_yield), // 331 + BSDX_(__NR_sched_yield, sys_sched_yield), // 331 // BSDX_(__NR_sched_get_priority_max, sys_sched_get_priority_max), // 332 // BSDX_(__NR_sched_get_priority_min, sys_sched_get_priority_min), // 333 From owner-p4-projects@FreeBSD.ORG Fri Sep 25 13:48:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0B68106568F; Fri, 25 Sep 2009 13:48: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 83F431065672 for ; Fri, 25 Sep 2009 13:48:30 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 70BDE8FC25 for ; Fri, 25 Sep 2009 13:48: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 n8PDmUTn022629 for ; Fri, 25 Sep 2009 13:48:30 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8PDmTS4022627 for perforce@freebsd.org; Fri, 25 Sep 2009 13:48:29 GMT (envelope-from stas@freebsd.org) Date: Fri, 25 Sep 2009 13:48:29 GMT Message-Id: <200909251348.n8PDmTS4022627@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168881 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, 25 Sep 2009 13:48:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=168881 Change 168881 by stas@stas_yandex on 2009/09/25 13:48:13 - Integrate. Affected files ... .. //depot/projects/valgrind/Makefile.am#15 integrate .. //depot/projects/valgrind/NEWS#4 integrate .. //depot/projects/valgrind/VEX/Makefile-gcc#2 integrate .. //depot/projects/valgrind/VEX/priv/guest_generic_bb_to_IR.c#2 integrate .. //depot/projects/valgrind/VEX/priv/main_main.c#2 integrate .. //depot/projects/valgrind/VEX/useful/smchash.c#1 branch .. //depot/projects/valgrind/cachegrind/docs/cg-manual.xml#5 integrate .. //depot/projects/valgrind/cachegrind/tests/filter_stderr#5 integrate .. //depot/projects/valgrind/callgrind/callgrind_annotate.in#4 integrate .. //depot/projects/valgrind/callgrind/dump.c#5 integrate .. //depot/projects/valgrind/callgrind/main.c#4 integrate .. //depot/projects/valgrind/callgrind/tests/filter_stderr#4 integrate .. //depot/projects/valgrind/callgrind/threads.c#4 integrate .. //depot/projects/valgrind/configure.in#16 integrate .. //depot/projects/valgrind/coregrind/launcher-linux.c#6 integrate .. //depot/projects/valgrind/coregrind/m_debuginfo/debuginfo.c#9 integrate .. //depot/projects/valgrind/coregrind/m_demangle/cp-demangle.c#5 integrate .. //depot/projects/valgrind/coregrind/m_errormgr.c#5 integrate .. //depot/projects/valgrind/coregrind/m_main.c#15 integrate .. //depot/projects/valgrind/coregrind/m_signals.c#13 integrate .. //depot/projects/valgrind/coregrind/m_stacktrace.c#6 integrate .. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-darwin.h#2 integrate .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-darwin.c#2 integrate .. //depot/projects/valgrind/coregrind/m_tooliface.c#4 integrate .. //depot/projects/valgrind/coregrind/m_xarray.c#4 integrate .. //depot/projects/valgrind/coregrind/pub_core_tooliface.h#4 integrate .. //depot/projects/valgrind/docs/internals/release-HOWTO.txt#4 integrate .. //depot/projects/valgrind/docs/internals/xml-output-protocol4.txt#2 integrate .. //depot/projects/valgrind/docs/xml/manual-core.xml#5 integrate .. //depot/projects/valgrind/docs/xml/vg-entities.xml#4 integrate .. //depot/projects/valgrind/drd/docs/drd-manual.xml#3 integrate .. //depot/projects/valgrind/drd/drd.h#3 integrate .. //depot/projects/valgrind/drd/drd_clientreq.c#3 integrate .. //depot/projects/valgrind/drd/drd_error.c#3 integrate .. //depot/projects/valgrind/drd/drd_error.h#3 integrate .. //depot/projects/valgrind/drd/tests/Makefile.am#4 integrate .. //depot/projects/valgrind/drd/tests/annotate_hbefore.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/annotate_hbefore.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/annotate_ignore_rw.c#1 branch .. //depot/projects/valgrind/drd/tests/annotate_ignore_rw.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/annotate_ignore_rw.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/annotate_ignore_rw2.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/annotate_ignore_rw2.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/annotate_ignore_write.c#1 branch .. //depot/projects/valgrind/drd/tests/annotate_ignore_write.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/annotate_ignore_write.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/annotate_ignore_write2.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/annotate_ignore_write2.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/annotate_publish_hg.c#1 branch .. //depot/projects/valgrind/drd/tests/annotate_publish_hg.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/annotate_publish_hg.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/annotate_rwlock.c#2 integrate .. //depot/projects/valgrind/drd/tests/annotate_rwlock_hg.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/annotate_rwlock_hg.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/annotate_trace_memory.stderr.exp#2 integrate .. //depot/projects/valgrind/drd/tests/atomic_var.stderr.exp#2 integrate .. //depot/projects/valgrind/drd/tests/bar_bad.stderr.exp#2 integrate .. //depot/projects/valgrind/drd/tests/compare_error_count_with#1 branch .. //depot/projects/valgrind/drd/tests/filter_stderr#4 integrate .. //depot/projects/valgrind/drd/tests/fp_race.stderr.exp#3 integrate .. //depot/projects/valgrind/drd/tests/hg03_inherit.stderr.exp#3 integrate .. //depot/projects/valgrind/drd/tests/hg04_race.stderr.exp#3 integrate .. //depot/projects/valgrind/drd/tests/hg05_race2.stderr.exp#3 integrate .. //depot/projects/valgrind/drd/tests/hg05_race2.stderr.exp-powerpc#3 integrate .. //depot/projects/valgrind/drd/tests/hold_lock_1.stderr.exp#3 integrate .. //depot/projects/valgrind/drd/tests/hold_lock_2.stderr.exp#3 integrate .. //depot/projects/valgrind/drd/tests/pth_barrier_race.stderr.exp#2 integrate .. //depot/projects/valgrind/drd/tests/pth_barrier_reinit.stderr.exp#3 integrate .. //depot/projects/valgrind/drd/tests/pth_cancel_locked.stderr.exp#3 integrate .. //depot/projects/valgrind/drd/tests/pth_cancel_locked.stderr.exp-darwin#2 integrate .. //depot/projects/valgrind/drd/tests/pth_cond_race.stderr.exp#3 integrate .. //depot/projects/valgrind/drd/tests/pth_inconsistent_cond_wait.stderr.exp1#2 integrate .. //depot/projects/valgrind/drd/tests/pth_inconsistent_cond_wait.stderr.exp2#2 integrate .. //depot/projects/valgrind/drd/tests/pth_mutex_reinit.stderr.exp#2 integrate .. //depot/projects/valgrind/drd/tests/qt4_rwlock.cpp#3 integrate .. //depot/projects/valgrind/drd/tests/recursive_mutex.stderr.exp-darwin#2 integrate .. //depot/projects/valgrind/drd/tests/recursive_mutex.stderr.exp-linux#2 integrate .. //depot/projects/valgrind/drd/tests/rwlock_race.stderr.exp#3 integrate .. //depot/projects/valgrind/drd/tests/rwlock_race.stderr.exp2#3 integrate .. //depot/projects/valgrind/drd/tests/rwlock_type_checking.stderr.exp#2 integrate .. //depot/projects/valgrind/drd/tests/sem_as_mutex.stderr.exp#3 integrate .. //depot/projects/valgrind/drd/tests/sem_as_mutex3.stderr.exp#2 integrate .. //depot/projects/valgrind/drd/tests/sem_open.stderr.exp#2 integrate .. //depot/projects/valgrind/drd/tests/sem_open3.stderr.exp#2 integrate .. //depot/projects/valgrind/drd/tests/tc01_simple_race.stderr.exp#3 integrate .. //depot/projects/valgrind/drd/tests/tc04_free_lock.stderr.exp#3 integrate .. //depot/projects/valgrind/drd/tests/tc09_bad_unlock.stderr.exp#3 integrate .. //depot/projects/valgrind/drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8#3 integrate .. //depot/projects/valgrind/drd/tests/tc10_rec_lock.stderr.exp#3 integrate .. //depot/projects/valgrind/drd/tests/tc12_rwl_trivial.stderr.exp#3 integrate .. //depot/projects/valgrind/drd/tests/tc16_byterace.stderr.exp#3 integrate .. //depot/projects/valgrind/drd/tests/tc18_semabuse.stderr.exp#3 integrate .. //depot/projects/valgrind/drd/tests/tc19_shadowmem.stderr.exp-32bit#2 integrate .. //depot/projects/valgrind/drd/tests/tc19_shadowmem.stderr.exp-64bit#2 integrate .. //depot/projects/valgrind/drd/tests/tc20_verifywrap.stderr.exp-glibc2.3#3 delete .. //depot/projects/valgrind/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5#3 delete .. //depot/projects/valgrind/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5-ppc#3 delete .. //depot/projects/valgrind/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8#3 delete .. //depot/projects/valgrind/drd/tests/tc20_verifywrap.vgtest#3 delete .. //depot/projects/valgrind/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3#3 delete .. //depot/projects/valgrind/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b#3 delete .. //depot/projects/valgrind/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5#3 delete .. //depot/projects/valgrind/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc#3 delete .. //depot/projects/valgrind/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8#3 delete .. //depot/projects/valgrind/drd/tests/tc20_verifywrap2.vgtest#3 delete .. //depot/projects/valgrind/drd/tests/tc22_exit_w_lock.stderr.exp-32bit#3 integrate .. //depot/projects/valgrind/drd/tests/tc22_exit_w_lock.stderr.exp-64bit#3 integrate .. //depot/projects/valgrind/drd/tests/tc23_bogus_condwait.stderr.exp-darwin#2 integrate .. //depot/projects/valgrind/drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc#2 integrate .. //depot/projects/valgrind/drd/tests/tc23_bogus_condwait.stderr.exp-linux-x86#2 integrate .. //depot/projects/valgrind/drd/tests/thread_name.stderr.exp#2 integrate .. //depot/projects/valgrind/drd/tests/trylock.stderr.exp#3 integrate .. //depot/projects/valgrind/drd/tests/tsan_unittest.cpp#2 integrate .. //depot/projects/valgrind/exp-bbv/tests/amd64-linux/fldcw_check.S#2 integrate .. //depot/projects/valgrind/exp-bbv/tests/amd64-linux/ll.S#2 integrate .. //depot/projects/valgrind/exp-bbv/tests/x86-linux/ll.S#2 integrate .. //depot/projects/valgrind/exp-ptrcheck/pc_common.c#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/pc_common.h#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/pc_main.c#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/bad_percentify.stderr.exp-glibc28-amd64#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/base.stderr.exp-glibc25-amd64#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/base.stderr.exp-glibc25-x86#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/ccc.stderr.exp-glibc25-amd64#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/ccc.stderr.exp-glibc27-x86#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/ccc.stderr.exp-glibc28-amd64#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/filter_stderr#4 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/fp.stderr.exp#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/globalerr.stderr.exp-glibc28-amd64#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/hackedbz2.stderr.exp-glibc28-amd64#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/hp_bounds.stderr.exp#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/hp_dangle.stderr.exp#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/hsg.stderr.exp#2 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/idiv.stderr.exp#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/imul.stderr.exp#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/justify.stderr.exp#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/mm.stderr.exp#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/neg.stderr.exp#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/not.stderr.exp#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/or.stderr.exp#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/partial_bad.stderr.exp-glibc25-amd64#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/partial_bad.stderr.exp-glibc25-x86#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/partial_good.stderr.exp-glibc25-amd64#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/partial_good.stderr.exp-glibc25-x86#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/preen_invars.stderr.exp-glibc28-amd64#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/pth_create.stderr.exp#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/pth_specific.stderr.exp#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/realloc.stderr.exp-glibc25-amd64#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/realloc.stderr.exp-glibc25-x86#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/stackerr.stderr.exp-glibc27-x86#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/stackerr.stderr.exp-glibc28-amd64#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/strlen_bad.stderr.exp#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/sub.stderr.exp#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/supp.stderr.exp#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/suppgen.stderr.exp#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/syscall.stderr.exp#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/unaligned.stderr.exp-glibc25-amd64#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/unaligned.stderr.exp-glibc25-x86#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/xor.stderr.exp#3 integrate .. //depot/projects/valgrind/exp-ptrcheck/tests/zero.stderr.exp#3 integrate .. //depot/projects/valgrind/glibc-2.X-drd.supp#3 integrate .. //depot/projects/valgrind/helgrind/docs/hg-manual.xml#4 integrate .. //depot/projects/valgrind/helgrind/helgrind.h#5 integrate .. //depot/projects/valgrind/helgrind/hg_errors.c#3 integrate .. //depot/projects/valgrind/helgrind/hg_errors.h#3 integrate .. //depot/projects/valgrind/helgrind/hg_main.c#5 integrate .. //depot/projects/valgrind/helgrind/libhb_core.c#3 integrate .. //depot/projects/valgrind/helgrind/tests/Makefile.am#6 integrate .. //depot/projects/valgrind/helgrind/tests/annotate_hbefore.c#1 branch .. //depot/projects/valgrind/helgrind/tests/annotate_hbefore.stderr.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/annotate_hbefore.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/annotate_hbefore.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/annotate_rwlock.c#1 branch .. //depot/projects/valgrind/helgrind/tests/annotate_rwlock.stderr.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/annotate_rwlock.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/annotate_rwlock.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/bar_bad.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/hg02_deadlock.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/hg03_inherit.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/hg04_race.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/hg05_race2.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/pth_barrier1.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/pth_barrier2.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/pth_barrier3.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/rwlock_race.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/tc01_simple_race.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/tc04_free_lock.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/tc05_simple_race.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/tc06_two_races.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/tc09_bad_unlock.stderr.exp-glibc23-amd64#3 integrate .. //depot/projects/valgrind/helgrind/tests/tc09_bad_unlock.stderr.exp-glibc25-amd64#3 integrate .. //depot/projects/valgrind/helgrind/tests/tc09_bad_unlock.stderr.exp-glibc25-x86#3 integrate .. //depot/projects/valgrind/helgrind/tests/tc10_rec_lock.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/tc12_rwl_trivial.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/tc12_rwl_trivial.stderr.exp-darwin970#2 integrate .. //depot/projects/valgrind/helgrind/tests/tc13_laog1.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/tc14_laog_dinphils.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/tc15_laog_lockdel.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/tc16_byterace.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/tc18_semabuse.stderr.exp-glibc25-amd64#3 integrate .. //depot/projects/valgrind/helgrind/tests/tc18_semabuse.stderr.exp-glibc28-amd64#2 integrate .. //depot/projects/valgrind/helgrind/tests/tc19_shadowmem.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/tc20_verifywrap.stderr.exp-glibc25-amd64#3 integrate .. //depot/projects/valgrind/helgrind/tests/tc20_verifywrap.stderr.exp-glibc27-amd64#2 integrate .. //depot/projects/valgrind/helgrind/tests/tc20_verifywrap.vgtest#3 integrate .. //depot/projects/valgrind/helgrind/tests/tc21_pthonce.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/tc22_exit_w_lock.stderr.exp#2 integrate .. //depot/projects/valgrind/helgrind/tests/tc22_exit_w_lock.vgtest#3 integrate .. //depot/projects/valgrind/helgrind/tests/tc23_bogus_condwait.stderr.exp#2 integrate .. //depot/projects/valgrind/include/pub_tool_basics.h#7 integrate .. //depot/projects/valgrind/include/pub_tool_libcprint.h#4 integrate .. //depot/projects/valgrind/include/pub_tool_stacktrace.h#4 integrate .. //depot/projects/valgrind/include/pub_tool_tooliface.h#4 integrate .. //depot/projects/valgrind/include/pub_tool_xarray.h#3 integrate .. //depot/projects/valgrind/include/vki/vki-darwin.h#2 integrate .. //depot/projects/valgrind/lackey/tests/filter_stderr#4 integrate .. //depot/projects/valgrind/massif/tests/filter_stderr#5 integrate .. //depot/projects/valgrind/memcheck/docs/mc-manual.xml#4 integrate .. //depot/projects/valgrind/memcheck/mc_errors.c#3 integrate .. //depot/projects/valgrind/memcheck/mc_include.h#4 integrate .. //depot/projects/valgrind/memcheck/mc_leakcheck.c#4 integrate .. //depot/projects/valgrind/memcheck/mc_main.c#5 integrate .. //depot/projects/valgrind/memcheck/mc_malloc_wrappers.c#4 integrate .. //depot/projects/valgrind/memcheck/tests/Makefile.am#6 integrate .. //depot/projects/valgrind/memcheck/tests/addressable.stderr.exp#4 integrate .. //depot/projects/valgrind/memcheck/tests/amd64/defcfaexpr.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/amd64/insn_basic.stderr.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/amd64/insn_basic.stdout.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/amd64/insn_basic.vgtest#1 branch .. //depot/projects/valgrind/memcheck/tests/amd64/insn_fpu.stderr.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/amd64/insn_fpu.stdout.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/amd64/insn_fpu.vgtest#1 branch .. //depot/projects/valgrind/memcheck/tests/amd64/insn_mmx.stderr.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/amd64/insn_mmx.stdout.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/amd64/insn_mmx.vgtest#1 branch .. //depot/projects/valgrind/memcheck/tests/amd64/insn_sse.stderr.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/amd64/insn_sse.stdout.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/amd64/insn_sse.vgtest#1 branch .. //depot/projects/valgrind/memcheck/tests/amd64/insn_sse2.stderr.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/amd64/insn_sse2.stdout.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/amd64/insn_sse2.vgtest#1 branch .. //depot/projects/valgrind/memcheck/tests/amd64/xor-undef-amd64.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/badaddrvalue.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/badfree-2trace.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/badfree.c#3 integrate .. //depot/projects/valgrind/memcheck/tests/badfree.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/badjump.stderr.exp#4 integrate .. //depot/projects/valgrind/memcheck/tests/badjump2.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/badloop.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/badpoll.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/badrw.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/brk2.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/buflen_check.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/clientperm.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/custom_alloc.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/darwin/aio.stderr.exp#2 integrate .. //depot/projects/valgrind/memcheck/tests/darwin/scalar.c#2 integrate .. //depot/projects/valgrind/memcheck/tests/darwin/scalar.stderr.exp#2 integrate .. //depot/projects/valgrind/memcheck/tests/darwin/scalar_nocancel.stderr.exp#2 integrate .. //depot/projects/valgrind/memcheck/tests/describe-block.stderr.exp#4 integrate .. //depot/projects/valgrind/memcheck/tests/doublefree.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/erringfds.stderr.exp#4 integrate .. //depot/projects/valgrind/memcheck/tests/error_counts.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/errs1.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/execve.stderr.exp#4 integrate .. //depot/projects/valgrind/memcheck/tests/execve2.stderr.exp#4 integrate .. //depot/projects/valgrind/memcheck/tests/exitprog.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/filter_allocs#5 integrate .. //depot/projects/valgrind/memcheck/tests/fprw.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/fwrite.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/inits.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/inline.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/leak-cases-full.stderr.exp#2 integrate .. //depot/projects/valgrind/memcheck/tests/leak-cycle.stderr.exp#4 integrate .. //depot/projects/valgrind/memcheck/tests/leak-pool-0.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/leak-pool-1.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/leak-pool-2.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/leak-pool-3.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/leak-pool-4.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/leak-pool-5.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/leak-tree.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/linux-syscalls-2007.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/linux-syslog-syscall.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/linux/brk.stderr.exp#2 integrate .. //depot/projects/valgrind/memcheck/tests/linux/capget.stderr.exp#2 integrate .. //depot/projects/valgrind/memcheck/tests/linux/lsframe1.stderr.exp#2 integrate .. //depot/projects/valgrind/memcheck/tests/linux/lsframe2.stderr.exp#2 integrate .. //depot/projects/valgrind/memcheck/tests/linux/timerfd-syscall.stderr.exp#2 integrate .. //depot/projects/valgrind/memcheck/tests/linux/with-space.stderr.exp#2 integrate .. //depot/projects/valgrind/memcheck/tests/long_namespace_xml.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/mallinfo.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/malloc1.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/malloc2.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/manuel1.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/manuel2.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/manuel2.stderr.exp64#3 integrate .. //depot/projects/valgrind/memcheck/tests/manuel3.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/memalign_test.stderr.exp#4 integrate .. //depot/projects/valgrind/memcheck/tests/memcmptest.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/memcmptest.stderr.exp2#3 integrate .. //depot/projects/valgrind/memcheck/tests/mempool.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/metadata.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/mismatches.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/new_override.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/noisy_child.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/origin1-yes.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/origin2-not-quite.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/origin3-no.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/origin4-many.stderr.exp#2 integrate .. //depot/projects/valgrind/memcheck/tests/origin5-bz2.stderr.exp-glibc25-amd64#3 integrate .. //depot/projects/valgrind/memcheck/tests/origin5-bz2.stderr.exp-glibc25-x86#3 integrate .. //depot/projects/valgrind/memcheck/tests/origin5-bz2.stderr.exp-glibc27-ppc64#3 integrate .. //depot/projects/valgrind/memcheck/tests/origin6-fp.stderr.exp-glibc25-amd64#3 integrate .. //depot/projects/valgrind/memcheck/tests/origin6-fp.stderr.exp-glibc27-ppc64#3 integrate .. //depot/projects/valgrind/memcheck/tests/overlap.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/partial_load_dflt.stderr.exp#4 integrate .. //depot/projects/valgrind/memcheck/tests/partial_load_dflt.stderr.exp64#4 integrate .. //depot/projects/valgrind/memcheck/tests/partial_load_ok.stderr.exp#4 integrate .. //depot/projects/valgrind/memcheck/tests/partial_load_ok.stderr.exp64#4 integrate .. //depot/projects/valgrind/memcheck/tests/partiallydefinedeq.stderr.exp#4 integrate .. //depot/projects/valgrind/memcheck/tests/partiallydefinedeq.stderr.exp2#4 integrate .. //depot/projects/valgrind/memcheck/tests/pointer-trace.stderr.exp#4 integrate .. //depot/projects/valgrind/memcheck/tests/realloc3.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/sigkill.stderr.exp#4 integrate .. //depot/projects/valgrind/memcheck/tests/sigkill.stderr.exp-darwin#2 integrate .. //depot/projects/valgrind/memcheck/tests/signal2.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/strchr.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/strchr.stderr.exp-darwin#2 integrate .. //depot/projects/valgrind/memcheck/tests/strchr.stderr.exp2#3 integrate .. //depot/projects/valgrind/memcheck/tests/suppfree.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/trivialleak.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/trivialleak.stderr.exp2#3 integrate .. //depot/projects/valgrind/memcheck/tests/varinfo1.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/varinfo2.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/varinfo3.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/varinfo4.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/varinfo5.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/varinfo6.stderr.exp#2 integrate .. //depot/projects/valgrind/memcheck/tests/writev.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/x86-linux/scalar.stderr.exp#2 integrate .. //depot/projects/valgrind/memcheck/tests/x86-linux/scalar_exit_group.stderr.exp#2 integrate .. //depot/projects/valgrind/memcheck/tests/x86-linux/scalar_supp.stderr.exp#2 integrate .. //depot/projects/valgrind/memcheck/tests/x86/insn_basic.stderr.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_basic.stdout.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_basic.vgtest#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_cmov.stderr.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_cmov.stdout.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_cmov.vgtest#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_fpu.stderr.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_fpu.stdout.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_fpu.vgtest#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_mmx.stderr.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_mmx.stdout.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_mmx.vgtest#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_mmxext.stderr.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_mmxext.stdout.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_mmxext.vgtest#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_sse.stderr.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_sse.stdout.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_sse.vgtest#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_sse2.stderr.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_sse2.stdout.exp#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/insn_sse2.vgtest#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/pushfpopf.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/x86/sse_memory.c#1 branch .. //depot/projects/valgrind/memcheck/tests/x86/xor-undef-x86.stderr.exp#3 integrate .. //depot/projects/valgrind/memcheck/tests/xml1.c#3 integrate .. //depot/projects/valgrind/memcheck/tests/xml1.stderr.exp#4 integrate .. //depot/projects/valgrind/none/tests/darwin/Makefile.am#2 integrate .. //depot/projects/valgrind/none/tests/darwin/access_extended.c#1 branch .. //depot/projects/valgrind/none/tests/darwin/access_extended.stderr.exp#1 branch .. //depot/projects/valgrind/none/tests/darwin/access_extended.vgtest#1 branch .. //depot/projects/valgrind/none/tests/filter_stderr#4 integrate .. //depot/projects/valgrind/none/tests/ppc32/tw.c#1 branch .. //depot/projects/valgrind/none/tests/ppc32/twi.c#1 branch .. //depot/projects/valgrind/none/tests/ppc64/jm-insns.c#1 branch Differences ... ==== //depot/projects/valgrind/Makefile.am#15 (text+ko) ==== @@ -17,18 +17,10 @@ # DDD: once all tools work on Darwin, TEST_TOOLS and TEST_EXP_TOOLS can be # replaced with TOOLS and EXP_TOOLS. +TEST_TOOLS = $(TOOLS) if !VGCONF_OS_IS_DARWIN - TEST_TOOLS = $(TOOLS) TEST_EXP_TOOLS = $(EXP_TOOLS) else - TEST_TOOLS = memcheck \ - cachegrind \ - callgrind \ - massif \ - lackey \ - none \ - drd - TEST_EXP_TOOLS = exp-bbv endif @@ -56,7 +48,7 @@ glibc-2.2-LinuxThreads-helgrind.supp \ glibc-2.X-drd.supp \ exp-ptrcheck.supp \ - darwin9.supp \ + darwin9.supp darwin9-drd.supp \ freebsd.supp DEFAULT_SUPP_FILES = @DEFAULT_SUPP@ ==== //depot/projects/valgrind/NEWS#4 (text+ko) ==== @@ -1,195 +1,568 @@ -Release 3.5.0 (???) +Release 3.5.0 (19 August 2009) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* Mac OS X is now supported. (Note that Mac OS X is often called "Darwin" - because that is the name of the OS core.) +3.5.0 is a feature release with many significant improvements and the +usual collection of bug fixes. The main improvement is that Valgrind +now works on Mac OS X. + +This release supports X86/Linux, AMD64/Linux, PPC32/Linux, PPC64/Linux +and X86/Darwin. Support for recent distros and toolchain components +(glibc 2.10, gcc 4.5) has been added. + + ------------------------- + +Here is a short summary of the changes. Details are shown further +down: + +* Support for Mac OS X (10.5.x). + +* Improvements and simplifications to Memcheck's leak checker. + +* Clarification and simplifications in various aspects of Valgrind's + text output. + +* XML output for Helgrind and Ptrcheck. + +* Performance and stability improvements for Helgrind and DRD. + +* Genuinely atomic support for x86/amd64/ppc atomic instructions. + +* A new experimental tool, BBV, useful for computer architecture + research. + +* Improved Wine support, including ability to read Windows PDB + debuginfo. + + ------------------------- + +Here are details of the above changes, followed by descriptions of +many other minor changes, and a list of fixed bugs. + + +* Valgrind now runs on Mac OS X. (Note that Mac OS X is sometimes + called "Darwin" because that is the name of the OS core, which is the + level that Valgrind works at.) + + Supported systems: + + - It requires OS 10.5.x (Leopard). Porting to 10.4.x is not planned + because it would require work and 10.4 is only becoming less common. + + - 32-bit programs on x86 and AMD64 (a.k.a x86-64) machines are supported + fairly well. For 10.5.x, 32-bit programs are the default even on + 64-bit machines, so it handles most current programs. + + - 64-bit programs on x86 and AMD64 (a.k.a x86-64) machines are not + officially supported, but simple programs at least will probably work. + However, start-up is slow. - Supported machines: - - x86 machines are supported fairly well. - - AMD64 (a.k.a. x86-64) are supported, but not as well. - - Older PowerPC machines are not supported. - - It requires Mac OS X 10.5 Leopard or later. Porting to 10.4 is not - planned because it would require work and 10.4 is only becoming less - common. + - PowerPC machines are not supported. Things that don't work: - - Helgrind and Ptrcheck - - Objective-C garbage collection - - --db-attach=yes - - Messages like the following indicate a mismatch between Valgrind's - memory map and the kernel. Occasional failures are expected in - multithreaded programs. If the failure repeats for the same address - range, then there may be a problem causing false errors or crashes. - sync check at ...: FAILED - - If you have Rogue Amoeba's "Instant Hijack" program installed, Valgrind - will fail with a SIGTRAP at start-up. This is apparently Instant - Hijack's fault. See https://bugs.kde.org/show_bug.cgi?id=193917 for - details and a simple work-around. + + - The Ptrcheck tool. + + - Objective-C garbage collection. + + - --db-attach=yes. + + - If you have Rogue Amoeba's "Instant Hijack" program installed, + Valgrind will fail with a SIGTRAP at start-up. See + https://bugs.kde.org/show_bug.cgi?id=193917 for details and a + simple work-around. Usage notes: - - You will likely find --dsymutil=yes a useful option, as error messages may - be imprecise without it. + + - You will likely find --dsymutil=yes a useful option, as error + messages may be imprecise without it. + + - Mac OS X support is new and therefore will be less robust than the + Linux support. Please report any bugs you find. + + - Threaded programs may run more slowly than on Linux. Many thanks to Greg Parker for developing this port over several years. -* XXX: something about improved Wine support? + +* Memcheck's leak checker has been improved. + + - The results for --leak-check=summary now match the summary results + for --leak-check=full. Previously they could differ because + --leak-check=summary counted "indirectly lost" blocks and + "suppressed" blocks as "definitely lost". -* XXX: exp-bbv has been added... + - Blocks that are only reachable via at least one interior-pointer, + but are directly pointed to by a start-pointer, were previously + marked as "still reachable". They are now correctly marked as + "possibly lost". -* Valgrind's start-up message has changed. It is shorter but also includes - the command being run, which makes it easier to use --trace-children=yes. - An example: + - The default value for the --leak-resolution option has been + changed from "low" to "high". In general, this means that more + leak reports will be produced, but each leak report will describe + fewer leaked blocks. -==3050== Memcheck, a memory error detector. -==3050== Copyright (C) 2002-2009, and GNU GPL'd, by Julian Seward et al. -==3050== Using Valgrind-3.5.0 and LibVEX; rerun with -h for copyright info -==3050== Command: ls -l -==3050== + - With --leak-check=full, "definitely lost" and "possibly lost" + leaks are now considered as proper errors, ie. they are counted + for the "ERROR SUMMARY" and affect the behaviour of + --error-exitcode. These leaks are not counted as errors if + --leak-check=summary is specified, however. -* XXX: shut-down messages have changed a bit... + - Documentation for the leak checker has been improved. -* A new Memcheck client request VALGRIND_COUNT_LEAK_BLOCKS has been added. - It is similar to VALGRIND_COUNT_LEAKS but counts blocks instead of bytes. - [XXX: consider adding VALGRIND_COUNT_LEAK_BYTES as a synonym and - deprecating VALGRIND_COUNT_LEAKS, which wasn't a good name to begin with] -* The Valgrind client requests VALGRIND_PRINTF and VALGRIND_PRINTF_BACKTRACE - have been changed slightly. Previously, the string was always printed - immediately on its own line. Now, the string will be added to a buffer - but not printed until a newline is encountered, or other Valgrind output - is printed (note that for VALGRIND_PRINTF_BACKTRACE, the back-trace itself - is considered "other Valgrind output"). This allows you to use multiple - VALGRIND_PRINTF calls to build up a single output line, and also to print - multiple output lines with a single request (by embedding multiple - newlines in the string). +* Various aspects of Valgrind's text output have changed. -* XXX: mention --read-var-info. It was mentioned as a developer-visible - change in 3.4.0, but it's useful for normal users of some tools as well. + - Valgrind's start-up message has changed. It is shorter but also + includes the command being run, which makes it easier to use + --trace-children=yes. An example: -* Memcheck's leak checker has been improved. - - The results for --leak-check=summary now match the summary results for - --leak-check=full. Previously they could differ because - --leak-check=summary counted "indirectly lost" blocks and "suppressed" - blocks as "definitely lost". - - Blocks that are only reachable via at least one interior-pointer, but - are directly pointed to by a start-pointer, were previously marked as - "still reachable". They are now correctly marked as "possibly lost". - - The default value for the --leak-resolution option has been changed from - "low" to "high". In general, this means that more leak reports will be - produced, but each leak report will describe fewer leaked blocks. - - "Definitely lost" and "possibly lost" leaks are now considered as normal - errors, ie. they are counted for the "ERROR SUMMARY" and - --error-exitcode. This is true even if their loss records aren't - printed, ie. if you run with --leak-check=summary. - - The documentation for the leak checker has also been improved. + - Valgrind's shut-down messages have also changed. This is most + noticeable with Memcheck, where the leak summary now occurs before + the error summary. This change was necessary to allow leaks to be + counted as proper errors (see the description of the leak checker + changes above for more details). This was also necessary to fix a + longstanding bug in which uses of suppressions against leaks were + not "counted", leading to difficulties in maintaining suppression + files (XXXX bug number). -* XXX: Atomic instructions are now handled properly... + - Behavior of -v has changed. In previous versions, -v printed out + a mixture of marginally-user-useful information, and tool/core + statistics. The statistics printing has now been moved to its own + flag, --stats=yes. This means -v is less verbose and more likely + to convey useful end-user information. -* The format of some (non-XML) stack trace entries has changed a little. - Previously there were six possible forms: + - The format of some (non-XML) stack trace entries has changed a + little. Previously there were six possible forms: - 0x80483BF: really (a.c:20) - 0x80483BF: really (in /foo/a.out) - 0x80483BF: really - 0x80483BF: (within /foo/a.out) - 0x80483BF: ??? (a.c:20) - 0x80483BF: ??? + 0x80483BF: really (a.c:20) + 0x80483BF: really (in /foo/a.out) + 0x80483BF: really + 0x80483BF: (within /foo/a.out) + 0x80483BF: ??? (a.c:20) + 0x80483BF: ??? - The third and fourth of these forms have been made more consistent with - the others. The six possible forms are now: + The third and fourth of these forms have been made more consistent + with the others. The six possible forms are now: - 0x80483BF: really (a.c:20) - 0x80483BF: really (in /foo/a.out) - 0x80483BF: really (in ???) - 0x80483BF: ??? (in /foo/a.out) - 0x80483BF: ??? (a.c:20) - 0x80483BF: ??? + 0x80483BF: really (a.c:20) + 0x80483BF: really (in /foo/a.out) + 0x80483BF: really (in ???) + 0x80483BF: ??? (in /foo/a.out) + 0x80483BF: ??? (a.c:20) + 0x80483BF: ??? + + Stack traces produced when --xml=yes is specified are different + and unchanged. + + +* Helgrind and Ptrcheck now support XML output, so they can be used + from GUI tools. Also, the XML output mechanism has been + overhauled. + + - The XML format has been overhauled and generalised, so it is more + suitable for error reporting tools in general. The Memcheck + specific aspects of it have been removed. The new format, which + is an evolution of the old format, is described in + docs/internals/xml-output-protocol4.txt. + + - Memcheck has been updated to use the new format. + + - Helgrind and Ptrcheck are now able to emit output in this format. + + - The XML output mechanism has been overhauled. XML is now output + to its own file descriptor, which means that: + + * Valgrind can output text and XML independently. + + * The longstanding problem of XML output being corrupted by + unexpected un-tagged text messages is solved. + + As before, the destination for text output is specified using + --log-file=, --log-fd= or --log-socket=. + + As before, XML output for a tool is enabled using --xml=yes. + + Because there's a new XML output channel, the XML output + destination is now specified by --xml-file=, --xml-fd= or + --xml-socket=. + + Initial feedback has shown this causes some confusion. To + clarify, the two envisaged usage scenarios are: + + (1) Normal text output. In this case, do not specify --xml=yes + nor any of --xml-file=, --xml-fd= or --xml-socket=. + + (2) XML output. In this case, specify --xml=yes, and one of + --xml-file=, --xml-fd= or --xml-socket= to select the XML + destination, one of --log-file=, --log-fd= or --log-socket= + to select the destination for any remaining text messages, + and, importantly, -q. + + -q makes Valgrind completely silent on the text channel, + except in the case of critical failures, such as Valgrind + itself segfaulting, or failing to read debugging information. + Hence, in this scenario, it suffices to check whether or not + any output appeared on the text channel. If yes, then it is + likely to be a critical error which should be brought to the + attention of the user. If no (the text channel produced no + output) then it can be assumed that the run was successful. + + This allows GUIs to make the critical distinction they need to + make (did the run fail or not?) without having to search or + filter the text output channel in any way. + + It is also recommended to use --child-silent-after-fork=yes in + scenario (2). + + +* Improvements and changes in Helgrind: + + - XML output, as described above + + - Checks for consistent association between pthread condition + variables and their associated mutexes are now performed. + + - pthread_spinlock functions are supported. + + - Modest performance improvements. + + - Initial (skeletal) support for describing the behaviour of + non-POSIX synchronisation objects through ThreadSanitizer + compatible ANNOTATE_* macros. + + - More controllable tradeoffs between performance and the level of + detail of "previous" accesses in a race. There are now three + settings: + + * --history-level=full. This is the default, and was also the + default in 3.4.x. It shows both stacks involved in a race, but + requires a lot of memory and can be very slow in programs that + do many inter-thread synchronisation events. + + * --history-level=none. This only shows the later stack involved + in a race. This can be much faster than --history-level=full, + but makes it much more difficult to find the other access + involved in the race. + + The new intermediate setting is - Stack traces produced when --xml=yes is specified are different and - unchanged. + * --history-level=approx -* XXX: XML output has changed... along with how --xml=yes works. + For the earlier (other) access, two stacks are presented. The + earlier access is guaranteed to be somewhere in between the two + program points denoted by those stacks. This is not as useful + as showing the exact stack for the previous access (as per + --history-level=full), but it is better than nothing, and it's + almost as fast as --history-level=none. -* The graphs drawn by Massif's ms_print program have changed slightly: - - The half-height chars '.' and ',' are no longer drawn, because they are - confusing. The --y option can be used if the default y-resolution is - not high enough. - - Horizontal lines are now drawn after the top of a snapshot if there is a - gap until the next snapshot. This makes it clear that the memory - usage has not dropped to zero between snapshots. * New features and improvements in DRD: - - The error messages printed by DRD are now easier to interpret. Instead of - using two different numbers to identify each thread (Valgrind thread ID and - DRD thread ID), DRD does now identify threads via a single number (the DRD - thread ID). Furthermore "first observed at" information is now printed for - all error messages related to synchronization objects. + + - The error messages printed by DRD are now easier to interpret. + Instead of using two different numbers to identify each thread + (Valgrind thread ID and DRD thread ID), DRD does now identify + threads via a single number (the DRD thread ID). Furthermore + "first observed at" information is now printed for all error + messages related to synchronization objects. + - Added support for named semaphores (sem_open() and sem_close()). + - Race conditions between pthread_barrier_wait() and pthread_barrier_destroy() calls are now reported. - - Added support for memory pools through the macro's - VALGRIND_MALLOCLIKE_BLOCK() VALGRIND_FREELIKE_BLOCK() (defined in - in ). An alternative for these two macro's is the - new client request VG_USERREQ__DRD_CLEAN_MEMORY (defined in + + - Added support for custom allocators through the macros + VALGRIND_MALLOCLIKE_BLOCK() VALGRIND_FREELIKE_BLOCK() (defined in + in ). An alternative for these two macros is + the new client request VG_USERREQ__DRD_CLEAN_MEMORY (defined in ). - - Added support for annotating non-POSIX synchronization objects through - several new ANNOTATE_*() macro's. - - OpenMP: added support for the OpenMP runtime (libgomp) included with gcc - versions 4.3.0 and 4.4.0. + + - Added support for annotating non-POSIX synchronization objects + through several new ANNOTATE_*() macros. + + - OpenMP: added support for the OpenMP runtime (libgomp) included + with gcc versions 4.3.0 and 4.4.0. + - Faster operation. - - Added to new command-line options (--first-race-only and + + - Added two new command-line options (--first-race-only and --segment-merging-interval). -* exp-Omega, an experimental instantaneous leak-detecting tool, was disabled - in 3.4.0 due to a lack of interest and maintenance, although the source - code was still in the distribution. The source code has now been removed - from the distribution. For anyone interested, the removal occurred in SVN - revision r10247. + +* Genuinely atomic support for x86/amd64/ppc atomic instructions + + Valgrind will now preserve (memory-access) atomicity of LOCK- + prefixed x86/amd64 instructions, and any others implying a global + bus lock. Ditto for PowerPC l{w,d}arx/st{w,d}cx. instructions. + + This means that Valgrinded processes will "play nicely" in + situations where communication with other processes, or the kernel, + is done through shared memory and coordinated with such atomic + instructions. Prior to this change, such arrangements usually + resulted in hangs, races or other synchronisation failures, because + Valgrind did not honour atomicity of such instructions. + + +* A new experimental tool, BBV, has been added. BBV generates basic + block vectors for use with the SimPoint analysis tool, which allows + a program's overall behaviour to be approximated by running only a + fraction of it. This is useful for computer architecture + researchers. You can run BBV by specifying --tool=exp-bbv (the + "exp-" prefix is short for "experimental"). BBV was written by + Vince Weaver. + + +* Modestly improved support for running Windows applications under + Wine. In particular, initial support for reading Windows .PDB debug + information has been added. + + +* A new Memcheck client request VALGRIND_COUNT_LEAK_BLOCKS has been + added. It is similar to VALGRIND_COUNT_LEAKS but counts blocks + instead of bytes. + + +* The Valgrind client requests VALGRIND_PRINTF and + VALGRIND_PRINTF_BACKTRACE have been changed slightly. Previously, + the string was always printed immediately on its own line. Now, the + string will be added to a buffer but not printed until a newline is + encountered, or other Valgrind output is printed (note that for + VALGRIND_PRINTF_BACKTRACE, the back-trace itself is considered + "other Valgrind output"). This allows you to use multiple + VALGRIND_PRINTF calls to build up a single output line, and also to + print multiple output lines with a single request (by embedding + multiple newlines in the string). + + +* The graphs drawn by Massif's ms_print program have changed slightly: + + - The half-height chars '.' and ',' are no longer drawn, because + they are confusing. The --y option can be used if the default + y-resolution is not high enough. + + - Horizontal lines are now drawn after the top of a snapshot if + there is a gap until the next snapshot. This makes it clear that + the memory usage has not dropped to zero between snapshots. + + +* Something that happened in 3.4.0, but wasn't clearly announced: the + option --read-var-info=yes can be used by some tools (Memcheck, + Helgrind and DRD). When enabled, it causes Valgrind to read DWARF3 + variable type and location information. This makes those tools + start up more slowly and increases memory consumption, but + descriptions of data addresses in error messages become more + detailed. + + +* exp-Omega, an experimental instantaneous leak-detecting tool, was + disabled in 3.4.0 due to a lack of interest and maintenance, + although the source code was still in the distribution. The source + code has now been removed from the distribution. For anyone + interested, the removal occurred in SVN revision r10247. + * Some changes have been made to the build system. - - VEX/ is now integrated properly into the build system. This means that - dependency tracking within VEX/ now works properly, "make install" will - work without requiring "make" before it, and parallel builds - (ie. 'make -j') now work (previously a .NOTPARALLEL directive was used - to serialize builds, ie. 'make -j' was effectively ignored). + - VEX/ is now integrated properly into the build system. This means + that dependency tracking within VEX/ now works properly, "make + install" will work without requiring "make" before it, and + parallel builds (ie. 'make -j') now work (previously a + .NOTPARALLEL directive was used to serialize builds, ie. 'make -j' + was effectively ignored). - - The --with-vex configure option has been removed. It was of little use - and removing it simplified the build system. + - The --with-vex configure option has been removed. It was of + little use and removing it simplified the build system. - - The location of some install files has changed. This should not affect - most users. Those who might be affected: + - The location of some install files has changed. This should not + affect most users. Those who might be affected: * For people who use Valgrind with MPI programs, the installed - libmpiwrap.so library has moved from $(INSTALL)//libmpiwrap.so - to $(INSTALL)/libmpiwrap-.so. + libmpiwrap.so library has moved from + $(INSTALL)//libmpiwrap.so to + $(INSTALL)/libmpiwrap-.so. + + * For people who distribute standalone Valgrind tools, the + installed libraries such as $(INSTALL)//libcoregrind.a + have moved to $(INSTALL)/libcoregrind-.a. + + These changes simplify the build system. + + - Previously, all the distributed suppression (*.supp) files were + installed. Now, only default.supp is installed. This should not + affect users as the other installed suppression files were not + read; the fact that they were installed was a mistake. + + +* KNOWN LIMITATIONS: + + - Memcheck is unusable with the Intel compiler suite version 11.1, + when it generates code for SSE2-and-above capable targets. This + is because of icc's use of highly optimised inlined strlen + implementations. It causes Memcheck to report huge numbers of + false errors even in simple programs. Helgrind and DRD may also + have problems. + + Versions 11.0 and earlier may be OK, but this has not been + properly tested. + + +The following bugs have been fixed or resolved. Note that "n-i-bz" +stands for "not in bugzilla" -- that is, a bug that was reported to us +but never got a bugzilla entry. We encourage you to file bugs in +bugzilla (http://bugs.kde.org/enter_valgrind_bug.cgi) rather than +mailing the developers (or mailing lists) directly -- bugs that are +not entered into bugzilla tend to get forgotten about or ignored. - * For people who distribute standalone Valgrind tools, the installed - libraries such as $(INSTALL)//libcoregrind.a have moved to - $(INSTALL)/libcoregrind-.a. +To see details of a given bug, visit +https://bugs.kde.org/show_bug.cgi?id=XXXXXX +where XXXXXX is the bug number as listed below. - These changes simplified the build system. +84303 How about a LockCheck tool? +91633 dereference of null ptr in vgPlain_st_basetype +97452 Valgrind doesn't report any pthreads problems +100628 leak-check gets assertion failure when using + VALGRIND_MALLOCLIKE_BLOCK on malloc()ed memory +108528 NPTL pthread cleanup handlers not called +110126 Valgrind 2.4.1 configure.in tramples CFLAGS +110128 mallinfo is not implemented... +110770 VEX: Generated files not always updated when making valgrind +111102 Memcheck: problems with large (memory footprint) applications +115673 Vex's decoder should never assert +117564 False positive: Syscall param clone(child_tidptr) contains + uninitialised byte(s) +119404 executing ssh from inside valgrind fails +133679 Callgrind does not write path names to sources with dwarf debug + info +135847 configure.in problem with non gnu compilers (and possible fix) +136154 threads.c:273 (vgCallgrind_post_signal): Assertion + '*(vgCallgrind_current_fn_stack.top) == 0' failed. +136230 memcheck reports "possibly lost", should be "still reachable" +137073 NULL arg to MALLOCLIKE_BLOCK causes crash +137904 Valgrind reports a memory leak when using POSIX threads, + while it shouldn't +139076 valgrind VT_GETSTATE error +142228 complaint of elf_dynamic_do_rela in trivial usage +145347 spurious warning with USBDEVFS_REAPURB +148441 (wine) can't find memory leak in Wine, win32 binary + executable file. +148742 Leak-check fails assert on exit +149878 add (proper) check for calloc integer overflow +150606 Call graph is broken when using callgrind control +152393 leak errors produce an exit code of 0. I need some way to + cause leak errors to result in a nonzero exit code. +157154 documentation (leak-resolution doc speaks about num-callers + def=4) + what is a loss record +159501 incorrect handling of ALSA ioctls >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Sep 25 14:18:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93ADD1065672; Fri, 25 Sep 2009 14:18:03 +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 582C7106566B for ; Fri, 25 Sep 2009 14:18:03 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2DD1D8FC14 for ; Fri, 25 Sep 2009 14:18:03 +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 n8PEI2CA025715 for ; Fri, 25 Sep 2009 14:18:02 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8PEI24Z025713 for perforce@freebsd.org; Fri, 25 Sep 2009 14:18:02 GMT (envelope-from stas@freebsd.org) Date: Fri, 25 Sep 2009 14:18:02 GMT Message-Id: <200909251418.n8PEI24Z025713@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 168883 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, 25 Sep 2009 14:18:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=168883 Change 168883 by stas@stas_yandex on 2009/09/25 14:17:09 - Make this file executable. Affected files ... .. //depot/projects/valgrind/drd/tests/compare_error_count_with#2 edit Differences ... ==== //depot/projects/valgrind/drd/tests/compare_error_count_with#2 (text+kox/text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Sep 25 17:01:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BAD91065692; Fri, 25 Sep 2009 17:01:02 +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 C48521065679 for ; Fri, 25 Sep 2009 17:01:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B3D528FC1E for ; Fri, 25 Sep 2009 17:01: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 n8PH11Xd049839 for ; Fri, 25 Sep 2009 17:01:01 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8PH11sb049837 for perforce@freebsd.org; Fri, 25 Sep 2009 17:01:01 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 25 Sep 2009 17:01:01 GMT Message-Id: <200909251701.n8PH11sb049837@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 168889 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, 25 Sep 2009 17:01:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=168889 Change 168889 by hselasky@hselasky_laptop001 on 2009/09/25 17:00:17 USB serial: - Add support for ChipHead 341 serial port adapter. - Requested by: Marten Vijn Affected files ... .. //depot/projects/usb/src/sys/conf/files#80 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uch341.c#1 add .. //depot/projects/usb/src/sys/modules/usb/Makefile#20 edit .. //depot/projects/usb/src/sys/modules/usb/uch341/Makefile#1 add Differences ... ==== //depot/projects/usb/src/sys/conf/files#80 (text+ko) ==== @@ -1643,6 +1643,7 @@ dev/usb/serial/uark.c optional uark dev/usb/serial/ubsa.c optional ubsa dev/usb/serial/ubser.c optional ubser +dev/usb/serial/uch341.c optional uch341 dev/usb/serial/uchcom.c optional uchcom dev/usb/serial/ucycom.c optional ucycom dev/usb/serial/ufoma.c optional ufoma ==== //depot/projects/usb/src/sys/modules/usb/Makefile#20 (text+ko) ==== @@ -29,7 +29,7 @@ SUBDIR += ehci musb ohci uhci uss820dci ${_at91dci} ${_atmegadci} SUBDIR += rum uath upgt ural zyd ${_urtw} SUBDIR += uhid ukbd ums udbp ufm -SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \ +SUBDIR += ucom u3g uark ubsa ubser uch341 uchcom ucycom ufoma uftdi ugensa uipaq ulpt \ umct umodem umoscom uplcom uslcom uvisor uvscom SUBDIR += uether aue axe cdce cue kue rue udav SUBDIR += usfs umass urio From owner-p4-projects@FreeBSD.ORG Fri Sep 25 17:42:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9343E106568D; Fri, 25 Sep 2009 17:42: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 57AE31065670 for ; Fri, 25 Sep 2009 17:42:49 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 11F088FC12 for ; Fri, 25 Sep 2009 17:42:48 +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 n8PHglxZ053816 for ; Fri, 25 Sep 2009 17:42:47 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8PHglUi053814 for perforce@freebsd.org; Fri, 25 Sep 2009 17:42:47 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 25 Sep 2009 17:42:47 GMT Message-Id: <200909251742.n8PHglUi053814@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 Cc: Subject: PERFORCE change 168893 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, 25 Sep 2009 17:42:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=168893 Change 168893 by rene@rene_self on 2009/09/25 17:42:20 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#8 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -612,10 +612,9 @@ the option, which enables debugging information when passed to &man.gcc.1;. - options SCHED_4BSD # 4BSD scheduler + options SCHED_ULE # ULE scheduler - The traditional and default system scheduler for &os;. - Keep this. + The default system scheduler for &os;. Keep this. options PREEMPTION # Enable kernel thread preemption From owner-p4-projects@FreeBSD.ORG Fri Sep 25 19:07:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5ECC1065676; Fri, 25 Sep 2009 19:07:21 +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 8A6EF1065670 for ; Fri, 25 Sep 2009 19:07:21 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5FEFB8FC2A for ; Fri, 25 Sep 2009 19:07: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 n8PJ7KXw063067 for ; Fri, 25 Sep 2009 19:07:20 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8PJ7KFx063065 for perforce@freebsd.org; Fri, 25 Sep 2009 19:07:20 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 25 Sep 2009 19:07:20 GMT Message-Id: <200909251907.n8PJ7KFx063065@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 Cc: Subject: PERFORCE change 168899 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, 25 Sep 2009 19:07:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=168899 Change 168899 by rene@rene_self on 2009/09/25 19:06:25 MFen the handbook: * disks 1.291 -> 1.292 * kernelconfig 1.192 -> 1.193 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#12 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#12 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#12 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.13 2009/08/03 14:10:16 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/disks/chapter.sgml - %SRCID% 1.291 + %SRCID% 1.292 --> @@ -207,9 +207,9 @@ toevoegen - Stel dat het gewenst is om een nieuwe SCSI-schijf aan een - machine toe te voegen die slechts een enkele drive heeft. Ten - eerste dient de computer uitgeschakeld te worden en dient de + De volgende sectie beschrijft hoe een nieuwe SCSI + schijf aan een machine toe te voegen die slechts een enkele drive heeft. + Ten eerste dient de computer uitgeschakeld te worden en dient de schijf volgens de instructies van de computer, controller en schijffabrikant geïnstalleerd te worden. Wegens de grote variéteiten om dit soort procedures uit te voeren, vallen ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#12 (text+ko) ==== @@ -2,10 +2,9 @@ The FreeBSD Dutch Documentation Project $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.15 2009/05/17 17:12:22 rene Exp $ - $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.25 2006/01/05 21:13:22 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml - %SRCID% 1.192 + %SRCID% 1.193 --> @@ -677,10 +676,9 @@ wanneer de kernel met de optie gebouwd wordt, wat debuginformatie doorgeeft aan &man.gcc.1;. - options SCHED_4BSD # 4BSD taakplanner + options SCHED_ULE # ULE taakplanner - De traditionele en standaard taakplanner voor &os;. Laat dit - staan. + De standaard taakplanner voor &os;. Laat dit staan. options PREEMPTION # Zet kernelthreadpreëmptie aan