From owner-svn-src-stable-9@freebsd.org Mon Mar 21 01:17:49 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F0CB7AD736A; Mon, 21 Mar 2016 01:17:49 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CD1C161E; Mon, 21 Mar 2016 01:17:49 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2L1HnN3054136; Mon, 21 Mar 2016 01:17:49 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2L1Hm0f054133; Mon, 21 Mar 2016 01:17:48 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201603210117.u2L1Hm0f054133@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Mon, 21 Mar 2016 01:17:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r297130 - stable/9/cddl/contrib/opensolaris/lib/libdtrace/common X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Mar 2016 01:17:50 -0000 Author: pfg Date: Mon Mar 21 01:17:48 2016 New Revision: 297130 URL: https://svnweb.freebsd.org/changeset/base/297130 Log: MFC r296816: libdtrace: use calloc(3) instead of malloc(3) when it makes sense. calloc(3) is faster and occasionally safer than malloc(3) + bzero(3). In one case, pointed out by Mark[1], this also cleans up a calculation. Reviewed by: markj [1] Modified: stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c Directory Properties: stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/ (props changed) Modified: stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c ============================================================================== --- stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c Mon Mar 21 01:14:32 2016 (r297129) +++ stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c Mon Mar 21 01:17:48 2016 (r297130) @@ -23,6 +23,10 @@ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. */ +/* + * Portions Copyright 2016 Pedro Giffuni. All rights reserved. + */ + #include #if defined(sun) #include @@ -610,17 +614,14 @@ dt_module_load(dtrace_hdl_t *dtp, dt_mod dmp->dm_nsymbuckets = _dtrace_strbuckets; dmp->dm_symfree = 1; /* first free element is index 1 */ - dmp->dm_symbuckets = malloc(sizeof (uint_t) * dmp->dm_nsymbuckets); - dmp->dm_symchains = malloc(sizeof (dt_sym_t) * dmp->dm_nsymelems + 1); + dmp->dm_symbuckets = calloc(dmp->dm_nsymbuckets, sizeof (uint_t)); + dmp->dm_symchains = calloc(dmp->dm_nsymelems + 1, sizeof (dt_sym_t)); if (dmp->dm_symbuckets == NULL || dmp->dm_symchains == NULL) { dt_module_unload(dtp, dmp); return (dt_set_errno(dtp, EDT_NOMEM)); } - bzero(dmp->dm_symbuckets, sizeof (uint_t) * dmp->dm_nsymbuckets); - bzero(dmp->dm_symchains, sizeof (dt_sym_t) * dmp->dm_nsymelems + 1); - /* * Iterate over the symbol table data buffer and insert each symbol * name into the name hash if the name and type are valid. Then Modified: stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c ============================================================================== --- stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c Mon Mar 21 01:14:32 2016 (r297129) +++ stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c Mon Mar 21 01:17:48 2016 (r297130) @@ -27,6 +27,7 @@ /* * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2016 Pedro Giffuni. All rights reserved. */ #include @@ -47,15 +48,15 @@ dt_regset_create(ulong_t nregs) if (drp == NULL) return (NULL); - drp->dr_bitmap = malloc(sizeof (ulong_t) * n); - drp->dr_size = nregs; + drp->dr_bitmap = calloc(n, sizeof (ulong_t)); if (drp->dr_bitmap == NULL) { dt_regset_destroy(drp); return (NULL); } - bzero(drp->dr_bitmap, sizeof (ulong_t) * n); + drp->dr_size = nregs; + return (drp); } Modified: stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c ============================================================================== --- stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c Mon Mar 21 01:14:32 2016 (r297129) +++ stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c Mon Mar 21 01:17:48 2016 (r297130) @@ -24,6 +24,10 @@ * Use is subject to license terms. */ +/* + * Portions Copyright 2016 Pedro Giffuni. All rights reserved. + */ + #pragma ident "%Z%%M% %I% %E% SMI" #include @@ -70,12 +74,11 @@ dt_strtab_create(size_t bufsz) return (NULL); bzero(sp, sizeof (dt_strtab_t)); - sp->str_hash = malloc(nbuckets * sizeof (dt_strhash_t *)); + sp->str_hash = calloc(nbuckets, sizeof (dt_strhash_t *)); if (sp->str_hash == NULL) goto err; - bzero(sp->str_hash, nbuckets * sizeof (dt_strhash_t *)); sp->str_hashsz = nbuckets; sp->str_bufs = NULL; sp->str_ptr = NULL; From owner-svn-src-stable-9@freebsd.org Mon Mar 21 05:48:01 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27AF5AD6806; Mon, 21 Mar 2016 05:48:01 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E5567FE7; Mon, 21 Mar 2016 05:48:00 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2L5m04j037148; Mon, 21 Mar 2016 05:48:00 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2L5lxor037141; Mon, 21 Mar 2016 05:47:59 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201603210547.u2L5lxor037141@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Mon, 21 Mar 2016 05:47:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r297135 - stable/9/cddl/contrib/opensolaris/lib/libdtrace/common X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Mar 2016 05:48:01 -0000 Author: pfg Date: Mon Mar 21 05:47:59 2016 New Revision: 297135 URL: https://svnweb.freebsd.org/changeset/base/297135 Log: Revert r297130: Revert to unbreak the build. No idea how this broke the build in libstand but it was the only change so revert to appease jenkins. Modified: stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c Directory Properties: stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/ (props changed) Modified: stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c ============================================================================== --- stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c Mon Mar 21 03:39:38 2016 (r297134) +++ stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c Mon Mar 21 05:47:59 2016 (r297135) @@ -23,10 +23,6 @@ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. */ -/* - * Portions Copyright 2016 Pedro Giffuni. All rights reserved. - */ - #include #if defined(sun) #include @@ -614,14 +610,17 @@ dt_module_load(dtrace_hdl_t *dtp, dt_mod dmp->dm_nsymbuckets = _dtrace_strbuckets; dmp->dm_symfree = 1; /* first free element is index 1 */ - dmp->dm_symbuckets = calloc(dmp->dm_nsymbuckets, sizeof (uint_t)); - dmp->dm_symchains = calloc(dmp->dm_nsymelems + 1, sizeof (dt_sym_t)); + dmp->dm_symbuckets = malloc(sizeof (uint_t) * dmp->dm_nsymbuckets); + dmp->dm_symchains = malloc(sizeof (dt_sym_t) * dmp->dm_nsymelems + 1); if (dmp->dm_symbuckets == NULL || dmp->dm_symchains == NULL) { dt_module_unload(dtp, dmp); return (dt_set_errno(dtp, EDT_NOMEM)); } + bzero(dmp->dm_symbuckets, sizeof (uint_t) * dmp->dm_nsymbuckets); + bzero(dmp->dm_symchains, sizeof (dt_sym_t) * dmp->dm_nsymelems + 1); + /* * Iterate over the symbol table data buffer and insert each symbol * name into the name hash if the name and type are valid. Then Modified: stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c ============================================================================== --- stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c Mon Mar 21 03:39:38 2016 (r297134) +++ stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c Mon Mar 21 05:47:59 2016 (r297135) @@ -27,7 +27,6 @@ /* * Copyright (c) 2012 by Delphix. All rights reserved. - * Copyright (c) 2016 Pedro Giffuni. All rights reserved. */ #include @@ -48,15 +47,15 @@ dt_regset_create(ulong_t nregs) if (drp == NULL) return (NULL); - drp->dr_bitmap = calloc(n, sizeof (ulong_t)); + drp->dr_bitmap = malloc(sizeof (ulong_t) * n); + drp->dr_size = nregs; if (drp->dr_bitmap == NULL) { dt_regset_destroy(drp); return (NULL); } - drp->dr_size = nregs; - + bzero(drp->dr_bitmap, sizeof (ulong_t) * n); return (drp); } Modified: stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c ============================================================================== --- stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c Mon Mar 21 03:39:38 2016 (r297134) +++ stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c Mon Mar 21 05:47:59 2016 (r297135) @@ -24,10 +24,6 @@ * Use is subject to license terms. */ -/* - * Portions Copyright 2016 Pedro Giffuni. All rights reserved. - */ - #pragma ident "%Z%%M% %I% %E% SMI" #include @@ -74,11 +70,12 @@ dt_strtab_create(size_t bufsz) return (NULL); bzero(sp, sizeof (dt_strtab_t)); - sp->str_hash = calloc(nbuckets, sizeof (dt_strhash_t *)); + sp->str_hash = malloc(nbuckets * sizeof (dt_strhash_t *)); if (sp->str_hash == NULL) goto err; + bzero(sp->str_hash, nbuckets * sizeof (dt_strhash_t *)); sp->str_hashsz = nbuckets; sp->str_bufs = NULL; sp->str_ptr = NULL; From owner-svn-src-stable-9@freebsd.org Mon Mar 21 17:53:38 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 51074AD8534; Mon, 21 Mar 2016 17:53:38 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 21F81FB3; Mon, 21 Mar 2016 17:53:38 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2LHrbdQ061802; Mon, 21 Mar 2016 17:53:37 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2LHrbSM061801; Mon, 21 Mar 2016 17:53:37 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201603211753.u2LHrbSM061801@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 21 Mar 2016 17:53:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r297153 - stable/9/share/man/man9 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Mar 2016 17:53:38 -0000 Author: bdrewery Date: Mon Mar 21 17:53:37 2016 New Revision: 297153 URL: https://svnweb.freebsd.org/changeset/base/297153 Log: MFC r296819: Reword SX_NOADAPTIVE description to be clear that adaptive is default. Modified: stable/9/share/man/man9/sx.9 Directory Properties: stable/9/share/man/man9/ (props changed) Modified: stable/9/share/man/man9/sx.9 ============================================================================== --- stable/9/share/man/man9/sx.9 Mon Mar 21 17:51:15 2016 (r297152) +++ stable/9/share/man/man9/sx.9 Mon Mar 21 17:53:37 2016 (r297153) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 28, 2009 +.Dd March 13, 2016 .Dt SX 9 .Os .Sh NAME @@ -124,12 +124,10 @@ specifies a set of optional flags to alt It contains one or more of the following flags: .Bl -tag -width SX_NOADAPTIVE .It Dv SX_NOADAPTIVE -If the kernel is not compiled with -.Cd "options NO_ADAPTIVE_SX" , -then lock operations for -.Fa sx -will spin instead of sleeping while an exclusive lock holder is executing on -another CPU. +Disable adaptive spinning, rather than sleeping, for lock operations +while an exclusive lock holder is executing on another CPU. +Adaptive spinning is the default unless the kernel is compiled with +.Cd "options NO_ADAPTIVE_SX" . .It Dv SX_DUPOK Witness should not log messages about duplicate locks being acquired. .It Dv SX_NOWITNESS From owner-svn-src-stable-9@freebsd.org Thu Mar 24 11:38:20 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 283F2ADC0D0; Thu, 24 Mar 2016 11:38:20 +0000 (UTC) (envelope-from erwin@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EBB5D11A1; Thu, 24 Mar 2016 11:38:19 +0000 (UTC) (envelope-from erwin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2OBcJ0g074812; Thu, 24 Mar 2016 11:38:19 GMT (envelope-from erwin@FreeBSD.org) Received: (from erwin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2OBcJnv074811; Thu, 24 Mar 2016 11:38:19 GMT (envelope-from erwin@FreeBSD.org) Message-Id: <201603241138.u2OBcJnv074811@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: erwin set sender to erwin@FreeBSD.org using -f From: Erwin Lansing Date: Thu, 24 Mar 2016 11:38:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r297233 - stable/9/etc/namedb X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Mar 2016 11:38:20 -0000 Author: erwin Date: Thu Mar 24 11:38:18 2016 New Revision: 297233 URL: https://svnweb.freebsd.org/changeset/base/297233 Log: Update with new IPv6 address for l-root. Obtained from: IANA Sponsored by: DK Hostmaster A/S Modified: stable/9/etc/namedb/named.root Modified: stable/9/etc/namedb/named.root ============================================================================== --- stable/9/etc/namedb/named.root Thu Mar 24 10:10:41 2016 (r297232) +++ stable/9/etc/namedb/named.root Thu Mar 24 11:38:18 2016 (r297233) @@ -13,8 +13,8 @@ ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: December 01, 2015 -; related version of root zone: 2015120100 +; last update: March 23, 2016 +; related version of root zone: 2016032301 ; ; formerly NS.INTERNIC.NET ; @@ -84,7 +84,7 @@ K.ROOT-SERVERS.NET. 3600000 AA ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 -L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:3::42 +L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9F::42 ; ; OPERATED BY WIDE ; From owner-svn-src-stable-9@freebsd.org Fri Mar 25 00:40:06 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 304AFADBDDF; Fri, 25 Mar 2016 00:40:06 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F395910DF; Fri, 25 Mar 2016 00:40:05 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2P0e55h016364; Fri, 25 Mar 2016 00:40:05 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2P0e5gT016363; Fri, 25 Mar 2016 00:40:05 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201603250040.u2P0e5gT016363@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Fri, 25 Mar 2016 00:40:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r297260 - stable/9/include/rpc X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Mar 2016 00:40:06 -0000 Author: pfg Date: Fri Mar 25 00:40:04 2016 New Revision: 297260 URL: https://svnweb.freebsd.org/changeset/base/297260 Log: MFC r296394: xdr: Fix xdr_rpc* defines. The defines for xdr_rpc* in xdr.h are wrong. It could be very well that Solaris did strip the '_t' from xdr_u_int32_t, but Solaris has a xdr_u_int32 function, we don't have this. So all of this defines will lead to an unresolved symbol. This explains why we do not use these functions in FreeBSD while they are used in Illumos/Solaris. Obtained from: linux libtirpc (git 7864122e61ffe4db1aa8ace89117358a1e3a391b) Modified: stable/9/include/rpc/xdr.h Directory Properties: stable/9/include/ (props changed) Modified: stable/9/include/rpc/xdr.h ============================================================================== --- stable/9/include/rpc/xdr.h Fri Mar 25 00:39:01 2016 (r297259) +++ stable/9/include/rpc/xdr.h Fri Mar 25 00:40:04 2016 (r297260) @@ -219,15 +219,11 @@ xdr_putint32(XDR *xdrs, int32_t *ip) (*(xdrs)->x_ops->x_control)(xdrs, req, op) #define xdr_control(xdrs, req, op) XDR_CONTROL(xdrs, req, op) -/* - * Solaris strips the '_t' from these types -- not sure why. - * But, let's be compatible. - */ -#define xdr_rpcvers(xdrs, versp) xdr_u_int32(xdrs, versp) -#define xdr_rpcprog(xdrs, progp) xdr_u_int32(xdrs, progp) -#define xdr_rpcproc(xdrs, procp) xdr_u_int32(xdrs, procp) -#define xdr_rpcprot(xdrs, protp) xdr_u_int32(xdrs, protp) -#define xdr_rpcport(xdrs, portp) xdr_u_int32(xdrs, portp) +#define xdr_rpcvers(xdrs, versp) xdr_u_int32_t(xdrs, versp) +#define xdr_rpcprog(xdrs, progp) xdr_u_int32_t(xdrs, progp) +#define xdr_rpcproc(xdrs, procp) xdr_u_int32_t(xdrs, procp) +#define xdr_rpcprot(xdrs, protp) xdr_u_int32_t(xdrs, protp) +#define xdr_rpcport(xdrs, portp) xdr_u_int32_t(xdrs, portp) /* * Support struct for discriminated unions.