from:"Garrett Cooper"

svn commit: r304809 - head/usr.bin/getconf

2016-08-25 Thread Garrett Cooper

Author: ngie
Date: Thu Aug 25 17:07:43 2016
New Revision: 304809
URL: https://svnweb.freebsd.org/changeset/base/304809

Log:
  Add non-TRUSTEDBSD prefixed knobs for the _PC_ACL* and {CAP,INF,MAC}_PRESENT 
knobs
  
  It's not necessarily intuitive that the variables to query contain TRUSTEDBSD
  in the prefix. Add non-TRUSTEDBSD prefixed knobs for querying things like
  "_PC_ACL_NFS4".
  
  MFC after:1 week
  Relnotes: yes
  Reviewed by:  wollman
  Sponsored by: EMC / Isilon Storage Division
  Differential Revision:https://reviews.freebsd.org/D7618

Modified:
  head/usr.bin/getconf/pathconf.gperf

Modified: head/usr.bin/getconf/pathconf.gperf
==
--- head/usr.bin/getconf/pathconf.gperf Thu Aug 25 16:35:42 2016
(r304808)
+++ head/usr.bin/getconf/pathconf.gperf Thu Aug 25 17:07:43 2016
(r304809)
@@ -20,8 +20,14 @@ static const struct map *in_word_set(con
 %}
 struct map { const char *name; int key; int valid; };
 %%
+ACL_EXTENDED, _PC_ACL_EXTENDED
+ACL_NFS4, _PC_ACL_NFS4
+ACL_PATH_MAX, _PC_ACL_PATH_MAX
+CAP_PRESENT, _PC_CAP_PRESENT
 FILESIZEBITS, _PC_FILESIZEBITS
+INF_PRESENT, _PC_INF_PRESENT
 LINK_MAX, _PC_LINK_MAX
+MAC_PRESENT, _PC_MAC_PRESENT
 MAX_CANON, _PC_MAX_CANON
 MAX_INPUT, _PC_MAX_INPUT
 MIN_HOLE_SIZE, _PC_MIN_HOLE_SIZE
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r304698 - head/usr.bin/getconf

2016-08-23 Thread Garrett Cooper

Author: ngie
Date: Tue Aug 23 19:41:49 2016
New Revision: 304698
URL: https://svnweb.freebsd.org/changeset/base/304698

Log:
  Add support for _PC_ACL_NFS4 as TRUSTEDBSD_ACL_NFS4
  
  The TRUSTEDBSD prefix was chosen for consistency with the other
  related `_PC_ACL*` prefixed variables.
  
  MFC after: 3 days
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.bin/getconf/pathconf.gperf

Modified: head/usr.bin/getconf/pathconf.gperf
==
--- head/usr.bin/getconf/pathconf.gperf Tue Aug 23 19:37:18 2016
(r304697)
+++ head/usr.bin/getconf/pathconf.gperf Tue Aug 23 19:41:49 2016
(r304698)
@@ -35,6 +35,7 @@ POSIX_REC_MIN_XFER_SIZE, _PC_REC_MIN_XFE
 POSIX_REC_XFER_ALIGN, _PC_REC_XFER_ALIGN
 SYMLINK_MAX, _PC_SYMLINK_MAX
 TRUSTEDBSD_ACL_EXTENDED, _PC_ACL_EXTENDED
+TRUSTEDBSD_ACL_NFS4, _PC_ACL_NFS4
 TRUSTEDBSD_ACL_PATH_MAX, _PC_ACL_PATH_MAX
 TRUSTEDBSD_CAP_PRESENT, _PC_CAP_PRESENT
 TRUSTEDBSD_INF_PRESENT, _PC_INF_PRESENT
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r304694 - head/usr.bin/getconf

2016-08-23 Thread Garrett Cooper

Author: ngie
Date: Tue Aug 23 19:28:01 2016
New Revision: 304694
URL: https://svnweb.freebsd.org/changeset/base/304694

Log:
  Add `MIN_HOLE_SIZE` pathconf(2) support to getconf
  
  This allows shell programs to programmatically determine whether
  or not a filesystem supports sparse files
  
  MFC after: 3 days
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.bin/getconf/pathconf.gperf

Modified: head/usr.bin/getconf/pathconf.gperf
==
--- head/usr.bin/getconf/pathconf.gperf Tue Aug 23 19:15:01 2016
(r304693)
+++ head/usr.bin/getconf/pathconf.gperf Tue Aug 23 19:28:01 2016
(r304694)
@@ -24,6 +24,7 @@ FILESIZEBITS, _PC_FILESIZEBITS
 LINK_MAX, _PC_LINK_MAX
 MAX_CANON, _PC_MAX_CANON
 MAX_INPUT, _PC_MAX_INPUT
+MIN_HOLE_SIZE, _PC_MIN_HOLE_SIZE
 NAME_MAX, _PC_NAME_MAX
 PATH_MAX, _PC_PATH_MAX
 PIPE_BUF, _PC_PIPE_BUF
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r304693 - head/usr.bin/getconf

2016-08-23 Thread Garrett Cooper

Author: ngie
Date: Tue Aug 23 19:15:01 2016
New Revision: 304693
URL: https://svnweb.freebsd.org/changeset/base/304693

Log:
  Clean up trailing whitespace
  
  MFC after: 3 days
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.bin/getconf/getconf.c

Modified: head/usr.bin/getconf/getconf.c
==
--- head/usr.bin/getconf/getconf.c  Tue Aug 23 19:03:11 2016
(r304692)
+++ head/usr.bin/getconf/getconf.c  Tue Aug 23 19:15:01 2016
(r304693)
@@ -109,13 +109,13 @@ main(int argc, char **argv)
do_confstr(name, key);
else
printf("undefined\n");
-   } else {
+   } else {
valid = find_sysconf(name, );
if (valid > 0) {
do_sysconf(name, key);
} else if (valid < 0) {
printf("undefined\n");
-   } else 
+   } else
errx(EX_USAGE,
 "no such configuration parameter `%s'",
 name);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r304238 - head/tests/sys/kern/acct

2016-08-16 Thread Garrett Cooper

Author: ngie
Date: Tue Aug 16 20:35:36 2016
New Revision: 304238
URL: https://svnweb.freebsd.org/changeset/base/304238

Log:
  Only expect :encode_tv_random_million to fail on 64-bit platforms
  
  It passes on i386
  
  MFC after:1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tests/sys/kern/acct/acct_test.c
Directory Properties:
  head/   (props changed)

Modified: head/tests/sys/kern/acct/acct_test.c
==
--- head/tests/sys/kern/acct/acct_test.cTue Aug 16 20:32:08 2016
(r304237)
+++ head/tests/sys/kern/acct/acct_test.cTue Aug 16 20:35:36 2016
(r304238)
@@ -204,7 +204,10 @@ ATF_TC_BODY(encode_tv_random_million, tc
struct timeval tv;
long k;
 
-   atf_tc_expect_fail("the testcase violates FLT_EPSILON");
+#ifdef __LP64__
+   atf_tc_expect_fail("the testcase violates FLT_EPSILON on 64-bit "
+   "platforms, e.g. amd64");
+#endif
 
ATF_REQUIRE_MSG(unsetenv("TZ") == 0, "unsetting TZ failed; errno=%d", 
errno);
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r304040 - head/tests/sys/acl

2016-08-13 Thread Garrett Cooper

Author: ngie
Date: Sat Aug 13 06:26:33 2016
New Revision: 304040
URL: https://svnweb.freebsd.org/changeset/base/304040

Log:
  Redirect the output of the testcases to stderr instead of
  redirecting it to /dev/null
  
  This will aid in debugging failures
  
  MFC after:1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tests/sys/acl/00.sh
  head/tests/sys/acl/01.sh
  head/tests/sys/acl/02.sh
  head/tests/sys/acl/03.sh
  head/tests/sys/acl/04.sh

Modified: head/tests/sys/acl/00.sh
==
--- head/tests/sys/acl/00.shSat Aug 13 06:16:38 2016(r304039)
+++ head/tests/sys/acl/00.shSat Aug 13 06:26:33 2016(r304040)
@@ -75,7 +75,7 @@ chmod 600 xxx
 rm xxx
 echo "ok 2"
 
-perl $TESTDIR/run $TESTDIR/tools-posix.test > /dev/null
+perl $TESTDIR/run $TESTDIR/tools-posix.test >&2
 
 if [ $? -eq 0 ]; then
echo "ok 3"

Modified: head/tests/sys/acl/01.sh
==
--- head/tests/sys/acl/01.shSat Aug 13 06:16:38 2016(r304039)
+++ head/tests/sys/acl/01.shSat Aug 13 06:26:33 2016(r304040)
@@ -76,7 +76,7 @@ chmod 600 xxx
 rm xxx
 echo "ok 2"
 
-perl $TESTDIR/run $TESTDIR/tools-nfs4-psarc.test > /dev/null
+perl $TESTDIR/run $TESTDIR/tools-nfs4-psarc.test >&2
 
 if [ $? -eq 0 ]; then
echo "ok 3"

Modified: head/tests/sys/acl/02.sh
==
--- head/tests/sys/acl/02.shSat Aug 13 06:16:38 2016(r304039)
+++ head/tests/sys/acl/02.shSat Aug 13 06:26:33 2016(r304040)
@@ -76,9 +76,9 @@ rm xxx
 echo "ok 2"
 
 if [ `sysctl -n vfs.acl_nfs4_old_semantics` = 0 ]; then
-   perl $TESTDIR/run $TESTDIR/tools-nfs4-psarc.test > /dev/null
+   perl $TESTDIR/run $TESTDIR/tools-nfs4-psarc.test >&2
 else
-   perl $TESTDIR/run $TESTDIR/tools-nfs4.test > /dev/null
+   perl $TESTDIR/run $TESTDIR/tools-nfs4.test >&2
 fi
 
 if [ $? -eq 0 ]; then

Modified: head/tests/sys/acl/03.sh
==
--- head/tests/sys/acl/03.shSat Aug 13 06:16:38 2016(r304039)
+++ head/tests/sys/acl/03.shSat Aug 13 06:26:33 2016(r304040)
@@ -89,7 +89,7 @@ echo "ok 3"
 
 cd $MNTROOT
 
-perl $TESTDIR/run $TESTDIR/tools-crossfs.test > /dev/null
+perl $TESTDIR/run $TESTDIR/tools-crossfs.test >&2
 
 if [ $? -eq 0 ]; then
echo "ok 4"

Modified: head/tests/sys/acl/04.sh
==
--- head/tests/sys/acl/04.shSat Aug 13 06:16:38 2016(r304039)
+++ head/tests/sys/acl/04.shSat Aug 13 06:26:33 2016(r304040)
@@ -57,7 +57,7 @@ echo "ok 1"
 
 cd $MNT
 
-perl $TESTDIR/run $TESTDIR/tools-nfs4-trivial.test > /dev/null
+perl $TESTDIR/run $TESTDIR/tools-nfs4-trivial.test >&2
 
 if [ $? -eq 0 ]; then
echo "ok 2"
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r304034 - head/lib/libc/net

2016-08-12 Thread Garrett Cooper

Author: ngie
Date: Sat Aug 13 02:05:06 2016
New Revision: 304034
URL: https://svnweb.freebsd.org/changeset/base/304034

Log:
  Initialize `ai` to NULL and test for `ai` with type-appropriate values
  
  Depending on the address family and ai_flags containing AI_V4MAPPED,
  it might not do a proper DNS lookup on the provided DNS address
  
  Convert some `ai` boolean true/false checks to NULL/non-NULL while here.
  
  MFC after:1 week
  PR:   211790
  Reported by:  herbie.robin...@stratus.com
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/lib/libc/net/getaddrinfo.c

Modified: head/lib/libc/net/getaddrinfo.c
==
--- head/lib/libc/net/getaddrinfo.c Sat Aug 13 01:49:11 2016
(r304033)
+++ head/lib/libc/net/getaddrinfo.c Sat Aug 13 02:05:06 2016
(r304034)
@@ -2249,6 +2249,8 @@ _dns_getaddrinfo(void *rv, void *cb_data
struct res_target q, q2;
res_state res;
 
+   ai = NULL;
+
hostname = va_arg(ap, char *);
pai = va_arg(ap, const struct addrinfo *);
 
@@ -2327,16 +2329,16 @@ _dns_getaddrinfo(void *rv, void *cb_data
/* prefer IPv6 */
if (q.next) {
ai = getanswer(buf2, q2.n, q2.name, q2.qtype, pai, res);
-   if (ai) {
+   if (ai != NULL) {
cur->ai_next = ai;
while (cur && cur->ai_next)
cur = cur->ai_next;
}
}
-   if (!ai || pai->ai_family != AF_UNSPEC ||
+   if (ai == NULL || pai->ai_family != AF_UNSPEC ||
(pai->ai_flags & (AI_ALL | AI_V4MAPPED)) != AI_V4MAPPED) {
ai = getanswer(buf, q.n, q.name, q.qtype, pai, res);
-   if (ai)
+   if (ai != NULL)
cur->ai_next = ai;
}
free(buf);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r304033 - head/lib/libc/tests/resolv

2016-08-12 Thread Garrett Cooper

Author: ngie
Date: Sat Aug 13 01:49:11 2016
New Revision: 304033
URL: https://svnweb.freebsd.org/changeset/base/304033

Log:
  Increase timeout from 10 minutes to 20 minutes for all tests
  
  On particular slow networks, it can (on average) take longer to
  resolve hosts to IP* addresses. 20 minutes seemed reasonable for
  my work network
  
  This will be solved in a more meaningful way (if possible) using
  concurrency in the near future
  
  MFC after: 2 weeks
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/lib/libc/tests/resolv/resolv_test.c

Modified: head/lib/libc/tests/resolv/resolv_test.c
==
--- head/lib/libc/tests/resolv/resolv_test.cSat Aug 13 01:40:08 2016
(r304032)
+++ head/lib/libc/tests/resolv/resolv_test.cSat Aug 13 01:49:11 2016
(r304033)
@@ -291,7 +291,7 @@ do {
\
 
 ATF_TC(getaddrinfo_test);
 ATF_TC_HEAD(getaddrinfo_test, tc) {
-   atf_tc_set_md_var(tc, "timeout", "450");
+   atf_tc_set_md_var(tc, "timeout", "1200");
 }
 ATF_TC_BODY(getaddrinfo_test, tc)
 {
@@ -301,7 +301,7 @@ ATF_TC_BODY(getaddrinfo_test, tc)
 
 ATF_TC(gethostby_test);
 ATF_TC_HEAD(gethostby_test, tc) {
-   atf_tc_set_md_var(tc, "timeout", "450");
+   atf_tc_set_md_var(tc, "timeout", "1200");
 }
 ATF_TC_BODY(gethostby_test, tc)
 {
@@ -312,7 +312,7 @@ ATF_TC_BODY(gethostby_test, tc)
 ATF_TC(getipnodeby_test);
 ATF_TC_HEAD(getipnodeby_test, tc) {
 
-   atf_tc_set_md_var(tc, "timeout", "450");
+   atf_tc_set_md_var(tc, "timeout", "1200");
 }
 ATF_TC_BODY(getipnodeby_test, tc)
 {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r303900 - in head/cddl/usr.sbin/dtrace/tests: common/raise common/safety tools

2016-08-09 Thread Garrett Cooper

Author: ngie
Date: Wed Aug 10 03:10:34 2016
New Revision: 303900
URL: https://svnweb.freebsd.org/changeset/base/303900

Log:
  Highball memory requirement (4GB) with common/{raise,safety}
  
  Both test suites require more memory than my amd64 VM using
  GENERIC-NODEBUG can provide and reliably panic it with OOM issues in
  dtrace(4).
  
  Some of the testcases fail, but this at least bypasses the panic behavior
  on platforms that don't have enough resources
  
  MFC after: 2 weeks
  Discussed with: markj
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
  head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
  head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh

Modified: head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
==
--- head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile   Wed Aug 10 
02:44:46 2016(r303899)
+++ head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile   Wed Aug 10 
03:10:34 2016(r303900)
@@ -20,4 +20,6 @@ CFILES= \
  tst.raise3.c  \
 
 
+TEST_METADATA.t_dtrace_contrib+=   required_memory="4g"
+
 .include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
==
--- head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile  Wed Aug 10 
02:44:46 2016(r303899)
+++ head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile  Wed Aug 10 
03:10:34 2016(r303900)
@@ -53,4 +53,6 @@ CFILES= \
 
 
 
+TEST_METADATA.t_dtrace_contrib+=   required_memory="4g"
+
 .include "../../dtrace.test.mk"

Modified: head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
==
--- head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh   Wed Aug 10 
02:44:46 2016(r303899)
+++ head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh   Wed Aug 10 
03:10:34 2016(r303900)
@@ -34,15 +34,28 @@ genmakefile()
 
 # One-off variable definitions.
 local special
-if [ "$basedir" = proc ]; then
+case "$basedir" in
+proc)
 special="
 LIBADD.tst.sigwait.exe+= rt
 "
-elif [ "$basedir" = uctf ]; then
+;;
+raise)
+   special="
+TEST_METADATA.t_dtrace_contrib+=   required_memory=\"4g\"
+"
+;;
+safety)
+   special="
+TEST_METADATA.t_dtrace_contrib+=   required_memory=\"4g\"
+"
+;;
+uctf)
 special="
 WITH_CTF=YES
 "
-fi
+;;
+esac
 
 local makefile=$(mktemp)
 cat <<__EOF__ > $makefile
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r303830 - head/usr.bin/getconf

2016-08-08 Thread Garrett Cooper

Author: ngie
Date: Mon Aug  8 07:19:30 2016
New Revision: 303830
URL: https://svnweb.freebsd.org/changeset/base/303830

Log:
  Remove vestigal references to __alpha__
  
  Replace alpha reference in getconf(1) with amd64 [*]
  
  MFC after:1 week
  PR:   211300 [*]
  Submitted by: Sevan Janiyan  [*]
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.bin/getconf/getconf.1
  head/usr.bin/getconf/progenv.gperf

Modified: head/usr.bin/getconf/getconf.1
==
--- head/usr.bin/getconf/getconf.1  Mon Aug  8 07:16:13 2016
(r303829)
+++ head/usr.bin/getconf/getconf.1  Mon Aug  8 07:19:30 2016
(r303830)
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 18, 2002
+.Dd August 8, 2016
 .Dt GETCONF 1
 .Os
 .Sh NAME
@@ -122,7 +122,7 @@ Exactly 32-bit integer, long, and pointe
 .It Li POSIX_V6_LP64_OFF64
 Exactly 32-bit integer; exactly 64-bit long, pointer, and file offset.
 .Sy Supported platforms :
-.Tn Alpha ,
+.Tn AMD64 ,
 .Tn SPARC64 .
 .It Li POSIX_V6_LPBIG_OFFBIG
 At least 32-bit integer; at least 64-bit long, pointer, and file offset.

Modified: head/usr.bin/getconf/progenv.gperf
==
--- head/usr.bin/getconf/progenv.gperf  Mon Aug  8 07:16:13 2016
(r303829)
+++ head/usr.bin/getconf/progenv.gperf  Mon Aug  8 07:19:30 2016
(r303830)
@@ -30,7 +30,7 @@ static const struct map *in_word_set(con
  * be updated.  (We cheat here and define the supported environments
  * statically.)
  */
-#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__)
+#if defined(__sparc64__) || defined(__amd64__)
 #definehave_LP64_OFF64 NULL
 #endif
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r303804 - head/usr.bin/tar/tests

2016-08-06 Thread Garrett Cooper

Author: ngie
Date: Sat Aug  6 19:05:01 2016
New Revision: 303804
URL: https://svnweb.freebsd.org/changeset/base/303804

Log:
  Fix building usr.bin/tar/tests with PIE symbol building enabled by
  removing CFLAGS+= -static
  
  `CFLAGS+= -static` was a carryover from pre-r289195 with
  usr.bin/tar/test/Makefile that should have been specified in LDFLAGS
  There doesn't seem to be an apparent need for static compilation
  of the test binaries.
  
  Differential Revision:https://reviews.freebsd.org/D7430
  MFC after:1 week
  Obtained-from:opBSD (418a491eed20d2603ddd1f1bd92c2c0d95094002)
  Submitted by: op
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.bin/tar/tests/Makefile

Modified: head/usr.bin/tar/tests/Makefile
==
--- head/usr.bin/tar/tests/Makefile Sat Aug  6 18:48:47 2016
(r303803)
+++ head/usr.bin/tar/tests/Makefile Sat Aug  6 19:05:01 2016
(r303804)
@@ -9,7 +9,6 @@ ATF_TESTS_SH+=  functional_test
 BINDIR=${TESTSDIR}
 
 CFLAGS+=   
-DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\"
-CFLAGS+=   -static
 CFLAGS+=   -I${SRCTOP}/lib/libarchive -I${.OBJDIR}
 CFLAGS+=   -I${_LIBARCHIVEDIR}/tar -I${_LIBARCHIVEDIR}/test_utils
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r303576 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

2016-07-31 Thread Garrett Cooper

Author: ngie
Date: Sun Jul 31 06:34:49 2016
New Revision: 303576
URL: https://svnweb.freebsd.org/changeset/base/303576

Log:
  Conditionalize code which defines sysctls per _KERNEL #ifdef guard
  
  This resolves several issues when compiling libzpool (userspace library), i.e.
  -Wimplicit-function-declaration and -Wmissing-declarations issues.
  
  MFC after:2 weeks
  Reported by:  clang
  Tested with:  clang 3.8.1, gcc 4.2.1, gcc 5.3.0
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c   Sun Jul 
31 06:28:40 2016(r303575)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c   Sun Jul 
31 06:34:49 2016(r303576)
@@ -58,9 +58,11 @@ typedef struct mirror_map {
 
 static int vdev_mirror_shift = 21;
 
+#ifdef _KERNEL
 SYSCTL_DECL(_vfs_zfs_vdev);
 static SYSCTL_NODE(_vfs_zfs_vdev, OID_AUTO, mirror, CTLFLAG_RD, 0,
 "ZFS VDEV Mirror");
+#endif
 
 /*
  * The load configuration settings below are tuned by default for
@@ -74,28 +76,38 @@ static SYSCTL_NODE(_vfs_zfs_vdev, OID_AU
 
 /* Rotating media load calculation configuration. */
 static int rotating_inc = 0;
+#ifdef _KERNEL
 SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, rotating_inc, CTLFLAG_RWTUN,
 _inc, 0, "Rotating media load increment for non-seeking I/O's");
+#endif
 
 static int rotating_seek_inc = 5;
+#ifdef _KERNEL
 SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, rotating_seek_inc, CTLFLAG_RWTUN,
 _seek_inc, 0, "Rotating media load increment for seeking I/O's");
+#endif
 
 static int rotating_seek_offset = 1 * 1024 * 1024;
+#ifdef _KERNEL
 SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, rotating_seek_offset, CTLFLAG_RWTUN,
 _seek_offset, 0, "Offset in bytes from the last I/O which "
 "triggers a reduced rotating media seek increment");
+#endif
 
 /* Non-rotating media load calculation configuration. */
 static int non_rotating_inc = 0;
+#ifdef _KERNEL
 SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, non_rotating_inc, CTLFLAG_RWTUN,
 _rotating_inc, 0,
 "Non-rotating media load increment for non-seeking I/O's");
+#endif
 
 static int non_rotating_seek_inc = 1;
+#ifdef _KERNEL
 SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, non_rotating_seek_inc, 
CTLFLAG_RWTUN,
 _rotating_seek_inc, 0,
 "Non-rotating media load increment for seeking I/O's");
+#endif
 
 
 static inline size_t

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.cSun Jul 
31 06:28:40 2016(r303575)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.cSun Jul 
31 06:34:49 2016(r303576)
@@ -176,6 +176,7 @@ int zfs_vdev_read_gap_limit = 32 << 10;
 int zfs_vdev_write_gap_limit = 4 << 10;
 
 #ifdef __FreeBSD__
+#ifdef _KERNEL
 SYSCTL_DECL(_vfs_zfs_vdev);
 
 static int 
sysctl_zfs_async_write_active_min_dirty_percent(SYSCTL_HANDLER_ARGS);
@@ -271,6 +272,7 @@ sysctl_zfs_async_write_active_max_dirty_
return (0);
 }
 #endif
+#endif
 
 int
 vdev_queue_offset_compare(const void *x1, const void *x2)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r303575 - in head/tools/regression/zfs/zpool: add create

2016-07-31 Thread Garrett Cooper

Author: ngie
Date: Sun Jul 31 06:28:40 2016
New Revision: 303575
URL: https://svnweb.freebsd.org/changeset/base/303575

Log:
  Remove calls to `die` added for associated bugs
  
  Panics are no longer hit with ^/head@r303573 on amd64
  
  PR: 194586, 194587, 194589
  Sponsored by:   EMC / Isilon Storage Division

Modified:
  head/tools/regression/zfs/zpool/add/option-f_size_mismatch.t
  head/tools/regression/zfs/zpool/add/option-f_type_mismatch.t
  head/tools/regression/zfs/zpool/create/files.t

Modified: head/tools/regression/zfs/zpool/add/option-f_size_mismatch.t
==
--- head/tools/regression/zfs/zpool/add/option-f_size_mismatch.tSun Jul 
31 06:24:26 2016(r303574)
+++ head/tools/regression/zfs/zpool/add/option-f_size_mismatch.tSun Jul 
31 06:28:40 2016(r303575)
@@ -4,8 +4,6 @@
 dir=`dirname $0`
 . ${dir}/../../misc.sh
 
-[ "${os}" = "FreeBSD" ] && die "panics FreeBSD; see bug # 194586"
-
 echo "1..100"
 
 disks_create 7

Modified: head/tools/regression/zfs/zpool/add/option-f_type_mismatch.t
==
--- head/tools/regression/zfs/zpool/add/option-f_type_mismatch.tSun Jul 
31 06:24:26 2016(r303574)
+++ head/tools/regression/zfs/zpool/add/option-f_type_mismatch.tSun Jul 
31 06:28:40 2016(r303575)
@@ -4,8 +4,6 @@
 dir=`dirname $0`
 . ${dir}/../../misc.sh
 
-[ "${os}" = "FreeBSD" ] && die "panics FreeBSD; see bug # 194587"
-
 echo "1..100"
 
 disks_create 7

Modified: head/tools/regression/zfs/zpool/create/files.t
==
--- head/tools/regression/zfs/zpool/create/files.t  Sun Jul 31 06:24:26 
2016(r303574)
+++ head/tools/regression/zfs/zpool/create/files.t  Sun Jul 31 06:28:40 
2016(r303575)
@@ -4,8 +4,6 @@
 dir=`dirname $0`
 . ${dir}/../../misc.sh
 
-[ "${os}" = "FreeBSD" ] && die "panics FreeBSD; see bug # 194589"
-
 echo "1..59"
 
 files_create 5
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r303573 - head/cddl/contrib/opensolaris/lib/libzpool/common

2016-07-31 Thread Garrett Cooper

Author: ngie
Date: Sun Jul 31 06:03:27 2016
New Revision: 303573
URL: https://svnweb.freebsd.org/changeset/base/303573

Log:
  Cast result from third parameter to int instead of promoting it to size_t
  
  This resolves a -Wformat issue when the value is used as a format width
  precision specifier, i.e. %*s
  
  MFC after: 1 month
  Reported by: clang
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/cddl/contrib/opensolaris/lib/libzpool/common/util.c

Modified: head/cddl/contrib/opensolaris/lib/libzpool/common/util.c
==
--- head/cddl/contrib/opensolaris/lib/libzpool/common/util.cSun Jul 31 
05:31:09 2016(r303572)
+++ head/cddl/contrib/opensolaris/lib/libzpool/common/util.cSun Jul 31 
06:03:27 2016(r303573)
@@ -108,7 +108,7 @@ show_vdev_stats(const char *desc, const 
(void) printf("%*s%s%*s%*s%*s %5s %5s %5s %5s %5s %5s %5s\n",
indent, "",
prefix,
-   indent + strlen(prefix) - 25 - (vs->vs_space ? 0 : 12),
+   (int)(indent + strlen(prefix) - 25 - (vs->vs_space ? 0 : 
12)),
desc,
vs->vs_space ? 6 : 0, vs->vs_space ? used : "",
vs->vs_space ? 6 : 0, vs->vs_space ? avail : "",
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r303572 - head/usr.bin/sed

2016-07-30 Thread Garrett Cooper

Author: ngie
Date: Sun Jul 31 05:31:09 2016
New Revision: 303572
URL: https://svnweb.freebsd.org/changeset/base/303572

Log:
  Fix regression with /i caused by r303047
  
  '\n' was specifically added to -e arguments prior to r303047. Restore
  historical behavior which in turn fixes usr.sbin/etcupdate/preworld_test:main 
.
  
  The fix is being committed to address the issue in the short term and may be
  iterated upon as noted in bug 211399
  
  Discussed with:   mi, pfg
  Differential Revision:https://reviews.freebsd.org/D7368
  PR:   195929, 211399 [*]
  MFC after:18 days
  X-MFC with:   r303047
  Reported by:  Jenkins
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.bin/sed/main.c

Modified: head/usr.bin/sed/main.c
==
--- head/usr.bin/sed/main.c Sun Jul 31 04:58:06 2016(r303571)
+++ head/usr.bin/sed/main.c Sun Jul 31 05:31:09 2016(r303572)
@@ -123,6 +123,7 @@ static void usage(void);
 int
 main(int argc, char *argv[])
 {
+   char *temp_arg;
int c, fflag;
 
(void) setlocale(LC_ALL, "");
@@ -145,7 +146,10 @@ main(int argc, char *argv[])
break;
case 'e':
eflag = 1;
-   add_compunit(CU_STRING, optarg);
+   asprintf(_arg, "%s\n", optarg);
+   if (temp_arg == NULL)
+   errx(1, "Couldn't allocate temporary buffer");
+   add_compunit(CU_STRING, temp_arg);
break;
case 'f':
fflag = 1;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r303367 - head/usr.bin/sed/tests

2016-07-27 Thread Garrett Cooper

Author: ngie
Date: Wed Jul 27 06:49:16 2016
New Revision: 303367
URL: https://svnweb.freebsd.org/changeset/base/303367

Log:
  Testcase 7.8 no longer needs to be marked TODO
  
  It passes out of the box today
  
  MFC after: 2 months
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.bin/sed/tests/multi_test.sh

Modified: head/usr.bin/sed/tests/multi_test.sh
==
--- head/usr.bin/sed/tests/multi_test.shWed Jul 27 06:36:57 2016
(r303366)
+++ head/usr.bin/sed/tests/multi_test.shWed Jul 27 06:49:16 2016
(r303367)
@@ -383,7 +383,6 @@ test_print()
mark '7.8'
echo line1 > lines3
echo "" >> lines3
-   TODO=1
$SED -n -e '$p' lines3 /dev/null

 }
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302842 - head

2016-07-14 Thread Garrett Cooper

Author: ngie
Date: Thu Jul 14 14:16:20 2016
New Revision: 302842
URL: https://svnweb.freebsd.org/changeset/base/302842

Log:
  Don't delete usr/share/local/kk_KZ.UTF-8 with "make delete-old" after r302329
  
  kk_KZ.UTF-8 was originally removed in r290494, but restored as an alias to
  en_US.UTF-8 in r302329
  
  MFC after: 1 week
  X-MFC with: r302329
  PR: 211046
  Reported by: dhw, O. Hartman 
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/ObsoleteFiles.inc

Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc  Thu Jul 14 13:55:38 2016(r302841)
+++ head/ObsoleteFiles.inc  Thu Jul 14 14:16:20 2016(r302842)
@@ -460,13 +460,6 @@ OLD_FILES+=usr/share/locale/kk_KZ.PT154/
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_NUMERIC
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_TIME
 OLD_DIRS+=usr/share/locale/kk_KZ.PT154/
-OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_COLLATE
-OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_CTYPE
-OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MESSAGES
-OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MONETARY
-OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_NUMERIC
-OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_TIME
-OLD_DIRS+=usr/share/locale/kk_KZ.UTF-8
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_TIME
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302841 - head/sys/dev/drm2

2016-07-14 Thread Garrett Cooper

Author: ngie
Date: Thu Jul 14 13:55:38 2016
New Revision: 302841
URL: https://svnweb.freebsd.org/changeset/base/302841

Log:
  Always panic if an invalid capability is passed to `capable(..)` instead of
  just with INVARIANTS
  
  rwatson's point was valid in the sense that if the data passed at runtime is
  invalid, it should always trip the invariant, not just in the debug case.
  This is a deterrent against malicious input, or input caused by hardware
  errors.
  
  MFC after: 4 days
  X-MFC with: r302577
  Requested by: rwatson
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/dev/drm2/drm_os_freebsd.h

Modified: head/sys/dev/drm2/drm_os_freebsd.h
==
--- head/sys/dev/drm2/drm_os_freebsd.h  Thu Jul 14 11:53:39 2016
(r302840)
+++ head/sys/dev/drm2/drm_os_freebsd.h  Thu Jul 14 13:55:38 2016
(r302841)
@@ -439,8 +439,7 @@ capable(enum __drm_capabilities cap)
case CAP_SYS_ADMIN:
return DRM_SUSER(curthread);
default:
-   KASSERT(false,
-   ("%s: unhandled capability: %0x", __func__, cap));
+   panic("%s: unhandled capability: %0x", __func__, cap);
return (false);
}
 }
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302807 - head/contrib/ldns-host

2016-07-14 Thread Garrett Cooper

Author: ngie
Date: Thu Jul 14 06:10:16 2016
New Revision: 302807
URL: https://svnweb.freebsd.org/changeset/base/302807

Log:
  Initialize first_serial to 0 in dozonetransfer(..) to fix -Wuninitialized
  warning
  
  MFC after: 3 days
  X-MFC with: r302779
  Pointyhat to: des
  PR: 209177
  Reported by: Jenkins (sparc64 job), gcc 4.2.1, gcc 5.3.0
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/contrib/ldns-host/ldns-host.c

Modified: head/contrib/ldns-host/ldns-host.c
==
--- head/contrib/ldns-host/ldns-host.c  Thu Jul 14 06:10:00 2016
(r302806)
+++ head/contrib/ldns-host/ldns-host.c  Thu Jul 14 06:10:16 2016
(r302807)
@@ -888,7 +888,7 @@ dozonetransfer(ldns_resolver *res, ldns_
 ldns_rr_list *rrl;
 ldns_rr *rr;
 size_t i, nsoa = 0;
-uint32_t first_serial;
+uint32_t first_serial = 0;
 
 rrtype = o_rrtype;
 o_rrtype = (o_mode == M_AXFR) ? LDNS_RR_TYPE_AXFR : LDNS_RR_TYPE_IXFR;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302581 - head/sys/dev/cxgbe/tom

2016-07-11 Thread Garrett Cooper

Author: ngie
Date: Mon Jul 11 17:11:18 2016
New Revision: 302581
URL: https://svnweb.freebsd.org/changeset/base/302581

Log:
  Remove redundant declaration for tcp_dooptions, similar to r302576
  
  netinet/tcp_var.h already defines this function
  
  Differential Revision:https://reviews.freebsd.org/D7189
  MFC after:1 week
  PR:   209920
  Reported by:  Mark Millard 
  Reviewed by:  np
  Tested with:  clang 3.8.0, gcc 4.2.1, gcc 5.3.0
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/dev/cxgbe/tom/t4_listen.c

Modified: head/sys/dev/cxgbe/tom/t4_listen.c
==
--- head/sys/dev/cxgbe/tom/t4_listen.c  Mon Jul 11 17:04:22 2016
(r302580)
+++ head/sys/dev/cxgbe/tom/t4_listen.c  Mon Jul 11 17:11:18 2016
(r302581)
@@ -665,9 +665,6 @@ t4_syncache_removed(struct toedev *tod _
release_synqe(synqe);
 }
 
-/* XXX */
-extern void tcp_dooptions(struct tcpopt *, u_char *, int, int);
-
 int
 t4_syncache_respond(struct toedev *tod, void *arg, struct mbuf *m)
 {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302577 - head/sys/dev/drm2

2016-07-11 Thread Garrett Cooper

Author: ngie
Date: Mon Jul 11 17:01:07 2016
New Revision: 302577
URL: https://svnweb.freebsd.org/changeset/base/302577

Log:
  Add missing default case to capable(..) function definition
  
  By definition (enum __drm_capabilities), cases other than CAP_SYS_ADMIN
  aren't possible. Add in a KASSERT safety belt and return false in
  !INVARIANTS case if an invalid value is passed in, as it would be a
  programmer error.
  
  This fixes a -Wreturn-type error with gcc 5.3.0.
  
  Differential Revision:https://reviews.freebsd.org/D7188
  MFC after:1 week
  Reported by:  devel/amd64-gcc (5.3.0)
  Reviewed by:  dumbbell
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/dev/drm2/drm_os_freebsd.h

Modified: head/sys/dev/drm2/drm_os_freebsd.h
==
--- head/sys/dev/drm2/drm_os_freebsd.h  Mon Jul 11 16:56:51 2016
(r302576)
+++ head/sys/dev/drm2/drm_os_freebsd.h  Mon Jul 11 17:01:07 2016
(r302577)
@@ -438,6 +438,10 @@ capable(enum __drm_capabilities cap)
switch (cap) {
case CAP_SYS_ADMIN:
return DRM_SUSER(curthread);
+   default:
+   KASSERT(false,
+   ("%s: unhandled capability: %0x", __func__, cap));
+   return (false);
}
 }
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302576 - head/sys/dev/cxgb/ulp/tom

2016-07-11 Thread Garrett Cooper

Author: ngie
Date: Mon Jul 11 16:56:51 2016
New Revision: 302576
URL: https://svnweb.freebsd.org/changeset/base/302576

Log:
  (Re-do r302574 with corrected commit message..)
  
  Remove redundant declaration for tcp_dooptions
  
  netinet/tcp_var.h already defines this function
  
  Differential Revision:https://reviews.freebsd.org/D7187
  MFC after:1 week
  PR:   209920
  Reported by:  Mark Millard 
  Reviewed by:  np
  Tested with:  clang 3.8.0, gcc 4.2.1, gcc 5.3.0
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/dev/cxgb/ulp/tom/cxgb_listen.c

Modified: head/sys/dev/cxgb/ulp/tom/cxgb_listen.c
==
--- head/sys/dev/cxgb/ulp/tom/cxgb_listen.c Mon Jul 11 16:54:19 2016
(r302575)
+++ head/sys/dev/cxgb/ulp/tom/cxgb_listen.c Mon Jul 11 16:56:51 2016
(r302576)
@@ -922,9 +922,6 @@ t3_syncache_removed(struct toedev *tod _
release_synqe(synqe);
 }
 
-/* XXX */
-extern void tcp_dooptions(struct tcpopt *, u_char *, int, int);
-
 int
 t3_syncache_respond(struct toedev *tod, void *arg, struct mbuf *m)
 {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302575 - head/sys/dev/cxgb/ulp/tom

2016-07-11 Thread Garrett Cooper

Author: ngie
Date: Mon Jul 11 16:54:19 2016
New Revision: 302575
URL: https://svnweb.freebsd.org/changeset/base/302575

Log:
  Revert r302574. I botched the commit message in more way than 1

Modified:
  head/sys/dev/cxgb/ulp/tom/cxgb_listen.c

Modified: head/sys/dev/cxgb/ulp/tom/cxgb_listen.c
==
--- head/sys/dev/cxgb/ulp/tom/cxgb_listen.c Mon Jul 11 16:52:04 2016
(r302574)
+++ head/sys/dev/cxgb/ulp/tom/cxgb_listen.c Mon Jul 11 16:54:19 2016
(r302575)
@@ -922,6 +922,9 @@ t3_syncache_removed(struct toedev *tod _
release_synqe(synqe);
 }
 
+/* XXX */
+extern void tcp_dooptions(struct tcpopt *, u_char *, int, int);
+
 int
 t3_syncache_respond(struct toedev *tod, void *arg, struct mbuf *m)
 {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302574 - head/sys/dev/cxgb/ulp/tom

2016-07-11 Thread Garrett Cooper

Author: ngie
Date: Mon Jul 11 16:52:04 2016
New Revision: 302574
URL: https://svnweb.freebsd.org/changeset/base/302574

Log:
  Remove redundant declaration for tcp_dooptions
  
  netinet/tcp_var.h already defines this function
  
  PR:   209924
  Reported by:  Mark Millard 
  Reviewed by:  np
  Tested with:  clang 3.8.0, gcc 4.2.1, gcc 5.3.0
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/dev/cxgb/ulp/tom/cxgb_listen.c

Modified: head/sys/dev/cxgb/ulp/tom/cxgb_listen.c
==
--- head/sys/dev/cxgb/ulp/tom/cxgb_listen.c Mon Jul 11 15:52:52 2016
(r302573)
+++ head/sys/dev/cxgb/ulp/tom/cxgb_listen.c Mon Jul 11 16:52:04 2016
(r302574)
@@ -922,9 +922,6 @@ t3_syncache_removed(struct toedev *tod _
release_synqe(synqe);
 }
 
-/* XXX */
-extern void tcp_dooptions(struct tcpopt *, u_char *, int, int);
-
 int
 t3_syncache_respond(struct toedev *tod, void *arg, struct mbuf *m)
 {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302572 - head/sys/dev/drm2/i915

2016-07-11 Thread Garrett Cooper

Author: ngie
Date: Mon Jul 11 15:50:06 2016
New Revision: 302572
URL: https://svnweb.freebsd.org/changeset/base/302572

Log:
  Remove redundant declarations for intel_fbc_enabled(..) and
  i915_gem_dump_object(..) to fix -Wredundant-decls warning
  
  MFC after:1 week
  PR:   209924
  Reported by:  Mark Millard 
  Tested with:  devel/amd64-gcc (5.3.0)
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/dev/drm2/i915/i915_drv.h

Modified: head/sys/dev/drm2/i915/i915_drv.h
==
--- head/sys/dev/drm2/i915/i915_drv.h   Mon Jul 11 15:47:43 2016
(r302571)
+++ head/sys/dev/drm2/i915/i915_drv.h   Mon Jul 11 15:50:06 2016
(r302572)
@@ -1618,8 +1618,6 @@ int i915_verify_lists(struct drm_device 
 #endif
 void i915_gem_object_check_coherency(struct drm_i915_gem_object *obj,
 int handle);
-void i915_gem_dump_object(struct drm_i915_gem_object *obj, int len,
- const char *where, uint32_t mark);
 
 /* i915_suspend.c */
 extern int i915_save_state(struct drm_device *dev);
@@ -1673,7 +1671,6 @@ extern void intel_modeset_cleanup(struct
 extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state);
 extern void intel_modeset_setup_hw_state(struct drm_device *dev,
 bool force_restore);
-extern bool intel_fbc_enabled(struct drm_device *dev);
 extern void intel_disable_fbc(struct drm_device *dev);
 extern bool ironlake_set_drps(struct drm_device *dev, u8 val);
 extern void intel_init_pch_refclk(struct drm_device *dev);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302571 - head/sys/dev/drm2/radeon

2016-07-11 Thread Garrett Cooper

Author: ngie
Date: Mon Jul 11 15:47:43 2016
New Revision: 302571
URL: https://svnweb.freebsd.org/changeset/base/302571

Log:
  Remove redundant declaration for radeon_pm_acpi_event_handler(..) to fix
  -Wredundant-decls warning
  
  MFC after:1 week
  PR:   209924
  Reported by:  Mark Millard 
  Tested with:  devel/amd64-gcc (5.3.0)
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/dev/drm2/radeon/radeon_acpi.c

Modified: head/sys/dev/drm2/radeon/radeon_acpi.c
==
--- head/sys/dev/drm2/radeon/radeon_acpi.c  Mon Jul 11 15:33:49 2016
(r302570)
+++ head/sys/dev/drm2/radeon/radeon_acpi.c  Mon Jul 11 15:47:43 2016
(r302571)
@@ -32,8 +32,6 @@ __FBSDID("$FreeBSD$");
 
 #define ACPI_AC_CLASS   "ac_adapter"
 
-extern void radeon_pm_acpi_event_handler(struct radeon_device *rdev);
-
 struct atif_verify_interface {
u16 size;   /* structure size in bytes (includes size 
field) */
u16 version;/* version */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302553 - head/sys/rpc

2016-07-11 Thread Garrett Cooper

Author: ngie
Date: Mon Jul 11 07:24:56 2016
New Revision: 302553
URL: https://svnweb.freebsd.org/changeset/base/302553

Log:
  Don't test for xpt not being NULL before calling svc_xprt_free(..)
  
  svc_xprt_alloc(..) will always return initialized memory as it uses
  mem_alloc(..) under the covers, which uses malloc(.., M_WAITOK, ..).
  
  MFC after: 1 week
  Reported by: Coverity
  CID: 1007341
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/rpc/svc_dg.c

Modified: head/sys/rpc/svc_dg.c
==
--- head/sys/rpc/svc_dg.c   Mon Jul 11 07:17:52 2016(r302552)
+++ head/sys/rpc/svc_dg.c   Mon Jul 11 07:24:56 2016(r302553)
@@ -142,9 +142,8 @@ svc_dg_create(SVCPOOL *pool, struct sock
return (xprt);
 freedata:
(void) printf(svc_dg_str, __no_mem_str);
-   if (xprt) {
-   svc_xprt_free(xprt);
-   }
+   svc_xprt_free(xprt);
+
return (NULL);
 }
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302552 - head/sys/rpc

2016-07-11 Thread Garrett Cooper

Author: ngie
Date: Mon Jul 11 07:17:52 2016
New Revision: 302552
URL: https://svnweb.freebsd.org/changeset/base/302552

Log:
  Convert `svc_xprt_alloc(..)` and `svc_xprt_free(..)`'s prototypes to
  ANSI C style prototypes
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/rpc/svc.c

Modified: head/sys/rpc/svc.c
==
--- head/sys/rpc/svc.c  Mon Jul 11 07:07:15 2016(r302551)
+++ head/sys/rpc/svc.c  Mon Jul 11 07:17:52 2016(r302552)
@@ -841,7 +841,7 @@ svcerr_progvers(struct svc_req *rqstp, r
  * parameters.
  */
 SVCXPRT *
-svc_xprt_alloc()
+svc_xprt_alloc(void)
 {
SVCXPRT *xprt;
SVCXPRT_EXT *ext;
@@ -858,8 +858,7 @@ svc_xprt_alloc()
  * Free a server transport structure.
  */
 void
-svc_xprt_free(xprt)
-   SVCXPRT *xprt;
+svc_xprt_free(SVCXPRT *xprt)
 {
 
mem_free(xprt->xp_p3, sizeof(SVCXPRT_EXT));
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302551 - head/sys/rpc

2016-07-11 Thread Garrett Cooper

Author: ngie
Date: Mon Jul 11 07:07:15 2016
New Revision: 302551
URL: https://svnweb.freebsd.org/changeset/base/302551

Log:
  Deobfuscate cleanup path in clnt_vc_create(..)
  
  Similar to r300836, r301800, and r302550, cl and ct will always
  be non-NULL as they're allocated using the mem_alloc routines,
  which always use `malloc(..., M_WAITOK)`.
  
  MFC after: 1 week
  Reported by: Coverity
  CID: 1007342
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/rpc/clnt_vc.c

Modified: head/sys/rpc/clnt_vc.c
==
--- head/sys/rpc/clnt_vc.c  Mon Jul 11 06:58:24 2016(r302550)
+++ head/sys/rpc/clnt_vc.c  Mon Jul 11 07:07:15 2016(r302551)
@@ -270,12 +270,10 @@ clnt_vc_create(
return (cl);
 
 err:
-   if (ct) {
-   mtx_destroy(>ct_lock);
-   mem_free(ct, sizeof (struct ct_data));
-   }
-   if (cl)
-   mem_free(cl, sizeof (CLIENT));
+   mtx_destroy(>ct_lock);
+   mem_free(ct, sizeof (struct ct_data));
+   mem_free(cl, sizeof (CLIENT));
+
return ((CLIENT *)NULL);
 }
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302550 - head/sys/rpc

2016-07-11 Thread Garrett Cooper

Author: ngie
Date: Mon Jul 11 06:58:24 2016
New Revision: 302550
URL: https://svnweb.freebsd.org/changeset/base/302550

Log:
  Deobfuscate cleanup path in clnt_dg_create(..)
  
  Similar to r300836 and r301800, cl and cu will always be non-NULL as they're
  allocated using the mem_alloc routines, which always use
  `malloc(..., M_WAITOK)`.
  
  Deobfuscating the cleanup path fixes a leak where if cl was NULL and
  cu was not, cu would not be free'd, and also removes a duplicate test for
  cl not being NULL.
  
  MFC after: 1 week
  Reported by: Coverity
  CID: 1007033, 1007344
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/rpc/clnt_dg.c

Modified: head/sys/rpc/clnt_dg.c
==
--- head/sys/rpc/clnt_dg.c  Mon Jul 11 06:55:02 2016(r302549)
+++ head/sys/rpc/clnt_dg.c  Mon Jul 11 06:58:24 2016(r302550)
@@ -313,11 +313,9 @@ recheck_socket:
cl->cl_netid = NULL;
return (cl);
 err2:
-   if (cl) {
-   mem_free(cl, sizeof (CLIENT));
-   if (cu)
-   mem_free(cu, sizeof (*cu));
-   }
+   mem_free(cl, sizeof (CLIENT));
+   mem_free(cu, sizeof (*cu));
+
return (NULL);
 }
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302532 - head

2016-07-10 Thread Garrett Cooper

Author: ngie
Date: Sun Jul 10 20:42:18 2016
New Revision: 302532
URL: https://svnweb.freebsd.org/changeset/base/302532

Log:
  Correct OLD_LIBS change done in r298840
  
  libkvm.so lives in /lib, not /usr/lib
  
  MFC after: 3 days
  X-MFC note: ^/stable/11 only
  X-MFC with: r298840
  Submitted by: Herbert J. Skuhra 
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/ObsoleteFiles.inc

Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc  Sun Jul 10 20:22:04 2016(r302531)
+++ head/ObsoleteFiles.inc  Sun Jul 10 20:42:18 2016(r302532)
@@ -203,7 +203,7 @@ OLD_FILES+=usr/share/man/man9/rman_await
 # 20160517: ReiserFS removed
 OLD_FILES+=usr/share/man/man5/reiserfs.5.gz
 # 20160430: kvm_getfiles(3) removed from kvm(3)
-OLD_LIBS+=usr/lib/libkvm.so.6
+OLD_LIBS+=lib/libkvm.so.6
 OLD_FILES+=usr/share/man/man3/kvm_getfiles.3.gz
 # 20160423: remove mroute6d
 OLD_FILES+=etc/rc.d/mroute6d
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302438 - head/sys/conf

2016-07-08 Thread Garrett Cooper

Author: ngie
Date: Fri Jul  8 16:29:45 2016
New Revision: 302438
URL: https://svnweb.freebsd.org/changeset/base/302438

Log:
  Revert r302403
  
  lang/gcc{48,49,5} lacks -fformat-extensions support (causing build errors, 
which
  is what prompted r302403 to be committed). devel/amd64-gcc on the other hand
  (which is used by Jenkins), has the support.
  
  This fixes the Jenkins failure emails due to excessive warnings being produced
  with "make buildkernel".
  
  Discussed with: lwhsu
  Reported by: Jenkins (FreeBSD_HEAD_amd64_gcc job)
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/conf/kern.mk

Modified: head/sys/conf/kern.mk
==
--- head/sys/conf/kern.mk   Fri Jul  8 15:57:55 2016(r302437)
+++ head/sys/conf/kern.mk   Fri Jul  8 16:29:45 2016(r302438)
@@ -62,7 +62,7 @@ CWARNEXTRA?=  -Wno-uninitialized
 FORMAT_EXTENSIONS= -Wno-format
 .elif ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30600
 FORMAT_EXTENSIONS= -D__printf__=__freebsd_kprintf__
-.elif ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} == 40201
+.else
 FORMAT_EXTENSIONS= -fformat-extensions
 .endif
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302403 - head/sys/conf

2016-07-07 Thread Garrett Cooper

Author: ngie
Date: Thu Jul  7 22:44:23 2016
New Revision: 302403
URL: https://svnweb.freebsd.org/changeset/base/302403

Log:
  Do not use -fformat-extensions with non-base versions of gcc
  
  Ports versions of gcc do not have -fformat-extensions support.
  
  This unbreaks compiling the kernel/modules with non-base gcc (4.8,
  5.0, etc) if MK_FORMAT_EXTENSIONS=yes (the default).
  
  Approved by: re (gjb)
  Differential Revision: https://reviews.freebsd.org/D7150
  Reviewed by: bdrewery
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/conf/kern.mk

Modified: head/sys/conf/kern.mk
==
--- head/sys/conf/kern.mk   Thu Jul  7 22:10:10 2016(r302402)
+++ head/sys/conf/kern.mk   Thu Jul  7 22:44:23 2016(r302403)
@@ -62,7 +62,7 @@ CWARNEXTRA?=  -Wno-uninitialized
 FORMAT_EXTENSIONS= -Wno-format
 .elif ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30600
 FORMAT_EXTENSIONS= -D__printf__=__freebsd_kprintf__
-.else
+.elif ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} == 40201
 FORMAT_EXTENSIONS= -fformat-extensions
 .endif
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302373 - head/usr.sbin/bhyve

2016-07-06 Thread Garrett Cooper

Author: ngie
Date: Wed Jul  6 16:02:15 2016
New Revision: 302373
URL: https://svnweb.freebsd.org/changeset/base/302373

Log:
  Fix CTASSERT issue in a more clean way
  
  - Replace all CTASSERT macro instances with static_assert's.
  - Remove the WRAPPED_CTASSERT macro; it's now an unnecessary obfuscation.
  - Localize all static_assert's to the structures being tested.
  - Sort some headers per-style(9).
  
  Approved by: re (hrs)
  Differential Revision: https://reviews.freebsd.org/D7130
  MFC after: 1 week
  X-MFC with: r302364
  Reviewed by: ed, grehan (maintainer)
  Submitted by: ed
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/bhyve/bhyverun.h
  head/usr.sbin/bhyve/pci_emul.c
  head/usr.sbin/bhyve/pci_emul.h
  head/usr.sbin/bhyve/task_switch.c

Modified: head/usr.sbin/bhyve/bhyverun.h
==
--- head/usr.sbin/bhyve/bhyverun.h  Wed Jul  6 14:09:49 2016
(r302372)
+++ head/usr.sbin/bhyve/bhyverun.h  Wed Jul  6 16:02:15 2016
(r302373)
@@ -29,12 +29,6 @@
 #ifndef_FBSDRUN_H_
 #define_FBSDRUN_H_
 
-#ifndef CTASSERT   /* Allow lint to override */
-#defineCTASSERT(x) _CTASSERT(x, __LINE__)
-#define_CTASSERT(x, y) __CTASSERT(x, y)
-#define__CTASSERT(x, y)typedef char __assert ## y[(x) ? 1 : -1]
-#endif
-
 #defineVMEXIT_CONTINUE (0)
 #defineVMEXIT_ABORT(-1)
 

Modified: head/usr.sbin/bhyve/pci_emul.c
==
--- head/usr.sbin/bhyve/pci_emul.c  Wed Jul  6 14:09:49 2016
(r302372)
+++ head/usr.sbin/bhyve/pci_emul.c  Wed Jul  6 16:02:15 2016
(r302373)
@@ -31,9 +31,9 @@ __FBSDID("$FreeBSD$");
 
 #include 
 #include 
-#include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -755,16 +755,6 @@ pci_emul_init(struct vmctx *ctx, struct 
return (err);
 }
 
-#ifdef __GNU_C__
-#defineWRAPPED_CTASSERT(x) CTASSERT(x) __unused
-#else
-#defineWRAPPED_CTASSERT(x) CTASSERT(x)
-#endif
-
-WRAPPED_CTASSERT(sizeof(struct msicap) == 14);
-WRAPPED_CTASSERT(sizeof(struct msixcap) == 12);
-WRAPPED_CTASSERT(sizeof(struct pciecap) == 60);
-
 void
 pci_populate_msicap(struct msicap *msicap, int msgnum, int nextptr)
 {

Modified: head/usr.sbin/bhyve/pci_emul.h
==
--- head/usr.sbin/bhyve/pci_emul.h  Wed Jul  6 14:09:49 2016
(r302372)
+++ head/usr.sbin/bhyve/pci_emul.h  Wed Jul  6 16:02:15 2016
(r302373)
@@ -160,6 +160,7 @@ struct msicap {
uint32_taddrhi;
uint16_tmsgdata;
 } __packed;
+static_assert(sizeof(struct msicap) == 14, "compile-time assertion failed");
 
 struct msixcap {
uint8_t capid;
@@ -168,6 +169,7 @@ struct msixcap {
uint32_ttable_info; /* bar index and offset within it */
uint32_tpba_info;   /* bar index and offset within it */
 } __packed;
+static_assert(sizeof(struct msixcap) == 12, "compile-time assertion failed");
 
 struct pciecap {
uint8_t capid;
@@ -202,6 +204,7 @@ struct pciecap {
uint16_tslot_control2;
uint16_tslot_status2;
 } __packed;
+static_assert(sizeof(struct pciecap) == 60, "compile-time assertion failed");
 
 typedef void (*pci_lintr_cb)(int b, int s, int pin, int pirq_pin,
 int ioapic_irq, void *arg);

Modified: head/usr.sbin/bhyve/task_switch.c
==
--- head/usr.sbin/bhyve/task_switch.c   Wed Jul  6 14:09:49 2016
(r302372)
+++ head/usr.sbin/bhyve/task_switch.c   Wed Jul  6 16:02:15 2016
(r302373)
@@ -37,11 +37,11 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
+#include 
+#include 
 #include 
 #include 
 #include 
-#include 
-#include 
 
 #include 
 
@@ -91,7 +91,7 @@ struct tss32 {
uint16_ttss_trap;
uint16_ttss_iomap;
 };
-CTASSERT(sizeof(struct tss32) == 104);
+static_assert(sizeof(struct tss32) == 104, "compile-time assertion failed");
 
 #defineSEL_START(sel)  (((sel) & ~0x7))
 #defineSEL_LIMIT(sel)  (((sel) | 0x7))
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302369 - head/usr.sbin/bhyve

2016-07-05 Thread Garrett Cooper

Author: ngie
Date: Wed Jul  6 05:17:56 2016
New Revision: 302369
URL: https://svnweb.freebsd.org/changeset/base/302369

Log:
  Fix gcc warning
  
  Remove -Wunused-but-set-variable (`mopt`).
  
  Approved by: re (gjb)
  Differential Revision: https://reviews.freebsd.org/D7119
  MFC after: 1 week
  X-MFC with: r302332
  Reported by: Jenkins
  Reviewed by: grehan (maintainer)
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/bhyve/usb_mouse.c

Modified: head/usr.sbin/bhyve/usb_mouse.c
==
--- head/usr.sbin/bhyve/usb_mouse.c Wed Jul  6 05:17:07 2016
(r302368)
+++ head/usr.sbin/bhyve/usb_mouse.c Wed Jul  6 05:17:56 2016
(r302369)
@@ -297,9 +297,6 @@ static void *
 umouse_init(struct usb_hci *hci, char *opt)
 {
struct umouse_softc *sc;
-   char *mopt;
-
-   mopt = opt;
 
sc = calloc(1, sizeof(struct umouse_softc));
sc->hci = hci;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302368 - head/usr.sbin/bhyve

2016-07-05 Thread Garrett Cooper

Author: ngie
Date: Wed Jul  6 05:17:07 2016
New Revision: 302368
URL: https://svnweb.freebsd.org/changeset/base/302368

Log:
  Fix gcc build errors with SSE 4.2 detection and gcc warnings
  
  - Remove -Wunused-but-set-variable's (`len`, etc).
  - Replace clang-specific tests in sse42_supported(..) with generic,
FreeBSD-supported CPU feature tests, using macros and functions
from machine/cpufunc.h and machine/specialreg.h . The previous method
for determining SSE4.2 availability was only compatible with clang.
  - Sort #includes per style(9).
  
  Approved by: re (gjb)
  Differential Revision: https://reviews.freebsd.org/D7119
  MFC after: 1 week
  X-MFC with: r302332
  Reported by: Jenkins
  Reviewed by: grehan (maintainer)
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/bhyve/rfb.c

Modified: head/usr.sbin/bhyve/rfb.c
==
--- head/usr.sbin/bhyve/rfb.c   Wed Jul  6 05:11:39 2016(r302367)
+++ head/usr.sbin/bhyve/rfb.c   Wed Jul  6 05:17:07 2016(r302368)
@@ -28,12 +28,14 @@
 #include 
 __FBSDID("$FreeBSD$");
 
+#include 
 #include 
-#include 
 #include 
-#include 
-#include 
+#include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -46,7 +48,6 @@ __FBSDID("$FreeBSD$");
 #include 
 
 #include 
-#include 
 
 #include "bhyvegc.h"
 #include "console.h"
@@ -177,7 +178,6 @@ rfb_send_server_init_msg(int cfd)
 {
struct bhyvegc_image *gc_image;
struct rfb_srvr_info sinfo;
-   int len;
 
gc_image = console_get_image();
 
@@ -194,8 +194,8 @@ rfb_send_server_init_msg(int cfd)
sinfo.pixfmt.green_shift = 8;
sinfo.pixfmt.blue_shift = 0;
sinfo.namelen = htonl(strlen("bhyve"));
-   len = stream_write(cfd, , sizeof(sinfo));
-   len = stream_write(cfd, "bhyve", strlen("bhyve"));
+   (void)stream_write(cfd, , sizeof(sinfo));
+   (void)stream_write(cfd, "bhyve", strlen("bhyve"));
 }
 
 static void
@@ -223,9 +223,8 @@ static void
 rfb_recv_set_pixfmt_msg(struct rfb_softc *rc, int cfd)
 {
struct rfb_pixfmt_msg pixfmt_msg;
-   int len;
 
-   len = stream_read(cfd, ((void *)_msg)+1, sizeof(pixfmt_msg)-1);
+   (void)stream_read(cfd, ((void *)_msg)+1, sizeof(pixfmt_msg)-1);
 }
 
 
@@ -233,14 +232,14 @@ static void
 rfb_recv_set_encodings_msg(struct rfb_softc *rc, int cfd)
 {
struct rfb_enc_msg enc_msg;
-   int len, i;
+   int i;
uint32_t encoding;
 
assert((sizeof(enc_msg) - 1) == 3);
-   len = stream_read(cfd, ((void *)_msg)+1, sizeof(enc_msg)-1);
+   (void)stream_read(cfd, ((void *)_msg)+1, sizeof(enc_msg)-1);
 
for (i = 0; i < htons(enc_msg.numencs); i++) {
-   len = stream_read(cfd, , sizeof(encoding));
+   (void)stream_read(cfd, , sizeof(encoding));
switch (htonl(encoding)) {
case RFB_ENCODING_RAW:
rc->enc_raw_ok = true;
@@ -256,27 +255,6 @@ rfb_recv_set_encodings_msg(struct rfb_so
}
 }
 
-static void
-rfb_resize_update(struct rfb_softc *rc, int fd)
-{
-   struct rfb_srvr_updt_msg supdt_msg;
-struct rfb_srvr_rect_hdr srect_hdr;
-
-   /* Number of rectangles: 1 */
-   supdt_msg.type = 0;
-   supdt_msg.pad = 0;
-   supdt_msg.numrects = htons(1);
-   stream_write(fd, _msg, sizeof(struct rfb_srvr_updt_msg));
-
-   /* Rectangle header */
-   srect_hdr.x = htons(0);
-   srect_hdr.y = htons(0);
-   srect_hdr.width = htons(rc->width);
-   srect_hdr.height = htons(rc->height);
-   srect_hdr.encoding = htonl(RFB_ENCODING_RESIZE);
-   stream_write(fd, _hdr, sizeof(struct rfb_srvr_rect_hdr));
-}
-
 /*
  * Calculate CRC32 using SSE4.2; Intel or AMD Bulldozer+ CPUs only
  */
@@ -636,9 +614,8 @@ rfb_recv_update_msg(struct rfb_softc *rc
 {
struct rfb_updt_msg updt_msg;
struct bhyvegc_image *gc_image;
-   int len;
 
-   len = stream_read(cfd, ((void *)_msg) + 1 , sizeof(updt_msg) - 1);
+   (void)stream_read(cfd, ((void *)_msg) + 1 , sizeof(updt_msg) - 1);
 
console_refresh();
gc_image = console_get_image();
@@ -666,9 +643,8 @@ static void
 rfb_recv_key_msg(struct rfb_softc *rc, int cfd)
 {
struct rfb_key_msg key_msg;
-   int len;
 
-   len = stream_read(cfd, ((void *)_msg) + 1, sizeof(key_msg) - 1);
+   (void)stream_read(cfd, ((void *)_msg) + 1, sizeof(key_msg) - 1);
 
console_key_event(key_msg.down, htonl(key_msg.code));
 }
@@ -677,9 +653,8 @@ static void
 rfb_recv_ptr_msg(struct rfb_softc *rc, int cfd)
 {
struct rfb_ptr_msg ptr_msg;
-   int len;
 
-   len = stream_read(cfd, ((void *)_msg) + 1, sizeof(ptr_msg) - 1);
+   (void)stream_read(cfd, ((void *)_msg) + 1, sizeof(ptr_msg) - 1);
 
console_ptr_event(ptr_msg.button, htons(ptr_msg.x), htons(ptr_msg.y));
 }
@@ -876,13 +851,15 @@ rfb_thr(void *arg)
 }
 
 static int

svn commit: r302367 - head/usr.sbin/bhyve

2016-07-05 Thread Garrett Cooper

Author: ngie
Date: Wed Jul  6 05:11:39 2016
New Revision: 302367
URL: https://svnweb.freebsd.org/changeset/base/302367

Log:
  Fix gcc warnings
  
  Remove unused function (`fifo_available`)
  
  Approved by: re (gjb)
  Differential Revision: https://reviews.freebsd.org/D7119
  MFC after: 1 week
  X-MFC with: r302332
  Reported by: Jenkins
  Reviewed by: grehan (maintainer)
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/bhyve/ps2kbd.c

Modified: head/usr.sbin/bhyve/ps2kbd.c
==
--- head/usr.sbin/bhyve/ps2kbd.cWed Jul  6 05:09:13 2016
(r302366)
+++ head/usr.sbin/bhyve/ps2kbd.cWed Jul  6 05:11:39 2016
(r302367)
@@ -93,15 +93,6 @@ fifo_reset(struct ps2kbd_softc *sc)
fifo->size = sizeof(((struct fifo *)0)->buf);
 }
 
-static int
-fifo_available(struct ps2kbd_softc *sc)
-{
-   struct fifo *fifo;
-
-   fifo = >fifo;
-   return (fifo->num < fifo->size);
-}
-
 static void
 fifo_put(struct ps2kbd_softc *sc, uint8_t val)
 {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302366 - head/usr.sbin/bhyve

2016-07-05 Thread Garrett Cooper

Author: ngie
Date: Wed Jul  6 05:09:13 2016
New Revision: 302366
URL: https://svnweb.freebsd.org/changeset/base/302366

Log:
  Fix gcc warnings
  
  - Put parentheses around bitwise OR'ed values in the `FIELD_COPY(..)` and
`FIELD_REPLACE(..)` macros to mute warning from gcc 4.2.1.
  - Remove -Wunused-but-set-variable's (`setup_addr`, `status_addr`).
  
  Approved by: re (gjb)
  Differential Revision: https://reviews.freebsd.org/D7119
  MFC after: 1 week
  X-MFC with: r302332
  Reported by: Jenkins
  Reviewed by: grehan (maintainer)
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/bhyve/pci_xhci.c

Modified: head/usr.sbin/bhyve/pci_xhci.c
==
--- head/usr.sbin/bhyve/pci_xhci.c  Wed Jul  6 05:05:03 2016
(r302365)
+++ head/usr.sbin/bhyve/pci_xhci.c  Wed Jul  6 05:09:13 2016
(r302366)
@@ -143,10 +143,10 @@ static int xhci_debug = 0;
 #defineMASK_64_HI(x)   ((x) & ~0xULL)
 #defineMASK_64_LO(x)   ((x) & 0xULL)
 
-#defineFIELD_REPLACE(a,b,m,s)  ((a) & ~((m) << (s)) | \
-   ((b) & (m)) << (s))
-#defineFIELD_COPY(a,b,m,s) ((a) & ~((m) << (s)) | \
-   ((b) & ((m) << (s
+#defineFIELD_REPLACE(a,b,m,s)  (((a) & ~((m) << (s))) | \
+   (((b) & (m)) << (s)))
+#defineFIELD_COPY(a,b,m,s) (((a) & ~((m) << (s))) | \
+   (((b) & ((m) << (s)
 
 struct pci_xhci_trb_ring {
uint64_t ringaddr;  /* current dequeue guest address */
@@ -1700,7 +1700,7 @@ pci_xhci_handle_transfer(struct pci_xhci
struct xhci_trb *setup_trb;
struct usb_data_xfer *xfer;
struct usb_data_xfer_block *xfer_block;
-   uint64_tval, setup_addr, status_addr;
+   uint64_tval;
uint32_ttrbflags;
int do_intr, err;
int do_retry;
@@ -1718,8 +1718,6 @@ retry:
do_retry = 0;
do_intr = 0;
setup_trb = NULL;
-   setup_addr = 0;
-   status_addr = 0;
 
while (1) {
pci_xhci_dump_trb(trb);
@@ -1754,7 +1752,6 @@ retry:
goto errout;
}
setup_trb = trb;
-   setup_addr = addr;
 
val = trb->qwTrb0;
if (!xfer->ureq)
@@ -1786,7 +1783,6 @@ retry:
break;
 
case XHCI_TRB_TYPE_STATUS_STAGE:
-   status_addr = addr;
xfer_block = usb_data_xfer_append(xfer, NULL, 0,
  (void *)addr, ccs);
break;
@@ -1842,7 +1838,6 @@ retry:
err = USB_ERR_NOT_STARTED;
if (dev->dev_ue->ue_request != NULL)
err = dev->dev_ue->ue_request(dev->dev_sc, xfer);
-   status_addr = 0;
setup_trb = NULL;
} else {
/* handle data transfer */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302365 - head/usr.sbin/bhyve

2016-07-05 Thread Garrett Cooper

Author: ngie
Date: Wed Jul  6 05:05:03 2016
New Revision: 302365
URL: https://svnweb.freebsd.org/changeset/base/302365

Log:
  Fix gcc warnings
  
  Remove -Wunused-but-set-variable (`error`). Cast calls with
  `(void)` to note that the return value is explicitly ignored.
  
  Approved by: re (gjb)
  Differential Revision: https://reviews.freebsd.org/D7119
  MFC after: 1 week
  Reported by: Jenkins
  Reviewed by: grehan (maintainer)
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/bhyve/pci_passthru.c

Modified: head/usr.sbin/bhyve/pci_passthru.c
==
--- head/usr.sbin/bhyve/pci_passthru.c  Wed Jul  6 05:02:59 2016
(r302364)
+++ head/usr.sbin/bhyve/pci_passthru.c  Wed Jul  6 05:05:03 2016
(r302365)
@@ -361,7 +361,7 @@ msix_table_write(struct vmctx *ctx, int 
uint64_t *dest64;
size_t entry_offset;
uint32_t vector_control;
-   int error, index;
+   int index;
 
pi = sc->psc_pi;
if (offset >= pi->pi_msix.pba_offset &&
@@ -416,8 +416,8 @@ msix_table_write(struct vmctx *ctx, int 
/* If the entry is masked, don't set it up */
if ((entry->vector_control & PCIM_MSIX_VCTRL_MASK) == 0 ||
(vector_control & PCIM_MSIX_VCTRL_MASK) == 0) {
-   error = vm_setup_pptdev_msix(ctx, vcpu,
-   sc->psc_sel.pc_bus, sc->psc_sel.pc_dev, 
+   (void)vm_setup_pptdev_msix(ctx, vcpu,
+   sc->psc_sel.pc_bus, sc->psc_sel.pc_dev,
sc->psc_sel.pc_func, index, entry->addr,
entry->msg_data, entry->vector_control);
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302364 - head/usr.sbin/bhyve

2016-07-05 Thread Garrett Cooper

Author: ngie
Date: Wed Jul  6 05:02:59 2016
New Revision: 302364
URL: https://svnweb.freebsd.org/changeset/base/302364

Log:
  Fix gcc warnings
  
  Add `WRAPPED_CTASSERT` macro by annotating CTASSERTs with __unused
  to deal with -Wunused-local-typedefs warnings from gcc 4.8+.
  All other compilers (clang, etc) use CTASSERT as-is. A more generic
  solution for this issue will be proposed after ^/stable/11 is forked.
  
  Consolidate all CTASSERTs under one block instead of inlining them in
  functions.
  
  Approved by: re (gjb)
  Differential Revision: https://reviews.freebsd.org/D7119
  MFC after: 1 week
  Reported by: Jenkins
  Reviewed by: grehan (maintainer)
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/bhyve/pci_emul.c

Modified: head/usr.sbin/bhyve/pci_emul.c
==
--- head/usr.sbin/bhyve/pci_emul.c  Wed Jul  6 04:58:42 2016
(r302363)
+++ head/usr.sbin/bhyve/pci_emul.c  Wed Jul  6 05:02:59 2016
(r302364)
@@ -755,13 +755,21 @@ pci_emul_init(struct vmctx *ctx, struct 
return (err);
 }
 
+#ifdef __GNU_C__
+#defineWRAPPED_CTASSERT(x) CTASSERT(x) __unused
+#else
+#defineWRAPPED_CTASSERT(x) CTASSERT(x)
+#endif
+
+WRAPPED_CTASSERT(sizeof(struct msicap) == 14);
+WRAPPED_CTASSERT(sizeof(struct msixcap) == 12);
+WRAPPED_CTASSERT(sizeof(struct pciecap) == 60);
+
 void
 pci_populate_msicap(struct msicap *msicap, int msgnum, int nextptr)
 {
int mmc;
 
-   CTASSERT(sizeof(struct msicap) == 14);
-
/* Number of msi messages must be a power of 2 between 1 and 32 */
assert((msgnum & (msgnum - 1)) == 0 && msgnum >= 1 && msgnum <= 32);
mmc = ffs(msgnum) - 1;
@@ -786,7 +794,6 @@ static void
 pci_populate_msixcap(struct msixcap *msixcap, int msgnum, int barnum,
 uint32_t msix_tab_size)
 {
-   CTASSERT(sizeof(struct msixcap) == 12);
 
assert(msix_tab_size % 4096 == 0);
 
@@ -937,8 +944,6 @@ pci_emul_add_pciecap(struct pci_devinst 
int err;
struct pciecap pciecap;
 
-   CTASSERT(sizeof(struct pciecap) == 60);
-
if (type != PCIEM_TYPE_ROOT_PORT)
return (-1);
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302363 - head/usr.sbin/bhyve

2016-07-05 Thread Garrett Cooper

Author: ngie
Date: Wed Jul  6 04:58:42 2016
New Revision: 302363
URL: https://svnweb.freebsd.org/changeset/base/302363

Log:
  Fix gcc warnings
  
  Put cfl/prdt under AHCI_DEBUG #defines as they are only used in
  those cases.
  
  Approved by: re (gjb)
  Differential Revision: https://reviews.freebsd.org/D7119
  MFC after: 1 week
  Reported by: Jenkins
  Reviewed by: grehan (maintainer)
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/bhyve/pci_ahci.c

Modified: head/usr.sbin/bhyve/pci_ahci.c
==
--- head/usr.sbin/bhyve/pci_ahci.c  Wed Jul  6 04:56:45 2016
(r302362)
+++ head/usr.sbin/bhyve/pci_ahci.c  Wed Jul  6 04:58:42 2016
(r302363)
@@ -1717,19 +1717,25 @@ static void
 ahci_handle_slot(struct ahci_port *p, int slot)
 {
struct ahci_cmd_hdr *hdr;
+#ifdef AHCI_DEBUG
struct ahci_prdt_entry *prdt;
+#endif
struct pci_ahci_softc *sc;
uint8_t *cfis;
+#ifdef AHCI_DEBUG
int cfl;
+#endif
 
sc = p->pr_sc;
hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE);
+#ifdef AHCI_DEBUG
cfl = (hdr->flags & 0x1f) * 4;
+#endif
cfis = paddr_guest2host(ahci_ctx(sc), hdr->ctba,
0x80 + hdr->prdtl * sizeof(struct ahci_prdt_entry));
+#ifdef AHCI_DEBUG
prdt = (struct ahci_prdt_entry *)(cfis + 0x80);
 
-#ifdef AHCI_DEBUG
DPRINTF("\ncfis:");
for (i = 0; i < cfl; i++) {
if (i % 10 == 0)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302362 - head/usr.sbin/bhyve

2016-07-05 Thread Garrett Cooper

Author: ngie
Date: Wed Jul  6 04:56:45 2016
New Revision: 302362
URL: https://svnweb.freebsd.org/changeset/base/302362

Log:
  Fix gcc warnings
  
  - Remove -Wunused-but-set-variable (newcpu)
  - Always return VMEXIT_CONTINUE as the code always set retval to that value.
  
  Approved by: re (gjb)
  Differential Revision: https://reviews.freebsd.org/D7119
  MFC after: 1 week
  Reported by: Jenkins
  Reviewed by: grehan (maintainer)
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/bhyve/bhyverun.c

Modified: head/usr.sbin/bhyve/bhyverun.c
==
--- head/usr.sbin/bhyve/bhyverun.c  Wed Jul  6 03:23:07 2016
(r302361)
+++ head/usr.sbin/bhyve/bhyverun.c  Wed Jul  6 04:56:45 2016
(r302362)
@@ -388,13 +388,11 @@ vmexit_wrmsr(struct vmctx *ctx, struct v
 static int
 vmexit_spinup_ap(struct vmctx *ctx, struct vm_exit *vme, int *pvcpu)
 {
-   int newcpu;
-   int retval = VMEXIT_CONTINUE;
 
-   newcpu = spinup_ap(ctx, *pvcpu,
-  vme->u.spinup_ap.vcpu, vme->u.spinup_ap.rip);
+   (void)spinup_ap(ctx, *pvcpu,
+   vme->u.spinup_ap.vcpu, vme->u.spinup_ap.rip);
 
-   return (retval);
+   return (VMEXIT_CONTINUE);
 }
 
 #defineDEBUG_EPT_MISCONFIG
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302330 - head/tools/build/mk

2016-07-03 Thread Garrett Cooper

Author: ngie
Date: Sun Jul  3 18:27:00 2016
New Revision: 302330
URL: https://svnweb.freebsd.org/changeset/base/302330

Log:
  Remove ftp(1) related files when MK_FTP == no
  
  Approved by: re (gjb)
  Differential Revision: https://reviews.freebsd.org/D6969
  MFC after: 1 week
  Reviewed by: ngie
  Submitted by: rakuco
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc   Sun Jul  3 18:21:11 
2016(r302329)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc   Sun Jul  3 18:27:00 
2016(r302330)
@@ -1345,6 +1345,20 @@ OLD_FILES+=usr/sbin/fmtree
 OLD_FILES+=usr/share/man/man8/fmtree.8.gz
 .endif
 
+.if ${MK_FTP} == no
+OLD_FILES+=etc/ftpusers
+OLD_FILES+=etc/rc.d/ftpd
+OLD_FILES+=usr/bin/ftp
+OLD_FILES+=usr/bin/gate-ftp
+OLD_FILES+=usr/bin/pftp
+OLD_FILES+=usr/libexec/ftpd
+OLD_FILES+=usr/share/man/man1/ftp.1.gz
+OLD_FILES+=usr/share/man/man1/gate-ftp.1.gz
+OLD_FILES+=usr/share/man/man1/pftp.1.gz
+OLD_FILES+=usr/share/man/man5/ftpchroot.5.gz
+OLD_FILES+=usr/share/man/man8/ftpd.8.gz
+.endif
+
 .if ${MK_GNUCXX} == no
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/include/c++/4.2/algorithm
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302327 - head/usr.bin/lastcomm/tests

2016-07-03 Thread Garrett Cooper

Author: ngie
Date: Sun Jul  3 17:52:21 2016
New Revision: 302327
URL: https://svnweb.freebsd.org/changeset/base/302327

Log:
  Fix .../usr.bin/lastcomm/legacy_test:main on i386
  
  The time in the output files was ahead by 3 hours on i386. Fix the incorrect
  offset.
  
  Differential Revision: https://reviews.freebsd.org/D7079 (as part of a larger 
diff)
  MFC after: 1 week
  PR: 210329
  Reported by: asomers
  Approved by: re (gjb)
  Reviewed by: cem
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.bin/lastcomm/tests/v1-i386.out
  head/usr.bin/lastcomm/tests/v2-i386.out

Modified: head/usr.bin/lastcomm/tests/v1-i386.out
==
--- head/usr.bin/lastcomm/tests/v1-i386.out Sun Jul  3 17:51:24 2016
(r302326)
+++ head/usr.bin/lastcomm/tests/v1-i386.out Sun Jul  3 17:52:21 2016
(r302327)
@@ -1,28 +1,28 @@
-core -FDX root  0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 11:34
-core -DX root  0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 11:34
-cc - root  0.000 secs 0.000 us 0.000 sy 0.469 es Fri May 18 11:34
-ld - root  0.000 secs 0.000 us 0.000 sy 0.109 es Fri May 18 11:34
-as - root  0.000 secs 0.000 us 0.000 sy 0.047 es Fri May 18 11:34
-cc1 - root  0.016 secs 0.016 us 0.000 sy 0.203 es Fri May 18 11:34
-time - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34
-1234567890123456 - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34
-ln - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34
-time - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34
-1234567890123456 - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34
-ln - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34
-time - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34
-123456789012345 - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34
-ln - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34
-time - root  0.000 secs 0.000 us 0.000 sy 0.359 es Fri May 18 11:34
-diff - root  0.312 secs 0.297 us 0.016 sy 0.359 es Fri May 18 11:34
-time - root  0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 11:34
-dd - root  0.016 secs 0.000 us 0.016 sy 0.031 es Fri May 18 11:34
-time - root  0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 11:34
-sleep - root  0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 11:34
-time - root  0.000 secs 0.000 us 0.000 sy 3.406 es Fri May 18 11:34
-find - root  0.266 secs 0.062 us 0.203 sy 3.406 es Fri May 18 11:34
-time - root  0.000 secs 0.000 us 0.000 sy 5.047 es Fri May 18 11:33
-egrep - root  4.984 secs 4.984 us 0.000 sy 5.047 es Fri May 18 11:33
-time - root  0.000 secs 0.000 us 0.000 sy 0.484 es Fri May 18 11:33
-awk - root  0.453 secs 0.453 us 0.000 sy 0.453 es Fri May 18 11:33
-accton - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:33
+core -FDX root  0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 08:34
+core -DX root  0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 08:34
+cc - root  0.000 secs 0.000 us 0.000 sy 0.469 es Fri May 18 08:34
+ld - root  0.000 secs 0.000 us 0.000 sy 0.109 es Fri May 18 08:34
+as - root  0.000 secs 0.000 us 0.000 sy 0.047 es Fri May 18 08:34
+cc1 - root  0.016 secs 0.016 us 0.000 sy 0.203 es Fri May 18 08:34
+time - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34
+1234567890123456 - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34
+ln - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34
+time - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34
+1234567890123456 - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34
+ln - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34
+time - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34
+123456789012345 - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34
+ln - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34
+time - root  0.000 secs 0.000 us 0.000 sy 0.359 es Fri May 18 08:34
+diff - root  0.312 secs 0.297 us 0.016 sy 0.359 es Fri May 18 08:34
+time - root  0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 08:34
+dd - root  0.016 secs 0.000 us 0.016 sy 0.031 es Fri May 18 08:34
+time - root  0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 08:34
+sleep - root  0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 08:34
+time - root  0.000 secs 0.000 us 0.000 sy 3.406 es Fri May 18 08:34
+find - root  0.266 secs 0.062 us 0.203 sy 3.406 es Fri May 18 08:34
+time - root  0.000 secs 0.000 us 0.000 sy 5.047 es Fri May 18 08:33
+egrep - root  4.984 secs 4.984 us 0.000 sy 5.047 es Fri May 18 08:33
+time - root  0.000 secs 0.000 us 0.000 sy 0.484 es Fri May 18 08:33
+awk - root  0.453 secs 0.453 us 0.000 sy 0.453 es Fri May 18 08:33
+accton - root  0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:33

Modified: head/usr.bin/lastcomm/tests/v2-i386.out
==
---

svn commit: r302326 - head/usr.bin/lastcomm/tests

2016-07-03 Thread Garrett Cooper

Author: ngie
Date: Sun Jul  3 17:51:24 2016
New Revision: 302326
URL: https://svnweb.freebsd.org/changeset/base/302326

Log:
  Output the diffs to standard error when comparing the expected vs the
  obtained output from lastcomm instead of just printing out a summary, e.g.
  "they differed".
  
  This will make failures with results more apparent when running kyua debug,
  kyua report-html, etc.
  
  Differential Revision: https://reviews.freebsd.org/D7079 (as part of a larger 
diff)
  MFC after: 1 week
  Approved by: re (gjb)
  Reviewed by: cem
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.bin/lastcomm/tests/legacy_test.sh

Modified: head/usr.bin/lastcomm/tests/legacy_test.sh
==
--- head/usr.bin/lastcomm/tests/legacy_test.sh  Sun Jul  3 17:28:39 2016
(r302325)
+++ head/usr.bin/lastcomm/tests/legacy_test.sh  Sun Jul  3 17:51:24 2016
(r302326)
@@ -14,7 +14,7 @@ check()
shift
# Remove tty field, which varies between systems.
awk '{$4 = ""; print}' |
-   if diff -q - $1
+   if diff -a - $1 >&2
then
echo "ok $NUM"
else
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r302321 - in head/contrib/libxo: . tests/core

2016-07-02 Thread Garrett Cooper

Author: ngie
Date: Sun Jul  3 01:35:27 2016
New Revision: 302321
URL: https://svnweb.freebsd.org/changeset/base/302321

Log:
  Update libxo to 0.6.3
  
  This fixes the 02 testcases on i386 (at least), and may fix the testcases
  in general on 32-bit platforms
  
  Differential Revision: https://reviews.freebsd.org/D7052
  Approved by: phil (maintainer)
  Approved by: re (gjb)
  Reported by: asomers
  Reviewed by: phil
  Submitted by: phil
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/contrib/libxo/configure.ac
  head/contrib/libxo/tests/core/test_02.c
Directory Properties:
  head/contrib/libxo/   (props changed)

Modified: head/contrib/libxo/configure.ac
==
--- head/contrib/libxo/configure.ac Sun Jul  3 01:23:38 2016
(r302320)
+++ head/contrib/libxo/configure.ac Sun Jul  3 01:35:27 2016
(r302321)
@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libxo], [0.6.2], [p...@juniper.net])
+AC_INIT([libxo], [0.6.3], [p...@juniper.net])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.

Modified: head/contrib/libxo/tests/core/test_02.c
==
--- head/contrib/libxo/tests/core/test_02.c Sun Jul  3 01:23:38 2016
(r302320)
+++ head/contrib/libxo/tests/core/test_02.c Sun Jul  3 01:35:27 2016
(r302321)
@@ -70,7 +70,7 @@ main (int argc, char **argv)
 
 xo_emit(" {:lines/%7ju} {:words/%7ju} "
 "{:characters/%7ju} {d:filename/%s}\n",
-20, 30, 40, "file");
+(uintmax_t) 20, (uintmax_t) 30, (uintmax_t) 40, "file");
 
 int i;
 for (i = 0; i < 5; i++)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r301871 - head/usr.sbin/rpc.lockd

2016-06-13 Thread Garrett Cooper

Author: ngie
Date: Mon Jun 13 11:19:06 2016
New Revision: 301871
URL: https://svnweb.freebsd.org/changeset/base/301871

Log:
  Add missing break in lock_partialfilelock(..) with NFS_RESERR
  
  This will help ensure that the right error is trickled up when the
  function is called if the lock status is NFS_RESERR
  
  Differential Revision: https://reviews.freebsd.org/D6622
  Reviewed by: rmacklem
  Approved by: re (gjb)
  Tested with: fsx; svn info/svnversion (uses bdb locking); locktests from Bull 
http://nfsv4.bullopensource.org/tools/tests/locktest.php
  MFC after: 2 weeks
  Reported by: Coverity
  CID: 1008161, 1304956
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/rpc.lockd/lockd_lock.c

Modified: head/usr.sbin/rpc.lockd/lockd_lock.c
==
--- head/usr.sbin/rpc.lockd/lockd_lock.cMon Jun 13 10:53:34 2016
(r301870)
+++ head/usr.sbin/rpc.lockd/lockd_lock.cMon Jun 13 11:19:06 2016
(r301871)
@@ -1426,6 +1426,7 @@ lock_partialfilelock(struct file_lock *f
break;
case NFS_RESERR:
retval = PFL_NFSRESERR;
+   break;
default:
debuglog("Unmatched lnlstatus %d\n");
retval = PFL_NFSDENIED_NOLOCK;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r301869 - in head: share/misc usr.bin/calendar/calendars usr.sbin/sysrc

2016-06-13 Thread Garrett Cooper

Author: ngie
Date: Mon Jun 13 10:35:11 2016
New Revision: 301869
URL: https://svnweb.freebsd.org/changeset/base/301869

Log:
  Change my given name from "Garrett" to "Ngie"
  
  A legal name change from "Garrett" to "Ngie", as well as a FreeBSD
  account name change, is pending.
  
  Approved by: re (hrs)

Modified:
  head/share/misc/committers-src.dot
  head/usr.bin/calendar/calendars/calendar.freebsd
  head/usr.sbin/sysrc/sysrc.8
Directory Properties:
  head/   (props changed)

Modified: head/share/misc/committers-src.dot
==
--- head/share/misc/committers-src.dot  Mon Jun 13 10:30:49 2016
(r301868)
+++ head/share/misc/committers-src.dot  Mon Jun 13 10:35:11 2016
(r301869)
@@ -244,7 +244,7 @@ mp [label="Mark Peek\n...@freebsd.org\n20
 mr [label="Michael Reifenberger\n...@freebsd.org\n2001/09/30"]
 neel [label="Neel Natu\nn...@freebsd.org\n2009/09/20"]
 netchild [label="Alexander Leidinger\nnetch...@freebsd.org\n2005/03/31"]
-ngie [label="Garrett Cooper\nn...@freebsd.org\n2014/07/27"]
+ngie [label="Ngie Cooper\nn...@freebsd.org\n2014/07/27"]
 nork [label="Norikatsu Shigemura\nn...@freebsd.org\n2009/06/09"]
 np [label="Navdeep Parhar\n...@freebsd.org\n2009/06/05"]
 nwhitehorn [label="Nathan Whitehorn\nnwhiteh...@freebsd.org\n2008/07/03"]

Modified: head/usr.bin/calendar/calendars/calendar.freebsd
==
--- head/usr.bin/calendar/calendars/calendar.freebsdMon Jun 13 10:30:49 
2016(r301868)
+++ head/usr.bin/calendar/calendars/calendar.freebsdMon Jun 13 10:35:11 
2016(r301869)
@@ -36,7 +36,7 @@
 01/26  Andrew Gallatin <galla...@freebsd.org> born in Buffalo, New York, 
United States, 1970
 01/27  Nick Sayer <nsa...@freebsd.org> born in San Diego, California, United 
States, 1968
 01/27  Jacques Anthony Vidrine <nec...@freebsd.org> born in Baton Rouge, 
Louisiana, United States, 1971
-01/27  Garrett Cooper <n...@freebsd.org> born in Seattle, Washington, United 
States, 1984
+01/27  Ngie Cooper <n...@freebsd.org> born in Seattle, Washington, United 
States, 1984
 01/31  Hidetoshi Shimokawa <simok...@freebsd.org> born in Yokohama, Kanagawa, 
Japan, 1970
 02/01  Doug Rabson <d...@freebsd.org> born in London, England, 1966
 02/01  Nicola Vitale <ni...@freebsd.org> born in Busto Arsizio, Varese, Italy, 
1976

Modified: head/usr.sbin/sysrc/sysrc.8
==
--- head/usr.sbin/sysrc/sysrc.8 Mon Jun 13 10:30:49 2016(r301868)
+++ head/usr.sbin/sysrc/sysrc.8 Mon Jun 13 10:35:11 2016(r301869)
@@ -480,6 +480,6 @@ utility first appeared in
 .Sh AUTHORS
 .An Devin Teske Aq Mt dte...@freebsd.org
 .Sh THANKS TO
-Brandon Gooch, Garrett Cooper, Julian Elischer, Pawel Jakub Dawidek,
+Brandon Gooch, Ngie Cooper, Julian Elischer, Pawel Jakub Dawidek,
 Cyrille Lefevre, Ross West, Stefan Esser, Marco Steinbach, Jilles Tjoelker,
 Allan Jude, and Lars Engels for suggestions, help, and testing.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r301800 - head/sys/rpc

2016-06-10 Thread Garrett Cooper

Author: ngie
Date: Fri Jun 10 17:53:28 2016
New Revision: 301800
URL: https://svnweb.freebsd.org/changeset/base/301800

Log:
  Deobfuscate cleanup path in clnt_bck_create(..)
  
  Similar to r300836, cl and ct will always be non-NULL as they're allocated
  using the mem_alloc routines, which always use `malloc(..., M_WAITOK)`.
  
  Deobfuscating the cleanup path fixes a leak where if cl was NULL and
  ct was not, ct would not be free'd, and also removes a duplicate test for
  cl not being NULL.
  
  Approved by: re (gjb)
  Differential Revision: https://reviews.freebsd.org/D6801
  MFC after: 1 week
  Reported by: Coverity
  CID: 122
  Reviewed by: cem
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/rpc/clnt_bck.c

Modified: head/sys/rpc/clnt_bck.c
==
--- head/sys/rpc/clnt_bck.c Fri Jun 10 15:47:20 2016(r301799)
+++ head/sys/rpc/clnt_bck.c Fri Jun 10 17:53:28 2016(r301800)
@@ -175,14 +175,9 @@ clnt_bck_create(
return (cl);
 
 err:
-   if (cl) {
-   if (ct) {
-   mtx_destroy(>ct_lock);
-   mem_free(ct, sizeof (struct ct_data));
-   }
-   if (cl)
-   mem_free(cl, sizeof (CLIENT));
-   }
+   mtx_destroy(>ct_lock);
+   mem_free(ct, sizeof (struct ct_data));
+   mem_free(cl, sizeof (CLIENT));
return (NULL);
 }
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r301753 - head/contrib/netbsd-tests/lib/libc/db

2016-06-09 Thread Garrett Cooper

Author: ngie
Date: Thu Jun  9 19:12:51 2016
New Revision: 301753
URL: https://svnweb.freebsd.org/changeset/base/301753

Log:
  Fix up r274061
  
  Detect /usr/share/dict/words the "right way" by using require.files instead of
  the hacked up attempt in the dict(..) function, which didn't work properly on
  systems where MK_DICT == no.
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/contrib/netbsd-tests/lib/libc/db/t_db.sh

Modified: head/contrib/netbsd-tests/lib/libc/db/t_db.sh
==
--- head/contrib/netbsd-tests/lib/libc/db/t_db.sh   Thu Jun  9 18:35:37 
2016(r301752)
+++ head/contrib/netbsd-tests/lib/libc/db/t_db.sh   Thu Jun  9 19:12:51 
2016(r301753)
@@ -37,6 +37,7 @@ dict()
elif [ -f /usr/dict/words ]; then
echo /usr/dict/words
else
+   echo ""
atf_fail "no dictionary found"
fi
 }
@@ -44,12 +45,7 @@ dict()
 # Begin FreeBSD
 dict()
 {
-   if [ -f /usr/share/dict/words ]; then
-   echo /usr/share/dict/words
-   else
-   echo /nonexistent
-   atf_skip "Test requires dict/words"
-   fi
+   echo /usr/share/dict/words
 }
 # End FreeBSD
 
@@ -62,6 +58,9 @@ small_btree_head()
"Checks btree database using small keys and small data" \
"pairs: takes the first hundred entries in the dictionary," \
"and makes them be key/data pairs."
+   # Begin FreeBSD
+   atf_set "require.files" /usr/share/dict/words
+   # End FreeBSD
 }
 small_btree_body()
 {
@@ -88,6 +87,9 @@ small_hash_head()
"Checks hash database using small keys and small data" \
"pairs: takes the first hundred entries in the dictionary," \
"and makes them be key/data pairs."
+   # Begin FreeBSD
+   atf_set "require.files" /usr/share/dict/words
+   # End FreeBSD
 }
 small_hash_body()
 {
@@ -114,6 +116,9 @@ small_recno_head()
"Checks recno database using small keys and small data" \
"pairs: takes the first hundred entries in the dictionary," \
"and makes them be key/data pairs."
+   # Begin FreeBSD
+   atf_set "require.files" /usr/share/dict/words
+   # End FreeBSD
 }
 small_recno_body()
 {
@@ -138,6 +143,9 @@ medium_btree_head()
"Checks btree database using small keys and medium" \
"data pairs: takes the first 200 entries in the" \
"dictionary, and gives them each a medium size data entry."
+   # Begin FreeBSD
+   atf_set "require.files" /usr/share/dict/words
+   # End FreeBSD
 }
 medium_btree_body()
 {
@@ -166,6 +174,9 @@ medium_hash_head()
"Checks hash database using small keys and medium" \
"data pairs: takes the first 200 entries in the" \
"dictionary, and gives them each a medium size data entry."
+   # Begin FreeBSD
+   atf_set "require.files" /usr/share/dict/words
+   # End FreeBSD
 }
 medium_hash_body()
 {
@@ -731,6 +742,9 @@ small_page_btree_head()
"reverses them, and gives them each a small size data" \
"entry. Uses a small page size to make sure the btree" \
"split code gets hammered."
+   # Begin FreeBSD
+   atf_set "require.files" /usr/share/dict/words
+   # End FreeBSD
 }
 small_page_btree_body()
 {
@@ -784,6 +798,9 @@ atf_test_case byte_orders_btree
 byte_orders_btree_head()
 {
atf_set "descr" "Checks btree database using differing byte orders"
+   # Begin FreeBSD
+   atf_set "require.files" /usr/share/dict/words
+   # End FreeBSD
 }
 byte_orders_btree_body()
 {
@@ -816,6 +833,9 @@ bsize_ffactor_head()
atf_set "timeout" "480"
atf_set "descr" "Checks hash database with various" \
"bucketsizes and fill factors"
+   # Begin FreeBSD
+   atf_set "require.files" /usr/share/dict/words
+   # End FreeBSD
 }
 bsize_ffactor_body()
 {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r301752 - head/contrib/netbsd-tests/lib/libc/string

2016-06-09 Thread Garrett Cooper

Author: ngie
Date: Thu Jun  9 18:35:37 2016
New Revision: 301752
URL: https://svnweb.freebsd.org/changeset/base/301752

Log:
  Update `goodResult` after recent changes made to the PRNG in libc
  
  The PRNG was changed in r300953/r300956, and subsequently, the numbers
  generated have changed. This is expected ABI breakage per ache
  
  X-MFC with: r300953, r300956
  Tested with: amd64, i386
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/contrib/netbsd-tests/lib/libc/string/t_memcpy.c

Modified: head/contrib/netbsd-tests/lib/libc/string/t_memcpy.c
==
--- head/contrib/netbsd-tests/lib/libc/string/t_memcpy.cThu Jun  9 
18:27:41 2016(r301751)
+++ head/contrib/netbsd-tests/lib/libc/string/t_memcpy.cThu Jun  9 
18:35:37 2016(r301752)
@@ -54,7 +54,7 @@ char result[100];
 #ifdef __NetBSD__
 const char goodResult[] = "7b405d24bc03195474c70ddae9e1f8fb";
 #else
-const char goodResult[] = "217b4fbe456916bf62a2f85df752e4ab";
+const char goodResult[] = "5ab4443f0e3e058d94087d9f2a11ef5e";
 #endif
 
 static void
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r301749 - head/contrib/netbsd-tests/lib/libc/string

2016-06-09 Thread Garrett Cooper

Author: ngie
Date: Thu Jun  9 18:11:42 2016
New Revision: 301749
URL: https://svnweb.freebsd.org/changeset/base/301749

Log:
  Add debug output to aid in determining why `goodResult` != `result`
  
  MFC after: 1 week
  PR: 210619 (for diagnosis)
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/contrib/netbsd-tests/lib/libc/string/t_memcpy.c

Modified: head/contrib/netbsd-tests/lib/libc/string/t_memcpy.c
==
--- head/contrib/netbsd-tests/lib/libc/string/t_memcpy.cThu Jun  9 
17:26:54 2016(r301748)
+++ head/contrib/netbsd-tests/lib/libc/string/t_memcpy.cThu Jun  9 
18:11:42 2016(r301749)
@@ -108,7 +108,12 @@ ATF_TC_BODY(memcpy_basic, tc)
if (i != j)
runTest(start[i], start[j]);
MD5End(mc, result);
+#ifdef __NetBSD__
ATF_REQUIRE_EQ(strcmp(result, goodResult), 0);
+#else
+   ATF_REQUIRE_EQ_MSG(strcmp(result, goodResult), 0, "%s != %s",
+   result, goodResult);
+#endif
 }
 
 ATF_TC(memccpy_simple);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r301708 - head/lib/libc/net

2016-06-08 Thread Garrett Cooper

Author: ngie
Date: Wed Jun  8 23:30:13 2016
New Revision: 301708
URL: https://svnweb.freebsd.org/changeset/base/301708

Log:
  Revert r301707
  
  getnetent_p doesn't return NULL like getnetent does. coccinelle got confused 
and
  I didn't verify that it worked before committing the change
  
  MFC after: 1 week
  X-MFC with: r301707
  Pointyhat to: ngie

Modified:
  head/lib/libc/net/getnetbyht.c

Modified: head/lib/libc/net/getnetbyht.c
==
--- head/lib/libc/net/getnetbyht.c  Wed Jun  8 23:23:19 2016
(r301707)
+++ head/lib/libc/net/getnetbyht.c  Wed Jun  8 23:30:13 2016
(r301708)
@@ -215,10 +215,10 @@ _ht_getnetbyname(void *rval, void *cb_da
}
 
_setnethtent(ned->stayopen, ned);
-   while ((error = getnetent_p(, ned)) == NULL) {
+   while ((error = getnetent_p(, ned)) == 0) {
if (strcasecmp(ne.n_name, name) == 0)
break;
-   for (cp = ne.n_aliases; *cp != NULL; cp++)
+   for (cp = ne.n_aliases; *cp != 0; cp++)
if (strcasecmp(*cp, name) == 0)
goto found;
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r301707 - head/lib/libc/net

2016-06-08 Thread Garrett Cooper

Author: ngie
Date: Wed Jun  8 23:23:19 2016
New Revision: 301707
URL: https://svnweb.freebsd.org/changeset/base/301707

Log:
  Use NULL instead of `0` in _ht_getnetbyname(..)
  
  - getnetent returns NULL on completion/error.
  - .h_aliases is NULL terminated.
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/lib/libc/net/getnetbyht.c

Modified: head/lib/libc/net/getnetbyht.c
==
--- head/lib/libc/net/getnetbyht.c  Wed Jun  8 23:23:16 2016
(r301706)
+++ head/lib/libc/net/getnetbyht.c  Wed Jun  8 23:23:19 2016
(r301707)
@@ -215,10 +215,10 @@ _ht_getnetbyname(void *rval, void *cb_da
}
 
_setnethtent(ned->stayopen, ned);
-   while ((error = getnetent_p(, ned)) == 0) {
+   while ((error = getnetent_p(, ned)) == NULL) {
if (strcasecmp(ne.n_name, name) == 0)
break;
-   for (cp = ne.n_aliases; *cp != 0; cp++)
+   for (cp = ne.n_aliases; *cp != NULL; cp++)
if (strcasecmp(*cp, name) == 0)
goto found;
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r301704 - head/lib/libc/rpc

2016-06-08 Thread Garrett Cooper

Author: ngie
Date: Wed Jun  8 23:17:30 2016
New Revision: 301704
URL: https://svnweb.freebsd.org/changeset/base/301704

Log:
  Test for strchr(3) returning NULL, not 0
  
  MFC after: 3 days
  Reported by: coccinelle
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/lib/libc/rpc/getnetpath.c

Modified: head/lib/libc/rpc/getnetpath.c
==
--- head/lib/libc/rpc/getnetpath.c  Wed Jun  8 23:13:20 2016
(r301703)
+++ head/lib/libc/rpc/getnetpath.c  Wed Jun  8 23:17:30 2016
(r301704)
@@ -262,7 +262,7 @@ _get_next_token(char *npp, int token)
 *cp++ = '\0';  /* null-terminate token */
 /* get rid of any backslash escapes */
 ep = npp;
-while ((np = strchr(ep, '\\')) != 0) {
+while ((np = strchr(ep, '\\')) != NULL) {
if (np[1] == '\\')
np++;
strcpy(np, (ep = [1]));  /* XXX: overlapping string copy */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r301683 - head/etc/defaults

2016-06-08 Thread Garrett Cooper

Author: ngie
Date: Wed Jun  8 18:38:48 2016
New Revision: 301683
URL: https://svnweb.freebsd.org/changeset/base/301683

Log:
  Fix typo with description for $ipv6_cpe_wanif (upstram -> upstream)
  
  MFC after: 3 days
  PR: 210146
  Reported by: Sean M. Collins 
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/defaults/rc.conf

Modified: head/etc/defaults/rc.conf
==
--- head/etc/defaults/rc.conf   Wed Jun  8 18:27:44 2016(r301682)
+++ head/etc/defaults/rc.conf   Wed Jun  8 18:38:48 2016(r301683)
@@ -481,7 +481,7 @@ ipv6_static_routes=""   # Set to static r
#  route toward loopback interface.
 #ipv6_route_xxx="fec0:::0006:: -prefixlen 64 ::1"
 ipv6_gateway_enable="NO"   # Set to YES if this host will be a gateway.
-ipv6_cpe_wanif="NO"# Set to the upstram interface name if this
+ipv6_cpe_wanif="NO"# Set to the upstream interface name if this
# node will work as a router to forward IPv6
# packets not explicitly addressed to itself.
 ipv6_privacy="NO"  # Use privacy address on RA-receiving IFs
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r301605 - head/usr.sbin/rpcbind

2016-06-08 Thread Garrett Cooper

Author: ngie
Date: Wed Jun  8 12:45:22 2016
New Revision: 301605
URL: https://svnweb.freebsd.org/changeset/base/301605

Log:
  Bounds check rpcbs_rmtcall(..) to ensure rtype is less than RPCBVERS_STAT
  
  Not returning if rtype == RPCBVERS_STAT will cause us to overrun the inf 
array, as
  it's defined to be exactly RPCBVERS_STAT elements in rpcb_prot.x:
  
  > include/rpc/rpcb_prot.x:typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT];
  
  The proposed change also matches the rest of the rtype upper bound checks in 
the
  file, so the original change was likely a typo.
  
  MFC after: 2 weeks
  Reported by: Coverity
  CID: 1007567
  Reviewed by: truckman
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/rpcbind/rpcb_stat.c

Modified: head/usr.sbin/rpcbind/rpcb_stat.c
==
--- head/usr.sbin/rpcbind/rpcb_stat.c   Wed Jun  8 12:40:21 2016
(r301604)
+++ head/usr.sbin/rpcbind/rpcb_stat.c   Wed Jun  8 12:45:22 2016
(r301605)
@@ -151,7 +151,7 @@ rpcbs_rmtcall(rpcvers_t rtype, rpcproc_t
rpcbs_rmtcalllist *rl;
struct netconfig *nconf;
 
-   if (rtype > RPCBVERS_STAT)
+   if (rtype >= RPCBVERS_STAT)
return;
for (rl = inf[rtype].rmtinfo; rl; rl = rl->next) {
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r301023 - head/sys/boot/geli

2016-05-31 Thread Garrett Cooper

Author: ngie
Date: Tue May 31 06:24:09 2016
New Revision: 301023
URL: https://svnweb.freebsd.org/changeset/base/301023

Log:
  Add missing libc includes to fix -Wimplicit-function-declaration warnings
  
  MFC after: 2 weeks
  Reported by: clang
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/boot/geli/geliboot_crypto.c

Modified: head/sys/boot/geli/geliboot_crypto.c
==
--- head/sys/boot/geli/geliboot_crypto.cTue May 31 06:00:18 2016
(r301022)
+++ head/sys/boot/geli/geliboot_crypto.cTue May 31 06:24:09 2016
(r301023)
@@ -27,6 +27,10 @@
  * $FreeBSD$
  */
 
+#include 
+#include 
+#include 
+
 #include "geliboot.h"
 
 int
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r301004 - head/etc/rc.d

2016-05-30 Thread Garrett Cooper

Author: ngie
Date: Mon May 30 19:59:51 2016
New Revision: 301004
URL: https://svnweb.freebsd.org/changeset/base/301004

Log:
  Fix circular dependency created after r287197 between ldconfig and 
mountcritremote
  
  ldconfig is already required by mountcritremote indirectly, as noted by 
rcorder:
  
  > rcorder: Circular dependency on provision `mountcritremote' in file 
`ldconfig'.
  
  Having mountcritremote REQUIRE ldconfig breaks dependency ordering.
  
  Making the ldconfig hints be conditionally regenerated from mountcritremote 
when
  remote filesystems are mounted is done after this change, similar to cleanvar
  being conditionally called after the change.
  
  Differential Revision: https://reviews.freebsd.org/D6621
  PR: 202726
  Reviewed by: jilles
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/rc.d/ldconfig
  head/etc/rc.d/mountcritremote

Modified: head/etc/rc.d/ldconfig
==
--- head/etc/rc.d/ldconfig  Mon May 30 19:32:56 2016(r301003)
+++ head/etc/rc.d/ldconfig  Mon May 30 19:59:51 2016(r301004)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: ldconfig
-# REQUIRE: mountcritremote FILESYSTEMS
+# REQUIRE: FILESYSTEMS
 # BEFORE:  DAEMON
 
 . /etc/rc.subr

Modified: head/etc/rc.d/mountcritremote
==
--- head/etc/rc.d/mountcritremote   Mon May 30 19:32:56 2016
(r301003)
+++ head/etc/rc.d/mountcritremote   Mon May 30 19:59:51 2016
(r301004)
@@ -35,12 +35,15 @@ mountcritremote_precmd()
 
 mountcritremote_start()
 {
+   local mounted_remote_filesystem=false
+
# Mount nfs filesystems.
#
case "`/sbin/mount -d -a -t nfs`" in
'')
;;
*)
+   mounted_remote_filesystem=true
echo -n 'Mounting NFS filesystems:'
mount -a -t nfs
echo '.'
@@ -64,6 +67,7 @@ mountcritremote_start()
 
case "`mount -d -a -t ${fstype}`" in
*mount_${fstype}*)
+   mounted_remote_filesystem=true
echo -n "Mounting ${fsdecr} filesystems:"
mount -a -t ${fstype}
echo '.'
@@ -71,9 +75,15 @@ mountcritremote_start()
esac
done
 
-   # Cleanup /var again just in case it's a network mount.
-   /etc/rc.d/cleanvar quietreload
-   rm -f /var/run/clean_var /var/spool/lock/clean_var
+   if $mounted_remote_filesystem; then
+   # Cleanup /var again just in case it's a network mount.
+   /etc/rc.d/cleanvar quietreload
+   rm -f /var/run/clean_var /var/spool/lock/clean_var
+
+   # Regenerate the ldconfig hints in case there are additional
+   # library paths on remote file systems
+   /etc/rc.d/ldconfig quietstart
+   fi
 }
 
 load_rc_config $name
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300973 - head/usr.sbin/rpcbind

2016-05-29 Thread Garrett Cooper

Author: ngie
Date: Sun May 29 20:28:01 2016
New Revision: 300973
URL: https://svnweb.freebsd.org/changeset/base/300973

Log:
  Follow up to r300932
  
  In the event MK_INET6 != no in userspace, but is disabled in the
  kernel, or if there aren't any IPv6 addresses configured in userspace
  (for lo0 and all physical interfaces), rpcbind would terminate
  immediately instead of silently failing on
  
  Skip over the IPv6 block to its respective cleanup with freeifaddrs if
  creating the socket failed instead of terminating rpcbind immediately
  
  MFC after: 6 days
  X-MFC with: r300932
  Reported by: O. Hartmann 
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/rpcbind/util.c

Modified: head/usr.sbin/rpcbind/util.c
==
--- head/usr.sbin/rpcbind/util.cSun May 29 19:46:34 2016
(r300972)
+++ head/usr.sbin/rpcbind/util.cSun May 29 20:28:01 2016
(r300973)
@@ -371,7 +371,7 @@ network_init(void)
if (s == -1) {
if (debugging)
fprintf(stderr, "couldn't create ip6 socket");
-   exit(1);
+   goto done_inet6;
}
 
/*
@@ -394,6 +394,7 @@ network_init(void)
if (debugging)
perror("setsockopt v6 multicast");
}
+done_inet6:
freeifaddrs(ifp);
 #endif
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300937 - head/tools/build/mk

2016-05-29 Thread Garrett Cooper

Author: ngie
Date: Sun May 29 04:43:24 2016
New Revision: 300937
URL: https://svnweb.freebsd.org/changeset/base/300937

Log:
  Remove the etcupdate tests if MK_RCS == no when "make delete-old" is run
  
  etcupdate is conditionally installed based on MK_RCS != no today
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc   Sun May 29 04:39:20 
2016(r300936)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc   Sun May 29 04:43:24 
2016(r300937)
@@ -6792,6 +6792,15 @@ OLD_FILES+=usr/share/man/man1/rcsmerge.1
 OLD_FILES+=usr/share/man/man1/rlog.1.gz
 OLD_FILES+=usr/share/man/man5/rcsfile.5.gz
 OLD_FILES+=usr/share/man/man8/etcupdate.8.gz
+OLD_FILES+=usr/tests/usr.sbin/etcupdate/Kyuafile
+OLD_FILES+=usr/tests/usr.sbin/etcupdate/always_test
+OLD_FILES+=usr/tests/usr.sbin/etcupdate/conflicts_test
+OLD_FILES+=usr/tests/usr.sbin/etcupdate/fbsdid_test
+OLD_FILES+=usr/tests/usr.sbin/etcupdate/ignore_test
+OLD_FILES+=usr/tests/usr.sbin/etcupdate/preworld_test
+OLD_FILES+=usr/tests/usr.sbin/etcupdate/tests_test
+OLD_FILES+=usr/tests/usr.sbin/etcupdate/tzsetup_test
+OLD_DIRS+=usr/tests/usr.sbin/etcupdate
 .endif
 
 #.if ${MK_RESCUE} == no
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300932 - head/usr.sbin/rpcbind

2016-05-29 Thread Garrett Cooper

Author: ngie
Date: Sun May 29 03:42:50 2016
New Revision: 300932
URL: https://svnweb.freebsd.org/changeset/base/300932

Log:
  Catch malloc(3) errors and socket(2) errors
  
  - malloc failing will result in a delayed segfault
  - socket failing will result in delayed failures with setsockopt
  
  Exit in the event that either of these high-level conditions are met.
  
  Reported by: Coverity
  CID: 976288, 976321, 976858
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/rpcbind/util.c

Modified: head/usr.sbin/rpcbind/util.c
==
--- head/usr.sbin/rpcbind/util.cSun May 29 02:59:03 2016
(r300931)
+++ head/usr.sbin/rpcbind/util.cSun May 29 03:42:50 2016
(r300932)
@@ -336,6 +336,7 @@ network_init(void)
if (local_in4 == NULL) {
if (debugging)
fprintf(stderr, "can't alloc local ip4 addr\n");
+   exit(1);
}
memcpy(local_in4, res->ai_addr, sizeof *local_in4);
}
@@ -351,6 +352,7 @@ network_init(void)
if (local_in6 == NULL) {
if (debugging)
fprintf(stderr, "can't alloc local ip6 addr\n");
+   exit(1);
}
memcpy(local_in6, res->ai_addr, sizeof *local_in6);
}
@@ -365,6 +367,11 @@ network_init(void)
inet_pton(AF_INET6, RPCB_MULTICAST_ADDR, _multiaddr);
 
s = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
+   if (s == -1) {
+   if (debugging)
+   fprintf(stderr, "couldn't create ip6 socket");
+   exit(1);
+   }
 
/*
 * Loop through all interfaces. For each IPv6 multicast-capable
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300931 - head/etc/rc.d

2016-05-29 Thread Garrett Cooper

Author: ngie
Date: Sun May 29 02:59:03 2016
New Revision: 300931
URL: https://svnweb.freebsd.org/changeset/base/300931

Log:
  Make netif REQUIRE hostid
  
  As noted in the PR, if etc/rc.d/zvol is removed, netif will be run before
  hostid, and the MAC address generated for any bridge devices will be
  non-deterministic. Make the MAC address generated be deterministic for
  bridge devices by explicitly REQUIRE'ing hostid.
  
  This fixes up the rest of the PR, inadvertently committed in r299844
  
  MFC after: 1 week
  PR: 195188
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/rc.d/netif

Modified: head/etc/rc.d/netif
==
--- head/etc/rc.d/netif Sun May 29 02:24:51 2016(r300930)
+++ head/etc/rc.d/netif Sun May 29 02:59:03 2016(r300931)
@@ -27,7 +27,7 @@
 
 # PROVIDE: netif
 # REQUIRE: FILESYSTEMS iovctl serial sppp sysctl
-# REQUIRE: ipfilter ipfs
+# REQUIRE: hostid ipfilter ipfs
 # KEYWORD: nojailvnet
 
 . /etc/rc.subr
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300922 - head/etc/mtree

2016-05-29 Thread Garrett Cooper

Author: ngie
Date: Sun May 29 01:38:12 2016
New Revision: 300922
URL: https://svnweb.freebsd.org/changeset/base/300922

Log:
  Fix "make installworld" with MK_CDDL == no after r300906 by
  adding a missing entry for ${TESTSBASE}/cddl/sbin
  
  X-MFC with: r300906
  Pointyhat to: asomers
  Reported by: Shawn Webb 
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/mtree/BSD.tests.dist

Modified: head/etc/mtree/BSD.tests.dist
==
--- head/etc/mtree/BSD.tests.dist   Sun May 29 01:15:36 2016
(r300921)
+++ head/etc/mtree/BSD.tests.dist   Sun May 29 01:38:12 2016
(r300922)
@@ -48,6 +48,8 @@
 cddl
 lib
 ..
+sbin
+..
 usr.bin
 ..
 usr.sbin
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300945 - head/usr.sbin/rpcbind

2016-05-29 Thread Garrett Cooper

Author: ngie
Date: Sun May 29 06:29:22 2016
New Revision: 300945
URL: https://svnweb.freebsd.org/changeset/base/300945

Log:
  Remove unnecessary caller_uaddr != NULL test before calling free on it
  
  MFC after: 3 days
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/rpcbind/util.c

Modified: head/usr.sbin/rpcbind/util.c
==
--- head/usr.sbin/rpcbind/util.cSun May 29 06:20:36 2016
(r300944)
+++ head/usr.sbin/rpcbind/util.cSun May 29 06:29:22 2016
(r300945)
@@ -293,8 +293,7 @@ found:
ret = taddr2uaddr(nconf, );
 
 freeit:
-   if (caller_uaddr != NULL)
-   free(caller_uaddr);
+   free(caller_uaddr);
if (hint_nbp != NULL) {
free(hint_nbp->buf);
free(hint_nbp);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300940 - head/tools/build/mk

2016-05-29 Thread Garrett Cooper

Author: ngie
Date: Sun May 29 04:56:48 2016
New Revision: 300940
URL: https://svnweb.freebsd.org/changeset/base/300940

Log:
  Remove yacc and the yacc tests if MK_TOOLCHAIN == no
  
  yacc's install is conditional based on MK_TOOLCHAIN != no
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc   Sun May 29 04:50:49 
2016(r300939)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc   Sun May 29 04:56:48 
2016(r300940)
@@ -8009,6 +8009,7 @@ OLD_FILES+=usr/share/man/man1/ul.1.gz
 .if ${MK_TOOLCHAIN} == no
 OLD_FILES+=usr/bin/addr2line
 OLD_FILES+=usr/bin/as
+OLD_FILES+=usr/bin/byacc
 OLD_FILES+=usr/bin/cc
 OLD_FILES+=usr/bin/c88
 OLD_FILES+=usr/bin/c++
@@ -8020,6 +8021,7 @@ OLD_FILES+=usr/bin/readelf
 OLD_FILES+=usr/bin/size
 OLD_FILES+=usr/bin/strings
 OLD_FILES+=usr/bin/strip
+OLD_FILES+=usr/bin/yacc
 OLD_FILES+=usr/share/man/man1/addr2line.1.gz
 OLD_FILES+=usr/share/man/man1/c++filt.1.gz
 OLD_FILES+=usr/share/man/man1/nm.1.gz
@@ -8031,6 +8033,314 @@ OLD_FILES+=usr/share/man/man1/strip.1.gz
 OLD_FILES+=usr/bin/objcopy
 OLD_FILES+=usr/share/man/man1/objcopy.1.gz
 .endif
+OLD_FILES+=usr/tests/usr.bin/yacc/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_calc1.y
+OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_demo.y
+OLD_FILES+=usr/tests/usr.bin/yacc/calc.y
+OLD_FILES+=usr/tests/usr.bin/yacc/calc1.y
+OLD_FILES+=usr/tests/usr.bin/yacc/calc2.y
+OLD_FILES+=usr/tests/usr.bin/yacc/calc3.y
+OLD_FILES+=usr/tests/usr.bin/yacc/code_calc.y
+OLD_FILES+=usr/tests/usr.bin/yacc/code_debug.y
+OLD_FILES+=usr/tests/usr.bin/yacc/code_error.y
+OLD_FILES+=usr/tests/usr.bin/yacc/empty.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit1.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit2.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit3.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit4.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit5.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax1.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax10.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax11.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax12.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax13.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax14.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax15.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax16.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax17.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax18.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax19.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax2.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax20.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax21.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax22.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax23.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax24.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax25.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax26.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax27.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax3.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax4.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax5.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax6.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax7.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax7a.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax7b.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax8.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax8a.y
+OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax9.y
+OLD_FILES+=usr/tests/usr.bin/yacc/error.y
+OLD_FILES+=usr/tests/usr.bin/yacc/grammar.y
+OLD_FILES+=usr/tests/usr.bin/yacc/inherit0.y
+OLD_FILES+=usr/tests/usr.bin/yacc/inherit1.y
+OLD_FILES+=usr/tests/usr.bin/yacc/inherit2.y
+OLD_FILES+=usr/tests/usr.bin/yacc/ok_syntax1.y
+OLD_FILES+=usr/tests/usr.bin/yacc/pure_calc.y
+OLD_FILES+=usr/tests/usr.bin/yacc/pure_error.y
+OLD_FILES+=usr/tests/usr.bin/yacc/quote_calc.y
+OLD_FILES+=usr/tests/usr.bin/yacc/quote_calc2.y
+OLD_FILES+=usr/tests/usr.bin/yacc/quote_calc3.y
+OLD_FILES+=usr/tests/usr.bin/yacc/quote_calc4.y
+OLD_FILES+=usr/tests/usr.bin/yacc/run_test
+OLD_FILES+=usr/tests/usr.bin/yacc/varsyntax_calc1.y
+OLD_FILES+=usr/tests/usr.bin/yacc/yacc/big_b.error
+OLD_FILES+=usr/tests/usr.bin/yacc/yacc/big_b.output
+OLD_FILES+=usr/tests/usr.bin/yacc/yacc/big_l.error
+OLD_FILES+=usr/tests/usr.bin/yacc/yacc/big_l.output
+OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc.error
+OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc.output
+OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc.tab.c
+OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc.tab.h
+OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc1.error
+OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc1.output
+OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc1.tab.c
+OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc1.tab.h
+OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc2.error

svn commit: r300942 - head/usr.sbin/rpcbind

2016-05-29 Thread Garrett Cooper

Author: ngie
Date: Sun May 29 06:01:18 2016
New Revision: 300942
URL: https://svnweb.freebsd.org/changeset/base/300942

Log:
  Remove a useless if (x != NULL) check before calling free on allocated_uaddr
  
  MFC after: 3 days
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/rpcbind/check_bound.c

Modified: head/usr.sbin/rpcbind/check_bound.c
==
--- head/usr.sbin/rpcbind/check_bound.c Sun May 29 05:55:21 2016
(r300941)
+++ head/usr.sbin/rpcbind/check_bound.c Sun May 29 06:01:18 2016
(r300942)
@@ -219,8 +219,7 @@ mergeaddr(SVCXPRT *xprt, char *netid, ch
fprintf(stderr, "mergeaddr: uaddr = %s, merged uaddr = %s\n",
uaddr, m_uaddr);
 #endif
-   if (allocated_uaddr != NULL)
-   free(allocated_uaddr);
+   free(allocated_uaddr);
return (m_uaddr);
 }
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300939 - head/bin/ls/tests

2016-05-29 Thread Garrett Cooper

Author: ngie
Date: Sun May 29 04:50:49 2016
New Revision: 300939
URL: https://svnweb.freebsd.org/changeset/base/300939

Log:
  Use require.progs with bc instead of require.files with /usr/bin/bc
  
  This will make things more flexible if the program path changes in the future,
  and the test in and of itself doesn't call /usr/bin/bc -- it just calls bc
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/bin/ls/tests/ls_tests.sh

Modified: head/bin/ls/tests/ls_tests.sh
==
--- head/bin/ls/tests/ls_tests.sh   Sun May 29 04:47:10 2016
(r300938)
+++ head/bin/ls/tests/ls_tests.sh   Sun May 29 04:50:49 2016
(r300939)
@@ -535,7 +535,7 @@ atf_test_case h_flag
 h_flag_head()
 {
atf_set "descr" "Verify that -h prints out the humanized units for file 
sizes with ls -l"
-   atf_set "require.files" "/usr/bin/bc"
+   atf_set "require.progs" "bc"
 }
 
 h_flag_body()
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300941 - head/usr.sbin/rpcbind

2016-05-29 Thread Garrett Cooper

Author: ngie
Date: Sun May 29 05:55:21 2016
New Revision: 300941
URL: https://svnweb.freebsd.org/changeset/base/300941

Log:
  Don't leak res in network_init(..)
  
  Call freeaddrinfo on it after it's been used
  
  MFC after: 1 week
  Reported by: Coverity
  CID: 1225050
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/rpcbind/util.c

Modified: head/usr.sbin/rpcbind/util.c
==
--- head/usr.sbin/rpcbind/util.cSun May 29 04:56:48 2016
(r300940)
+++ head/usr.sbin/rpcbind/util.cSun May 29 05:55:21 2016
(r300941)
@@ -396,6 +396,7 @@ network_init(void)
freeifaddrs(ifp);
 #endif
 
+   freeaddrinfo(res);
/* close(s); */
 }
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300935 - head/usr.sbin/rpc.statd

2016-05-29 Thread Garrett Cooper

Author: ngie
Date: Sun May 29 04:18:47 2016
New Revision: 300935
URL: https://svnweb.freebsd.org/changeset/base/300935

Log:
  Mark out_of_mem(..) and usage(..) with __dead2 as they both directly call exit
  as a hint to static analysis tools
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/rpc.statd/statd.c

Modified: head/usr.sbin/rpc.statd/statd.c
==
--- head/usr.sbin/rpc.statd/statd.c Sun May 29 04:02:02 2016
(r300934)
+++ head/usr.sbin/rpc.statd/statd.c Sun May 29 04:18:47 2016
(r300935)
@@ -72,9 +72,9 @@ static intcreate_service(struct netconf
 static voidcomplete_service(struct netconfig *nconf, char *port_str);
 static voidclearout_service(void);
 static void handle_sigchld(int sig);
-void out_of_mem(void);
+void out_of_mem(void) __dead2;
 
-static void usage(void);
+static void usage(void) __dead2;
 
 int
 main(int argc, char **argv)
@@ -613,7 +613,7 @@ clearout_service(void)
 }
 
 static void
-usage()
+usage(void)
 {
   fprintf(stderr, "usage: rpc.statd [-d] [-h ] [-p ]\n");
   exit(1);
@@ -647,7 +647,7 @@ static void handle_sigchld(int sig __unu
  * Out of memory, fatal
  */
 void
-out_of_mem()
+out_of_mem(void)
 {
 
syslog(LOG_ERR, "out of memory");
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300934 - head/usr.sbin/rpcbind

2016-05-29 Thread Garrett Cooper

Author: ngie
Date: Sun May 29 04:02:02 2016
New Revision: 300934
URL: https://svnweb.freebsd.org/changeset/base/300934

Log:
  Plug leak with ifp by calling freeifaddrs after calling getifaddrs
  
  MFC after: 1 week
  Obtained from: NetBSD v1.18
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/rpcbind/util.c

Modified: head/usr.sbin/rpcbind/util.c
==
--- head/usr.sbin/rpcbind/util.cSun May 29 03:44:37 2016
(r300933)
+++ head/usr.sbin/rpcbind/util.cSun May 29 04:02:02 2016
(r300934)
@@ -393,6 +393,7 @@ network_init(void)
if (debugging)
perror("setsockopt v6 multicast");
}
+   freeifaddrs(ifp);
 #endif
 
/* close(s); */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300947 - head/usr.sbin/rpcbind

2016-05-29 Thread Garrett Cooper

Author: ngie
Date: Sun May 29 07:01:12 2016
New Revision: 300947
URL: https://svnweb.freebsd.org/changeset/base/300947

Log:
  Staticize variables only used in rpcbind.c
  
  This is some low hanging fruit necessary for making this WARNS?= 6 clean
  
  MFC after: 3 days
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/rpcbind/rpcbind.c

Modified: head/usr.sbin/rpcbind/rpcbind.c
==
--- head/usr.sbin/rpcbind/rpcbind.c Sun May 29 06:46:17 2016
(r300946)
+++ head/usr.sbin/rpcbind/rpcbind.c Sun May 29 07:01:12 2016
(r300947)
@@ -85,7 +85,7 @@ rpcblist_ptr list_rbl;/* A list of vers
 
 #define RPCBINDDLOCK "/var/run/rpcbind.lock"
 
-int runasdaemon = 0;
+static int runasdaemon = 0;
 int insecure = 0;
 int oldstyle_local = 0;
 #ifdef LIBWRAP
@@ -93,12 +93,12 @@ int libwrap = 0;
 #endif
 int verboselog = 0;
 
-char **hosts = NULL;
-struct sockaddr **bound_sa;
-int ipv6_only = 0;
-int nhosts = 0;
-int on = 1;
-int rpcbindlockfd;
+static char **hosts = NULL;
+static struct sockaddr **bound_sa;
+static int ipv6_only = 0;
+static int nhosts = 0;
+static int on = 1;
+static int rpcbindlockfd;
 
 #ifdef WARMSTART
 /* Local Variable */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300938 - head/tools/build/mk

2016-05-29 Thread Garrett Cooper

Author: ngie
Date: Sun May 29 04:47:10 2016
New Revision: 300938
URL: https://svnweb.freebsd.org/changeset/base/300938

Log:
  Remove the sa(8) tests if MK_ACCT == no when "make delete-old" is run
  
  sa(8) is conditionally installed based on MK_ACCT != no today
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc   Sun May 29 04:43:24 
2016(r300937)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc   Sun May 29 04:47:10 
2016(r300938)
@@ -12,6 +12,33 @@ OLD_FILES+=usr/sbin/accton
 OLD_FILES+=usr/sbin/sa
 OLD_FILES+=usr/share/man/man8/accton.8.gz
 OLD_FILES+=usr/share/man/man8/sa.8.gz
+OLD_FILES+=usr/tests/usr.sbin/sa/Kyuafile
+OLD_FILES+=usr/tests/usr.sbin/sa/legacy_test
+OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-sav.in
+OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-sav.out
+OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-u.out
+OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-usr.in
+OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-usr.out
+OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-sav.in
+OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-sav.out
+OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-u.out
+OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-usr.in
+OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-usr.out
+OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-sav.in
+OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-sav.out
+OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-u.out
+OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-usr.in
+OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-usr.out
+OLD_FILES+=usr/tests/usr.sbin/sa/v2-amd64-sav.in
+OLD_FILES+=usr/tests/usr.sbin/sa/v2-amd64-u.out
+OLD_FILES+=usr/tests/usr.sbin/sa/v2-amd64-usr.in
+OLD_FILES+=usr/tests/usr.sbin/sa/v2-i386-sav.in
+OLD_FILES+=usr/tests/usr.sbin/sa/v2-i386-u.out
+OLD_FILES+=usr/tests/usr.sbin/sa/v2-i386-usr.in
+OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-sav.in
+OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-u.out
+OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-usr.in
+OLD_FILES+=usr/tests/usr.sbin/sa
 .endif
 
 .if ${MK_ACPI} == no
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300927 - head/sys/dev/ixl

2016-05-28 Thread Garrett Cooper

Author: ngie
Date: Sun May 29 01:52:05 2016
New Revision: 300927
URL: https://svnweb.freebsd.org/changeset/base/300927

Log:
  Delete duplicate declaration for i40e_blink_phy_link_led(..)
  
  It was already declared on line 90
  
  Differential Revision: https://reviews.freebsd.org/D6570
  Reported by: gcc
  Reviewed by: sbruno
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/dev/ixl/i40e_prototype.h

Modified: head/sys/dev/ixl/i40e_prototype.h
==
--- head/sys/dev/ixl/i40e_prototype.h   Sun May 29 01:45:15 2016
(r300926)
+++ head/sys/dev/ixl/i40e_prototype.h   Sun May 29 01:52:05 2016
(r300927)
@@ -501,6 +501,4 @@ enum i40e_status_code i40e_read_phy_regi
 enum i40e_status_code i40e_write_phy_register(struct i40e_hw *hw, u8 page,
  u16 reg, u8 phy_addr, u16 value);
 u8 i40e_get_phy_address(struct i40e_hw *hw, u8 dev_num);
-enum i40e_status_code i40e_blink_phy_link_led(struct i40e_hw *hw,
- u32 time, u32 interval);
 #endif /* _I40E_PROTOTYPE_H_ */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300884 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

2016-05-27 Thread Garrett Cooper

Author: ngie
Date: Fri May 27 22:56:00 2016
New Revision: 300884
URL: https://svnweb.freebsd.org/changeset/base/300884

Log:
  Fix up r300870
  
  The sys/types.h fix I proposed was only tested with zfs(4), not with
  libzpool, which is where the build failure actually existed
  
  Remove vm/vm_pageout.h from arc.c and zfs_vnops.c because they're both
  unneeded
  
  MFC after: 1 week
  X-MFC with: r300865, r300870
  In collaboration with: kib
  Submitted by: alc
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c   Fri May 27 
22:44:33 2016(r300883)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c   Fri May 27 
22:56:00 2016(r300884)
@@ -120,7 +120,6 @@
  * - ARC header release, as it removes from L2ARC buflists
  */
 
-#include 
 #include 
 #include 
 #include 
@@ -141,7 +140,6 @@
 #include 
 #include 
 
-#include 
 #include 
 
 #ifdef illumos

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Fri May 
27 22:44:33 2016(r300883)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Fri May 
27 22:56:00 2016(r300884)
@@ -75,7 +75,6 @@
 #include 
 #include 
 #include 
-#include 
 
 /*
  * Programming rules.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300874 - head/tools/tools/ioat

2016-05-27 Thread Garrett Cooper

Author: ngie
Date: Fri May 27 21:12:25 2016
New Revision: 300874
URL: https://svnweb.freebsd.org/changeset/base/300874

Log:
  Update usage(..)
  
  - Document missing options
  - Sync options with ioatcontrol(8).
  - Make it clear that the first 2 parameters are always required.
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tools/tools/ioat/ioatcontrol.c

Modified: head/tools/tools/ioat/ioatcontrol.c
==
--- head/tools/tools/ioat/ioatcontrol.c Fri May 27 20:45:32 2016
(r300873)
+++ head/tools/tools/ioat/ioatcontrol.c Fri May 27 21:12:25 2016
(r300874)
@@ -49,14 +49,19 @@ static void
 usage(void)
 {
 
-   printf("Usage: %s [-E|-f|-m] OPTIONS   [ "
+   printf("Usage: %s [-c period] [-EfmVz] channel-number num-txns 
[ "
"[ [duration]]]\n", getprogname());
-   printf("   %s -r [-v] OPTIONS   []\n\n",
+   printf("   %s -r [-c period] [-vVwz] channel-number address 
[]\n\n",
getprogname());
-   printf("   OPTIONS:\n");
-   printf("   -c  - Enable interrupt coalescing (us)\n");
-   printf("   -V  - Enable verification\n");
-   printf("   -z  - Zero device stats before test\n");
+   printf("   -c period - Enable interrupt coalescing (us) 
(default: 0)\n");
+   printf("   -E- Test non-contiguous 8k copy.\n");
+   printf("   -f- Test block fill (default: DMA copy).\n");
+   printf("   -m- Test memcpy instead of DMA.\n");
+   printf("   -r- Issue DMA to or from a specific 
address.\n");
+   printf("   -V- Enable verification\n");
+   printf("   -v-  is a kernel virtual 
address\n");
+   printf("   -w- Write to the specified address\n");
+   printf("   -z- Zero device stats before test\n");
exit(EX_USAGE);
 }
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300870 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

2016-05-27 Thread Garrett Cooper

Author: ngie
Date: Fri May 27 20:33:38 2016
New Revision: 300870
URL: https://svnweb.freebsd.org/changeset/base/300870

Log:
  Unbreak the zfs(4) build
  
  vm/vm_pageout.h grew a dependency on the bool typedef in r300865
  
  arc.c didn't include sys/types.h, which included the definition for the 
typedef
  
  Other items (ofed, drm2) might need to be chased for this commit.
  
  X-MFC with: r300865
  MFC after: 1 week
  Pointyhat to: alc
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c   Fri May 27 
20:33:14 2016(r300869)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c   Fri May 27 
20:33:38 2016(r300870)
@@ -120,6 +120,7 @@
  * - ARC header release, as it removes from L2ARC buflists
  */
 
+#include 
 #include 
 #include 
 #include 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300868 - head/tools/tools/ioat

2016-05-27 Thread Garrett Cooper

Author: ngie
Date: Fri May 27 20:12:32 2016
New Revision: 300868
URL: https://svnweb.freebsd.org/changeset/base/300868

Log:
  Remove note about bogus chain-len maximum
  
  There's no current limit on chain-len with Broadwell DE chips; it isn't
  enforced in software, and there doesn't appear to be a hardware limitation
  either on the Intel Xeon D-1527 (Broadwell-DE) chip.
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tools/tools/ioat/ioatcontrol.8

Modified: head/tools/tools/ioat/ioatcontrol.8
==
--- head/tools/tools/ioat/ioatcontrol.8 Fri May 27 19:30:13 2016
(r300867)
+++ head/tools/tools/ioat/ioatcontrol.8 Fri May 27 20:12:32 2016
(r300868)
@@ -133,7 +133,7 @@ The
 .Ar chain-len
 argument determines the number of copies to chain together in a single DMA
 transaction.
-The default is 1, and the maximum is currently 4.
+The default is 1.
 .Pp
 The
 .Ar duration
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300867 - head/usr.sbin/rpcbind

2016-05-27 Thread Garrett Cooper

Author: ngie
Date: Fri May 27 19:30:13 2016
New Revision: 300867
URL: https://svnweb.freebsd.org/changeset/base/300867

Log:
  Only expose `hint_uaddr` in the ND_DEBUG case
  
  This fixes a -Wunused-but-set-variable warning with gcc
  
  MFC after: 1 week
  Reported by: gcc 5
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/rpcbind/util.c

Modified: head/usr.sbin/rpcbind/util.c
==
--- head/usr.sbin/rpcbind/util.cFri May 27 19:23:15 2016
(r300866)
+++ head/usr.sbin/rpcbind/util.cFri May 27 19:30:13 2016
(r300867)
@@ -119,7 +119,9 @@ addrmerge(struct netbuf *caller, const c
struct sockaddr_storage ss;
struct netconfig *nconf;
char *caller_uaddr = NULL;
+#ifdef ND_DEBUG
const char *hint_uaddr = NULL;
+#endif
char *ret = NULL;
int bestif_goodness;
 
@@ -140,13 +142,17 @@ addrmerge(struct netbuf *caller, const c
 */
hint_sa = NULL;
if (clnt_uaddr != NULL) {
+#ifdef ND_DEBUG
hint_uaddr = clnt_uaddr;
+#endif
if ((hint_nbp = uaddr2taddr(nconf, clnt_uaddr)) == NULL)
goto freeit;
hint_sa = hint_nbp->buf;
}
if (hint_sa == NULL || hint_sa->sa_family != caller_sa->sa_family) {
+#ifdef ND_DEBUG
hint_uaddr = caller_uaddr;
+#endif
hint_sa = caller->buf;
}
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300861 - head/tools/tools/ioat

2016-05-27 Thread Garrett Cooper

Author: ngie
Date: Fri May 27 18:39:47 2016
New Revision: 300861
URL: https://svnweb.freebsd.org/changeset/base/300861

Log:
  - Sort make variables
  - Use SRCTOP instead of ad hoc definition for it
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tools/tools/ioat/Makefile

Modified: head/tools/tools/ioat/Makefile
==
--- head/tools/tools/ioat/Makefile  Fri May 27 18:20:07 2016
(r300860)
+++ head/tools/tools/ioat/Makefile  Fri May 27 18:39:47 2016
(r300861)
@@ -2,8 +2,11 @@
 
 PROG=  ioatcontrol
 MAN=   ioatcontrol.8
-CFLAGS+=   -I${.CURDIR:H:H:H}/sys/dev/ioat
-WARNS?=6
+
+CFLAGS+=   -I${SRCTOP}/sys/dev/ioat
+
 LIBADD=util
 
+WARNS?=6
+
 .include 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300858 - head/tools/tools/ioat

2016-05-27 Thread Garrett Cooper

Author: ngie
Date: Fri May 27 17:57:30 2016
New Revision: 300858
URL: https://svnweb.freebsd.org/changeset/base/300858

Log:
  Fix description for -V in the -r case
  
  t.verify_test = true is always set when -V is specified, regardless of whether
  or not the tool is being run in raw mode
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tools/tools/ioat/ioatcontrol.8

Modified: head/tools/tools/ioat/ioatcontrol.8
==
--- head/tools/tools/ioat/ioatcontrol.8 Fri May 27 17:44:30 2016
(r300857)
+++ head/tools/tools/ioat/ioatcontrol.8 Fri May 27 17:57:30 2016
(r300858)
@@ -93,7 +93,7 @@ is a kernel virtual address (by default,
 .Ar address
 is assumed to be a physical address)
 .It Fl V
-Dump the resulting hex to syslog
+Verify copies/fills for accuracy
 .It Fl w
 Write to the specified
 .Ar address
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300857 - head/tools/tools/ioat

2016-05-27 Thread Garrett Cooper

Author: ngie
Date: Fri May 27 17:44:30 2016
New Revision: 300857
URL: https://svnweb.freebsd.org/changeset/base/300857

Log:
  Document the default behavior for -c (0)
  
  Bump .Dd for the change
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tools/tools/ioat/ioatcontrol.8

Modified: head/tools/tools/ioat/ioatcontrol.8
==
--- head/tools/tools/ioat/ioatcontrol.8 Fri May 27 17:42:59 2016
(r300856)
+++ head/tools/tools/ioat/ioatcontrol.8 Fri May 27 17:44:30 2016
(r300857)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 14, 2015
+.Dd May 27, 2016
 .Dt IOATCONTROL 8
 .Os
 .Sh NAME
@@ -62,7 +62,8 @@ driver on a specific hardware channel.
 The arguments are as follows:
 .Bl -tag -width Ds
 .It Fl c Ar period
-Configure the channel's interrupt coalescing period, in microseconds.
+Configure the channel's interrupt coalescing period, in microseconds
+(defaults to 0).
 .It Fl E
 Test non-contiguous 8k copy.
 .It Fl f
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300856 - head/tools/tools/ioat

2016-05-27 Thread Garrett Cooper

Author: ngie
Date: Fri May 27 17:42:59 2016
New Revision: 300856
URL: https://svnweb.freebsd.org/changeset/base/300856

Log:
  Initialize `t` with memset(.., 0, ..)
  
  This will help ensure that we're not using random garbage on the stack by
  accident with respect to the variable
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tools/tools/ioat/ioatcontrol.c

Modified: head/tools/tools/ioat/ioatcontrol.c
==
--- head/tools/tools/ioat/ioatcontrol.c Fri May 27 17:40:29 2016
(r300855)
+++ head/tools/tools/ioat/ioatcontrol.c Fri May 27 17:42:59 2016
(r300856)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -104,6 +105,8 @@ main(int argc, char **argv)
bool fflag, rflag, Eflag, mflag;
unsigned modeflags;
 
+   memset(, 0, sizeof(t));
+
fflag = rflag = Eflag = mflag = false;
modeflags = 0;
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300836 - head/sys/rpc

2016-05-27 Thread Garrett Cooper

Author: ngie
Date: Fri May 27 08:48:33 2016
New Revision: 300836
URL: https://svnweb.freebsd.org/changeset/base/300836

Log:
  Quell false positives in svc_vc_create and svc_vc_create_conn with cd and xprt
  
  Both cd and xprt will be non-NULL after their respective malloc(9) wrappers 
are
  called (mem_alloc and svc_xprt_alloc, which calls mem_alloc) as mem_alloc
  always gets called with M_WAITOK|M_ZERO today. Thus, testing for them being
  non-NULL is incorrect -- it misleads Coverity and it misleads the reader.
  
  Remove some unnecessary NULL initializations as a follow up to help solidify
  the fact that these pointers will be initialized properly in sys/rpc/.. with
  the interfaces the way they are currently.
  
  Differential Revision: https://reviews.freebsd.org/D6572
  MFC after: 2 weeks
  Reported by: Coverity
  CID: 1007338, 1007339, 1007340
  Reviewed by: markj, truckman
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/rpc/svc_vc.c

Modified: head/sys/rpc/svc_vc.c
==
--- head/sys/rpc/svc_vc.c   Fri May 27 07:33:49 2016(r300835)
+++ head/sys/rpc/svc_vc.c   Fri May 27 08:48:33 2016(r300836)
@@ -143,7 +143,7 @@ SVCXPRT *
 svc_vc_create(SVCPOOL *pool, struct socket *so, size_t sendsize,
 size_t recvsize)
 {
-   SVCXPRT *xprt = NULL;
+   SVCXPRT *xprt;
struct sockaddr* sa;
int error;
 
@@ -189,11 +189,11 @@ svc_vc_create(SVCPOOL *pool, struct sock
SOCKBUF_UNLOCK(>so_rcv);
 
return (xprt);
+
 cleanup_svc_vc_create:
-   if (xprt) {
-   sx_destroy(>xp_lock);
-   svc_xprt_free(xprt);
-   }
+   sx_destroy(>xp_lock);
+   svc_xprt_free(xprt);
+
return (NULL);
 }
 
@@ -203,8 +203,8 @@ cleanup_svc_vc_create:
 SVCXPRT *
 svc_vc_create_conn(SVCPOOL *pool, struct socket *so, struct sockaddr *raddr)
 {
-   SVCXPRT *xprt = NULL;
-   struct cf_conn *cd = NULL;
+   SVCXPRT *xprt;
+   struct cf_conn *cd;
struct sockaddr* sa = NULL;
struct sockopt opt;
int one = 1;
@@ -279,12 +279,10 @@ svc_vc_create_conn(SVCPOOL *pool, struct
 
return (xprt);
 cleanup_svc_vc_create:
-   if (xprt) {
-   sx_destroy(>xp_lock);
-   svc_xprt_free(xprt);
-   }
-   if (cd)
-   mem_free(cd, sizeof(*cd));
+   sx_destroy(>xp_lock);
+   svc_xprt_free(xprt);
+   mem_free(cd, sizeof(*cd));
+
return (NULL);
 }
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300714 - head/contrib/top

2016-05-26 Thread Garrett Cooper

Author: ngie
Date: Thu May 26 07:09:42 2016
New Revision: 300714
URL: https://svnweb.freebsd.org/changeset/base/300714

Log:
  The readme provides a high-level overview of how to upgrade top(1).
  
  Differential Revision: https://reviews.freebsd.org/D6493
  MFC after: 1 week
  Reviewed By: ngie
  Submitted by: Randy Westlund 
  Sponsored by: EMC / Isilon Storage Division

Added:
  head/contrib/top/FREEBSD-upgrade

Added: head/contrib/top/FREEBSD-upgrade
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/contrib/top/FREEBSD-upgradeThu May 26 07:09:42 2016
(r300714)
@@ -0,0 +1,22 @@
+$FreeBSD$
+
+This file contains notes regarding the upgrade of top(1).  See the vendor
+import instructions at:
+
+   
https://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html#svn-advanced-use-vendor-imports
+
+The upstream project pages for top(1) are:
+
+   http://www.unixtop.org/
+
+   https://sourceforge.net/projects/unixtop/
+
+contrib/top/machine.h specifies an interface that must be provided by the
+target OS.  That interface is implemented in usr.bin/top/machine.c
+
+To enable building on case-insensitive filesystems, the following files were
+renamed:
+
+   contrib/top/top.X   -> contrib/top/top.xs
+   contrib/top/top.local.H -> contrib/top/top.local.hs
+
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300625 - head/sys/rpc

2016-05-24 Thread Garrett Cooper

Author: ngie
Date: Tue May 24 20:06:41 2016
New Revision: 300625
URL: https://svnweb.freebsd.org/changeset/base/300625

Log:
  Remove unnecessary memset(.., 0, ..)'s
  
  The mem_alloc macro calls calloc (userspace) / malloc(.., M_WAITOK|M_ZERO)
  under the covers, so zeroing out memory is already handled by the underlying
  calls
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/rpc/svc.c

Modified: head/sys/rpc/svc.c
==
--- head/sys/rpc/svc.c  Tue May 24 19:52:05 2016(r300624)
+++ head/sys/rpc/svc.c  Tue May 24 20:06:41 2016(r300625)
@@ -847,9 +847,7 @@ svc_xprt_alloc()
SVCXPRT_EXT *ext;
 
xprt = mem_alloc(sizeof(SVCXPRT));
-   memset(xprt, 0, sizeof(SVCXPRT));
ext = mem_alloc(sizeof(SVCXPRT_EXT));
-   memset(ext, 0, sizeof(SVCXPRT_EXT));
xprt->xp_p3 = ext;
refcount_init(>xp_refs, 1);
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300624 - head/lib/libc/rpc

2016-05-24 Thread Garrett Cooper

Author: ngie
Date: Tue May 24 19:52:05 2016
New Revision: 300624
URL: https://svnweb.freebsd.org/changeset/base/300624

Log:
  Fix up r300385
  
  I accidentally glossed over the fact that tmp is manipulated via strchr, so
  if we tried to free `tmp` after r300385, it would have crashed.
  
  Create a separate pointer (tmp2) to track the original allocation of `tmp`,
  and free `tmp2` if `p->nc_lookups` can't be malloced
  
  MFC after: 4 days
  X-MFC with: r300385
  Reported by: Coverity
  CID: 1356026
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/lib/libc/rpc/getnetconfig.c

Modified: head/lib/libc/rpc/getnetconfig.c
==
--- head/lib/libc/rpc/getnetconfig.cTue May 24 19:26:58 2016
(r300623)
+++ head/lib/libc/rpc/getnetconfig.cTue May 24 19:52:05 2016
(r300624)
@@ -692,7 +692,7 @@ static struct netconfig *
 dup_ncp(struct netconfig *ncp)
 {
 struct netconfig   *p;
-char   *tmp;
+char   *tmp, *tmp2;
 u_int  i;
 
 if ((tmp=malloc(MAXNETCONFIGLINE)) == NULL)
@@ -701,6 +701,7 @@ dup_ncp(struct netconfig *ncp)
free(tmp);
return(NULL);
 }
+tmp2 = tmp;
 /*
  * First we dup all the data from matched netconfig buffer.  Then we
  * adjust some of the member pointer to a pre-allocated buffer where
@@ -722,7 +723,7 @@ dup_ncp(struct netconfig *ncp)
 if (p->nc_lookups == NULL) {
free(p->nc_netid);
free(p);
-   free(tmp);
+   free(tmp2);
return(NULL);
 }
 for (i=0; i < p->nc_nlookups; i++) {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300621 - head/lib/libc/rpc

2016-05-24 Thread Garrett Cooper

Author: ngie
Date: Tue May 24 18:53:06 2016
New Revision: 300621
URL: https://svnweb.freebsd.org/changeset/base/300621

Log:
  Remove redundant NULLing of outbuf_pmap
  
  If reallocf ever failed, outbuf_pmap would already be NULL
  
  MFC after: 1 week
  X-MFC with: r300620
  Reported by: cem
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/lib/libc/rpc/clnt_bcast.c

Modified: head/lib/libc/rpc/clnt_bcast.c
==
--- head/lib/libc/rpc/clnt_bcast.c  Tue May 24 18:44:50 2016
(r300620)
+++ head/lib/libc/rpc/clnt_bcast.c  Tue May 24 18:53:06 2016
(r300621)
@@ -348,7 +348,6 @@ rpc_broadcast_exp(rpcprog_t prog, rpcver
udpbufsz = fdlist[fdlistno].dsize;
outbuf_pmap = reallocf(outbuf_pmap, udpbufsz);
if (outbuf_pmap == NULL) {
-   outbuf_pmap = NULL;
_close(fd);
stat = RPC_SYSTEMERROR;
goto done_broad;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300620 - head/lib/libc/rpc

2016-05-24 Thread Garrett Cooper

Author: ngie
Date: Tue May 24 18:44:50 2016
New Revision: 300620
URL: https://svnweb.freebsd.org/changeset/base/300620

Log:
  Use reallocf instead of malloc to fix leak with outbuf_pmap
  
  The previous code overwrote outbuf_pmap's memory with malloc once per
  loop iteration, which leaked its memory; use reallocf instead to ensure
  that memory is properly free'd each loop iteration.
  
  Add a outbuf_pmap = NULL in the failure case to avoid a double-free
  at the bottom of the function.
  
  Differential Revision: https://reviews.freebsd.org/D6495
  MFC after: 1 week
  Reported by: Coverity
  CID: 1038776
  Reviewed by: markj, pfgj
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/lib/libc/rpc/clnt_bcast.c

Modified: head/lib/libc/rpc/clnt_bcast.c
==
--- head/lib/libc/rpc/clnt_bcast.c  Tue May 24 17:38:27 2016
(r300619)
+++ head/lib/libc/rpc/clnt_bcast.c  Tue May 24 18:44:50 2016
(r300620)
@@ -346,7 +346,9 @@ rpc_broadcast_exp(rpcprog_t prog, rpcver
 #ifdef PORTMAP
if (si.si_af == AF_INET && si.si_proto == IPPROTO_UDP) {
udpbufsz = fdlist[fdlistno].dsize;
-   if ((outbuf_pmap = malloc(udpbufsz)) == NULL) {
+   outbuf_pmap = reallocf(outbuf_pmap, udpbufsz);
+   if (outbuf_pmap == NULL) {
+   outbuf_pmap = NULL;
_close(fd);
stat = RPC_SYSTEMERROR;
goto done_broad;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300428 - head/usr.bin/kdump

2016-05-22 Thread Garrett Cooper

Author: ngie
Date: Sun May 22 18:20:45 2016
New Revision: 300428
URL: https://svnweb.freebsd.org/changeset/base/300428

Log:
  Fix humanized decoding of struct stat with respect to .st_mtim
  
  st_mtim was being incorrectly described as "stime=", not "mtime=". This was
  introduced with the original feature commit (r176471).
  
  MFC after: 1 week
  PR: 209699
  Submitted by: naddy
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.bin/kdump/kdump.c

Modified: head/usr.bin/kdump/kdump.c
==
--- head/usr.bin/kdump/kdump.c  Sun May 22 18:16:25 2016(r300427)
+++ head/usr.bin/kdump/kdump.c  Sun May 22 18:20:45 2016(r300428)
@@ -1688,7 +1688,7 @@ ktrstat(struct stat *statp)
printf(".%09ld, ", statp->st_atim.tv_nsec);
else
printf(", ");
-   printf("stime=");
+   printf("mtime=");
if (resolv == 0)
printf("%jd", (intmax_t)statp->st_mtim.tv_sec);
else {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300395 - head/contrib/top

2016-05-21 Thread Garrett Cooper

Author: ngie
Date: Sun May 22 04:17:00 2016
New Revision: 300395
URL: https://svnweb.freebsd.org/changeset/base/300395

Log:
  Silence top(1) compiler warnings
  
  The contrib/top code is no longer maintained upstream (last pulled 16 years
  ago). The K followed by the code spews -Wimplicit-int and 
-Wreturn-type
  warnings, amongst others. This silences 131 warnings with as little 
modification
  as possible by adding necessary return types, definitions, headers, and header
  guards, and missing header includes.
  
  The 5 warnings that remain are due to undeclared ncurses references. I didn't
  include curses.h and term.h because there are several local functions and 
macros
  that conflict with those definitions.
  
  MFC after: 3 weeks
  Reviewed by: cem, ngie
  Submitted by: Randy Westlund 
  Differential Revision: https://reviews.freebsd.org/D6468

Added:
  head/contrib/top/commands.h   (contents, props changed)
  head/contrib/top/username.h   (contents, props changed)
Modified:
  head/contrib/top/commands.c
  head/contrib/top/display.c
  head/contrib/top/display.h
  head/contrib/top/machine.h
  head/contrib/top/screen.c
  head/contrib/top/screen.h
  head/contrib/top/top.c
  head/contrib/top/top.h
  head/contrib/top/username.c
  head/contrib/top/utils.h
  head/contrib/top/version.c

Modified: head/contrib/top/commands.c
==
--- head/contrib/top/commands.c Sun May 22 04:09:05 2016(r300394)
+++ head/contrib/top/commands.c Sun May 22 04:17:00 2016(r300395)
@@ -19,16 +19,21 @@
  */
 
 #include "os.h"
-#include 
-#include 
-#include 
+
 #include 
 #include 
 
+#include 
+#include 
+#include 
+#include 
+
+#include "commands.h"
 #include "sigdesc.h"   /* generated automatically */
 #include "top.h"
 #include "boolean.h"
 #include "utils.h"
+#include "machine.h"
 
 extern int  errno;
 
@@ -39,12 +44,15 @@ extern int overstrike;
 
 int err_compar();
 char *err_string();
+static int str_adderr(char *str, int len, int err);
+static int str_addarg(char *str, int len, char *arg, int first);
 
 /*
  *  show_help() - display the help screen; invoked in response to
  * either 'h' or '?'.
  */
 
+void
 show_help()
 
 {
@@ -123,6 +131,7 @@ register char *str;
 return(*str == '\0' ? NULL : str);
 }
 
+int
 scanint(str, intp)
 
 char *str;
@@ -262,6 +271,7 @@ char *err_string()
  * the string "str".
  */
 
+static int
 str_adderr(str, len, err)
 
 char *str;
@@ -289,6 +299,7 @@ int err;
  * is set (indicating that a comma should NOT be added to the front).
  */
 
+static int
 str_addarg(str, len, arg, first)
 
 char *str;
@@ -321,6 +332,7 @@ int  first;
  * for sorting errors.
  */
 
+int
 err_compar(p1, p2)
 
 register struct errs *p1, *p2;
@@ -339,6 +351,7 @@ register struct errs *p1, *p2;
  *  error_count() - return the number of errors currently logged.
  */
 
+int
 error_count()
 
 {
@@ -349,6 +362,7 @@ error_count()
  *  show_errors() - display on stdout the current log of errors.
  */
 
+void
 show_errors()
 
 {

Added: head/contrib/top/commands.h
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/contrib/top/commands.h Sun May 22 04:17:00 2016(r300395)
@@ -0,0 +1,21 @@
+/*
+ *  Top users/processes display for Unix
+ *  Version 3
+ *
+ *  This program may be freely redistributed,
+ *  but this entire comment MUST remain intact.
+ *
+ *  Copyright (c) 1984, 1989, William LeFebvre, Rice University
+ *  Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
+ *  Copyright (c) 2016, Randy Westlund
+ *
+ * $FreeBSD$
+ */
+#ifndef COMMANDS_H
+#define COMMANDS_H
+
+void   show_errors(void);
+interror_count(void);
+void   show_help(void);
+
+#endif /* COMMANDS_H */

Modified: head/contrib/top/display.c
==
--- head/contrib/top/display.c  Sun May 22 04:09:05 2016(r300394)
+++ head/contrib/top/display.c  Sun May 22 04:17:00 2016(r300395)
@@ -29,9 +29,12 @@
  */
 
 #include "os.h"
+
+#include 
+
 #include 
 #include 
-#include 
+#include 
 
 #include "screen.h"/* interface to screen package */
 #include "layout.h"/* defines for screen position layout */
@@ -56,7 +59,6 @@ static int display_width = MAX_COLS;
 
 #define lineindex(l) ((l)*display_width)
 
-char *printable();
 
 /* things initialized by display_init and used thruout */
 
@@ -239,6 +241,7 @@ struct statics *statics;
 return(lines);
 }
 
+void
 i_loadave(mpid, avenrun)
 
 int mpid;
@@ -267,6 +270,7 @@ double *avenrun;
 lmpid = mpid;
 }
 
+void
 u_loadave(mpid, avenrun)
 
 int mpid;
@@ -306,6 +310,7 @@ double *avenrun;
 }
 }
 
+void
 i_timeofday(tod)
 
 time_t *tod;
@@ -351,6 +356,7 @@ static char procstates_buffer[MAX_COLS];
  *   lastline is

svn commit: r300389 - head/lib/libc/rpc

2016-05-21 Thread Garrett Cooper

Author: ngie
Date: Sun May 22 03:05:27 2016
New Revision: 300389
URL: https://svnweb.freebsd.org/changeset/base/300389

Log:
  nis_rpcent: don't leak resultbuf from yp_first(..)/yp_next(..)
  
  If the buffer couldn't be adequately resized to accomodate an additional "\n",
  it would leak resultbuf by breaking from the loop early
  
  MFC after: 2 weeks
  Reported by: Coverity
  CID: 1016702
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/lib/libc/rpc/getrpcent.c

Modified: head/lib/libc/rpc/getrpcent.c
==
--- head/lib/libc/rpc/getrpcent.c   Sun May 22 02:53:11 2016
(r300388)
+++ head/lib/libc/rpc/getrpcent.c   Sun May 22 03:05:27 2016
(r300389)
@@ -511,6 +511,7 @@ nis_rpcent(void *retval, void *mdata, va
sizeof(char *)) {
*errnop = ERANGE;
rv = NS_RETURN;
+   free(resultbuf);
break;
}
 
@@ -520,6 +521,7 @@ nis_rpcent(void *retval, void *mdata, va
if (aliases_size < 1) {
*errnop = ERANGE;
rv = NS_RETURN;
+   free(resultbuf);
break;
}
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300388 - head/lib/libc/rpc

2016-05-21 Thread Garrett Cooper

Author: ngie
Date: Sun May 22 02:53:11 2016
New Revision: 300388
URL: https://svnweb.freebsd.org/changeset/base/300388

Log:
  Call endnetconfig on nc_handle sooner to avoid leaking nc_handle if tmpnconf
  was NULL
  
  This would theoretically happen if the netconfig protocol family and protocol
  semantics were never matched.
  
  MFC after: 2 weeks
  Reported by: Coverity
  CID: 978179
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/lib/libc/rpc/rpcb_clnt.c

Modified: head/lib/libc/rpc/rpcb_clnt.c
==
--- head/lib/libc/rpc/rpcb_clnt.c   Sun May 22 02:24:38 2016
(r300387)
+++ head/lib/libc/rpc/rpcb_clnt.c   Sun May 22 02:53:11 2016
(r300388)
@@ -499,6 +499,7 @@ try_nconf:
hostname = IN6_LOCALHOST_STRING;
}
}
+   endnetconfig(nc_handle);
if (tmpnconf == NULL) {
rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
mutex_unlock(_lock);
@@ -506,7 +507,6 @@ try_nconf:
}
loopnconf = getnetconfigent(tmpnconf->nc_netid);
/* loopnconf is never freed */
-   endnetconfig(nc_handle);
}
mutex_unlock(_lock);
client = getclnthandle(hostname, loopnconf, NULL);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300386 - head/lib/libc/rpc

2016-05-21 Thread Garrett Cooper

Author: ngie
Date: Sun May 22 02:02:18 2016
New Revision: 300386
URL: https://svnweb.freebsd.org/changeset/base/300386

Log:
  Don't leak `handle` if svc_tp_create(..) succeeds and allocating a new
  struct xlist object fails
  
  MFC after: 1 week
  Reported by: Coverity
  CID: 978277
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/lib/libc/rpc/svc_generic.c

Modified: head/lib/libc/rpc/svc_generic.c
==
--- head/lib/libc/rpc/svc_generic.c Sun May 22 01:45:15 2016
(r300385)
+++ head/lib/libc/rpc/svc_generic.c Sun May 22 02:02:18 2016
(r300386)
@@ -122,7 +122,8 @@ svc_create(void (*dispatch)(struct svc_r
if (l == NULL) {
warnx("svc_create: no memory");
mutex_unlock(_lock);
-   return (0);
+   num = 0;
+   goto done;
}
l->xprt = xprt;
l->next = xprtlist;
@@ -132,6 +133,7 @@ svc_create(void (*dispatch)(struct svc_r
}
mutex_unlock(_lock);
}
+done:
__rpc_endconf(handle);
/*
 * In case of num == 0; the error messages are generated by the
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r300385 - head/lib/libc/rpc

2016-05-21 Thread Garrett Cooper

Author: ngie
Date: Sun May 22 01:45:15 2016
New Revision: 300385
URL: https://svnweb.freebsd.org/changeset/base/300385

Log:
  Don't leak `tmp` if `p->nc_lookups` can't be malloced
  
  MFC after: 1 week
  Reported by: cppcheck
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/lib/libc/rpc/getnetconfig.c

Modified: head/lib/libc/rpc/getnetconfig.c
==
--- head/lib/libc/rpc/getnetconfig.cSun May 22 00:29:25 2016
(r300384)
+++ head/lib/libc/rpc/getnetconfig.cSun May 22 01:45:15 2016
(r300385)
@@ -722,6 +722,7 @@ dup_ncp(struct netconfig *ncp)
 if (p->nc_lookups == NULL) {
free(p->nc_netid);
free(p);
+   free(tmp);
return(NULL);
 }
 for (i=0; i < p->nc_nlookups; i++) {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r299844 - head/etc/rc.d

2016-05-15 Thread Garrett Cooper

Author: ngie
Date: Sun May 15 06:00:13 2016
New Revision: 299844
URL: https://svnweb.freebsd.org/changeset/base/299844

Log:
  Make hostid_save depend on hostid
  
  MFC after: 2 weeks
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/rc.d/hostid_save

Modified: head/etc/rc.d/hostid_save
==
--- head/etc/rc.d/hostid_save   Sun May 15 05:45:54 2016(r299843)
+++ head/etc/rc.d/hostid_save   Sun May 15 06:00:13 2016(r299844)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: hostid_save
-# REQUIRE: root
+# REQUIRE: hostid root
 # KEYWORD: nojail
 
 . /etc/rc.subr
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r299843 - head/etc/rc.d

2016-05-14 Thread Garrett Cooper

Author: ngie
Date: Sun May 15 05:45:54 2016
New Revision: 299843
URL: https://svnweb.freebsd.org/changeset/base/299843

Log:
  Fix broken dependency with routed when MK_ROUTED != no
  
  Remove routed as a requirement in NETWORKING, and put it in routed as a BEFORE
  requirement instead
  
  MFC after: 2 weeks
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/rc.d/NETWORKING
  head/etc/rc.d/routed

Modified: head/etc/rc.d/NETWORKING
==
--- head/etc/rc.d/NETWORKINGSun May 15 05:38:47 2016(r299842)
+++ head/etc/rc.d/NETWORKINGSun May 15 05:45:54 2016(r299843)
@@ -5,7 +5,7 @@
 
 # PROVIDE: NETWORKING NETWORK
 # REQUIRE: netif netwait netoptions routing ppp ipfw stf
-# REQUIRE: defaultroute routed route6d resolv bridge
+# REQUIRE: defaultroute route6d resolv bridge
 # REQUIRE: static_arp static_ndp
 
 #  This is a dummy dependency, for services which require networking

Modified: head/etc/rc.d/routed
==
--- head/etc/rc.d/routedSun May 15 05:38:47 2016(r299842)
+++ head/etc/rc.d/routedSun May 15 05:45:54 2016(r299843)
@@ -5,6 +5,7 @@
 
 # PROVIDE: routed
 # REQUIRE: netif routing
+# BEFORE: NETWORK
 # KEYWORD: nojail
 
 . /etc/rc.subr
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r299842 - in head: etc/rc.d tools/build/mk

2016-05-14 Thread Garrett Cooper

Author: ngie
Date: Sun May 15 05:38:47 2016
New Revision: 299842
URL: https://svnweb.freebsd.org/changeset/base/299842

Log:
  Conditionalize installing etc/rc.d/atm{1,2,3}
  
  `BEFORE: netif` was already in etc/rc.d/atm1, so no additional changes
  are needed in that script
  
  MFC after: 2 weeks
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/rc.d/Makefile
  head/etc/rc.d/netif
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/etc/rc.d/Makefile
==
--- head/etc/rc.d/Makefile  Sun May 15 05:22:15 2016(r299841)
+++ head/etc/rc.d/Makefile  Sun May 15 05:38:47 2016(r299842)
@@ -14,9 +14,6 @@ FILES=DAEMON \
addswap \
adjkerntz \
archdep \
-   atm1 \
-   atm2 \
-   atm3 \
auditd \
auditdistd \
bgfsck \
@@ -157,6 +154,14 @@ APM+=  apmd
 APMPACKAGE=apm
 .endif
 
+.if ${MK_ATM} != "no"
+FILESGROUPS+=  ATM
+ATM+=  atm1
+ATM+=  atm2
+ATM+=  atm3
+ATMPACKAGE=atm
+.endif
+
 .if ${MK_AUTOFS} != "no"
 FILES+=automount
 FILES+=automountd

Modified: head/etc/rc.d/netif
==
--- head/etc/rc.d/netif Sun May 15 05:22:15 2016(r299841)
+++ head/etc/rc.d/netif Sun May 15 05:38:47 2016(r299842)
@@ -26,7 +26,7 @@
 #
 
 # PROVIDE: netif
-# REQUIRE: atm1 FILESYSTEMS iovctl serial sppp sysctl
+# REQUIRE: FILESYSTEMS iovctl serial sppp sysctl
 # REQUIRE: ipfilter ipfs
 # KEYWORD: nojailvnet
 

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc   Sun May 15 05:22:15 
2016(r299841)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc   Sun May 15 05:38:47 
2016(r299842)
@@ -76,6 +76,9 @@ OLD_FILES+=usr/share/man/man8/atrun.8.gz
 .endif
 
 .if ${MK_ATM} == no
+OLD_FILES+=etc/rc.d/atm1
+OLD_FILES+=etc/rc.d/atm2
+OLD_FILES+=etc/rc.d/atm3
 OLD_FILES+=rescue/atmconfig
 OLD_FILES+=sbin/atmconfig
 OLD_FILES+=usr/bin/sscop
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r299841 - head/tools/build/mk

2016-05-14 Thread Garrett Cooper

Author: ngie
Date: Sun May 15 05:22:15 2016
New Revision: 299841
URL: https://svnweb.freebsd.org/changeset/base/299841

Log:
  Remove etc/rc.d/{zfs,zvol} if MK_ZFS != no
  
  MFC after: 2 weeks
  X-MFC with: r299840
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc   Sun May 15 04:39:36 
2016(r299840)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc   Sun May 15 05:22:15 
2016(r299841)
@@ -1010,6 +1010,8 @@ OLD_DIRS+=usr/share/dtrace
 OLD_FILES+=boot/gptzfsboot
 OLD_FILES+=boot/zfsboot
 OLD_FILES+=boot/zfsloader
+OLD_FILES+=etc/rc.d/zfs
+OLD_FILES+=etc/rc.d/zvol
 OLD_FILES+=etc/devd/zfs.conf
 OLD_FILES+=etc/periodic/daily/404.status-zfs
 OLD_FILES+=etc/periodic/daily/800.scrub-zfs
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r299840 - head/etc/rc.d

2016-05-14 Thread Garrett Cooper

Author: ngie
Date: Sun May 15 04:39:36 2016
New Revision: 299840
URL: https://svnweb.freebsd.org/changeset/base/299840

Log:
  Conditionalize etc/rc.d/{zfs,zvol} install on MK_ZFS != no
  
  MFC after: 2 weeks
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/rc.d/Makefile

Modified: head/etc/rc.d/Makefile
==
--- head/etc/rc.d/Makefile  Sun May 15 04:38:50 2016(r299839)
+++ head/etc/rc.d/Makefile  Sun May 15 04:39:36 2016(r299840)
@@ -127,8 +127,6 @@ FILES=  DAEMON \
ypset \
ypupdated \
ypxfrd \
-   zfs \
-   zvol
 
 .if ${MK_ACCT} != "no"
 FILESGROUPS+=  ACCT
@@ -302,6 +300,13 @@ FILES+=hostapd
 FILES+=wpa_supplicant
 .endif
 
+.if ${MK_ZFS} != "no"
+FILESGROUPS+=  ZFS
+ZFS+=  zfs
+ZFS+=  zvol
+ZFSPACKAGE=zfs
+.endif
+
 .for fg in ${FILESGROUPS}
 ${fg}MODE?=${BINMODE}
 .endfor
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 1363 matches

Mail list logo