date:20100102

svn commit: r201379 - head/libexec/comsat

2010-01-02 Thread Ed Schouten

Author: ed
Date: Sat Jan  2 09:45:59 2010
New Revision: 201379
URL: http://svn.freebsd.org/changeset/base/201379

Log:
  Fix several warnings.
  
  - Add __unused keywords.
  - Don't shadow a global variable called cr.
  - Make the global cr variable const.

Modified:
  head/libexec/comsat/comsat.c

Modified: head/libexec/comsat/comsat.c
==
--- head/libexec/comsat/comsat.cSat Jan  2 06:12:04 2010
(r201378)
+++ head/libexec/comsat/comsat.cSat Jan  2 09:45:59 2010
(r201379)
@@ -85,7 +85,7 @@ void onalrm(int);
 void reapchildren(int);
 
 int
-main(int argc, char *argv[])
+main(int argc __unused, char *argv[] __unused)
 {
struct sockaddr_in from;
socklen_t fromlen;
@@ -132,16 +132,16 @@ main(int argc, char *argv[])
 }
 
 void
-reapchildren(int signo)
+reapchildren(int signo __unused)
 {
while (wait3(NULL, WNOHANG, NULL)  0);
 }
 
 void
-onalrm(int signo)
+onalrm(int signo __unused)
 {
-   static u_int utmpsize;  /* last malloced size for utmp */
-   static u_int utmpmtime; /* last modification time for utmp */
+   static off_t utmpsize;  /* last malloced size for utmp */
+   static time_t utmpmtime;/* last modification time for utmp */
struct stat statbf;
 
if (time(NULL) - lastmsgtime = MAXIDLE)
@@ -194,7 +194,7 @@ mailfor(char *name)
notify(utp, file, offset, folder);
 }
 
-static char *cr;
+static const char *cr;
 
 void
 notify(struct utmp *utp, char file[], off_t offset, int folder)
@@ -203,11 +203,11 @@ notify(struct utmp *utp, char file[], of
struct stat stb;
struct termios tio;
char tty[20], name[sizeof(utmp[0].ut_name) + 1];
-   const char *cr = utp-ut_line;
+   const char *line = utp-ut_line;
 
-   if (strncmp(cr, pts/, 4) == 0)
-   cr += 4;
-   if (strchr(cr, '/')) {
+   if (strncmp(line, pts/, 4) == 0)
+   line += 4;
+   if (strchr(line, '/')) {
/* A slash is an attempt to break security... */
syslog(LOG_AUTH | LOG_NOTICE, Unexpected `/' in `%s',
utp-ut_line);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201380 - in head/libexec: . atrun bootpd bootpd/tools fingerd getty mail.local mknetid pppoed rbootd revnetgroup rpc.rquotad rpc.rstatd rpc.rusersd rpc.rwalld rpc.sprayd rshd rtld-elf ...

2010-01-02 Thread Ed Schouten

Author: ed
Date: Sat Jan  2 09:50:19 2010
New Revision: 201380
URL: http://svn.freebsd.org/changeset/base/201380

Log:
  Make WARNS=6 the default for libexec/.
  
  Just like bin/ and sbin/, I think setting WARNS to the highest value
  possible will make it more attractive for people to fix warnings.
  
  - The WARNS variable is set in the Makefile in the directory of the
application itself, making it more likely that it will be removed out
of curiosity to see what happens.
  - New applications will most likely build with WARNS=6 out of the box,
because the author would more likely fix the warnings during
development than lower WARNS.
  
  Unfortunately almost all apps in libexec require a lowered value of
  WARNS.

Modified:
  head/libexec/Makefile.inc
  head/libexec/atrun/Makefile
  head/libexec/bootpd/Makefile
  head/libexec/bootpd/Makefile.inc
  head/libexec/bootpd/tools/Makefile.inc
  head/libexec/fingerd/Makefile
  head/libexec/getty/Makefile
  head/libexec/mail.local/Makefile
  head/libexec/mknetid/Makefile
  head/libexec/pppoed/Makefile
  head/libexec/rbootd/Makefile
  head/libexec/revnetgroup/Makefile
  head/libexec/rpc.rquotad/Makefile
  head/libexec/rpc.rstatd/Makefile
  head/libexec/rpc.rusersd/Makefile
  head/libexec/rpc.rwalld/Makefile
  head/libexec/rpc.sprayd/Makefile
  head/libexec/rshd/Makefile
  head/libexec/rtld-elf/Makefile
  head/libexec/smrsh/Makefile
  head/libexec/talkd/Makefile
  head/libexec/tcpd/Makefile
  head/libexec/tftp-proxy/Makefile
  head/libexec/tftpd/Makefile
  head/libexec/ulog-helper/Makefile
  head/libexec/ypxfr/Makefile

Modified: head/libexec/Makefile.inc
==
--- head/libexec/Makefile.inc   Sat Jan  2 09:45:59 2010(r201379)
+++ head/libexec/Makefile.inc   Sat Jan  2 09:50:19 2010(r201380)
@@ -2,4 +2,6 @@
 # $FreeBSD$
 
 BINDIR?=   /usr/libexec
+
+WARNS?=6
 WFORMAT?=  1

Modified: head/libexec/atrun/Makefile
==
--- head/libexec/atrun/Makefile Sat Jan  2 09:45:59 2010(r201379)
+++ head/libexec/atrun/Makefile Sat Jan  2 09:50:19 2010(r201380)
@@ -13,6 +13,8 @@ CLEANFILES= ${MAN}
 
 CFLAGS+=-I${MAINSRC} -I${.CURDIR}
 CFLAGS+=-DLOGIN_CAP -DPAM
+
+WARNS?=2
 WFORMAT=0
 
 DPADD= ${LIBPAM} ${LIBUTIL}

Modified: head/libexec/bootpd/Makefile
==
--- head/libexec/bootpd/MakefileSat Jan  2 09:45:59 2010
(r201379)
+++ head/libexec/bootpd/MakefileSat Jan  2 09:50:19 2010
(r201380)
@@ -5,6 +5,8 @@ PROG=   bootpd
 CFLAGS+= -DETC_ETHERS
 CFLAGS+= -DSYSLOG -DDEBUG -DVEND_CMU
 
+WARNS?=2
+
 SUBDIR= bootpgw tools
 
 SRCS=  bootpd.c dovend.c readfile.c hash.c dumptab.c \

Modified: head/libexec/bootpd/Makefile.inc
==
--- head/libexec/bootpd/Makefile.incSat Jan  2 09:45:59 2010
(r201379)
+++ head/libexec/bootpd/Makefile.incSat Jan  2 09:50:19 2010
(r201380)
@@ -1,3 +1,5 @@
 # $FreeBSD$
 
 BINDIR?=   /usr/libexec
+
+WARNS?=1

Modified: head/libexec/bootpd/tools/Makefile.inc
==
--- head/libexec/bootpd/tools/Makefile.inc  Sat Jan  2 09:45:59 2010
(r201379)
+++ head/libexec/bootpd/tools/Makefile.inc  Sat Jan  2 09:50:19 2010
(r201380)
@@ -2,3 +2,5 @@
 # $FreeBSD$
 
 BINDIR=/usr/sbin
+
+WARNS?=1

Modified: head/libexec/fingerd/Makefile
==
--- head/libexec/fingerd/Makefile   Sat Jan  2 09:45:59 2010
(r201379)
+++ head/libexec/fingerd/Makefile   Sat Jan  2 09:50:19 2010
(r201380)
@@ -5,8 +5,8 @@ PROG=   fingerd
 DPADD= ${LIBUTIL}
 LDADD= -lutil
 MAN=   fingerd.8
-WARNS?=2
 
+WARNS?=2
 WFORMAT=0
 
 .include bsd.prog.mk

Modified: head/libexec/getty/Makefile
==
--- head/libexec/getty/Makefile Sat Jan  2 09:45:59 2010(r201379)
+++ head/libexec/getty/Makefile Sat Jan  2 09:50:19 2010(r201380)
@@ -6,6 +6,8 @@ SRCS=   main.c init.c subr.c chat.c
 DPADD= ${LIBUTIL}
 LDADD= -lutil
 MAN=   gettytab.5 ttys.5 getty.8
+
+WARNS?=1
 WFORMAT=0
 
 .include bsd.prog.mk

Modified: head/libexec/mail.local/Makefile
==
--- head/libexec/mail.local/MakefileSat Jan  2 09:45:59 2010
(r201379)
+++ head/libexec/mail.local/MakefileSat Jan  2 09:50:19 2010
(r201380)
@@ -8,6 +8,8 @@ PROG=   mail.local
 SRCS=  mail.local.c
 MAN=   mail.local.8
 CFLAGS+=-I${SENDMAIL_DIR}/include -I.
+
+WARNS?=2
 WFORMAT=0
 
 LIBSMDIR=

svn commit: r201381 - in head: lib lib/csu lib/csu/arm lib/csu/i386-elf lib/csu/mips lib/libarchive lib/libauditd lib/libautofs lib/libbegemot lib/libbsm lib/libbz2 lib/libcalendar lib/libcam lib/l...

2010-01-02 Thread Ed Schouten

Author: ed
Date: Sat Jan  2 09:58:07 2010
New Revision: 201381
URL: http://svn.freebsd.org/changeset/base/201381

Log:
  Build lib/ with WARNS=6 by default.
  
  Similar to libexec/, do the same with lib/. Make WARNS=6 the norm and
  lower it when needed.
  
  I'm setting WARNS?=0 for secure/. It seems secure/ includes the
  Makefile.inc provided by lib/. I'm not going to touch that directory.
  Most of the code there is contributed anyway.

Modified:
  head/lib/Makefile.inc
  head/lib/csu/Makefile.inc
  head/lib/csu/arm/Makefile
  head/lib/csu/i386-elf/Makefile
  head/lib/csu/mips/Makefile
  head/lib/libarchive/Makefile
  head/lib/libauditd/Makefile
  head/lib/libautofs/Makefile
  head/lib/libbegemot/Makefile
  head/lib/libbsm/Makefile
  head/lib/libbz2/Makefile
  head/lib/libcalendar/Makefile
  head/lib/libcam/Makefile
  head/lib/libcompat/Makefile
  head/lib/libcrypt/Makefile
  head/lib/libdevinfo/Makefile
  head/lib/libdevstat/Makefile
  head/lib/libdwarf/Makefile
  head/lib/libedit/Makefile
  head/lib/libelf/Makefile
  head/lib/libexpat/Makefile
  head/lib/libftpio/Makefile
  head/lib/libgpib/Makefile
  head/lib/libgssapi/Makefile
  head/lib/libipsec/Makefile
  head/lib/libipx/Makefile
  head/lib/libjail/Makefile
  head/lib/libkiconv/Makefile
  head/lib/libkvm/Makefile
  head/lib/libmagic/Makefile
  head/lib/libmd/Makefile
  head/lib/libmilter/Makefile
  head/lib/libmp/Makefile
  head/lib/libncp/Makefile
  head/lib/libngatm/Makefile
  head/lib/libopie/Makefile
  head/lib/libpam/modules/Makefile.inc
  head/lib/libpam/modules/pam_exec/Makefile
  head/lib/libpam/modules/pam_krb5/Makefile
  head/lib/libpam/modules/pam_radius/Makefile
  head/lib/libpam/modules/pam_ssh/Makefile
  head/lib/libpcap/Makefile
  head/lib/libpmc/Makefile
  head/lib/libproc/Makefile
  head/lib/libradius/Makefile
  head/lib/librpcsec_gss/Makefile
  head/lib/librt/Makefile
  head/lib/libsbuf/Makefile
  head/lib/libsm/Makefile
  head/lib/libsmdb/Makefile
  head/lib/libsmutil/Makefile
  head/lib/libstand/Makefile
  head/lib/libtacplus/Makefile
  head/lib/libthread_db/Makefile
  head/lib/libufs/Makefile
  head/lib/libugidfw/Makefile
  head/lib/libulog/Makefile
  head/lib/libusb/Makefile
  head/lib/libutil/Makefile
  head/lib/libvgl/Makefile
  head/lib/libwrap/Makefile
  head/lib/liby/Makefile
  head/lib/libypclnt/Makefile
  head/lib/libz/Makefile
  head/lib/ncurses/Makefile.inc
  head/secure/Makefile.inc

Modified: head/lib/Makefile.inc
==
--- head/lib/Makefile.inc   Sat Jan  2 09:50:19 2010(r201380)
+++ head/lib/Makefile.inc   Sat Jan  2 09:58:07 2010(r201381)
@@ -1,3 +1,5 @@
 # $FreeBSD$
 # Default version for system libs (override in lib/Makefile if necessary)
 SHLIB_MAJOR?= 5
+
+WARNS?=6

Modified: head/lib/csu/Makefile.inc
==
--- head/lib/csu/Makefile.inc   Sat Jan  2 09:50:19 2010(r201380)
+++ head/lib/csu/Makefile.inc   Sat Jan  2 09:58:07 2010(r201381)
@@ -1,3 +1,5 @@
 # $FreeBSD$
 
 SSP_CFLAGS=
+
+WARNS?=6

Modified: head/lib/csu/arm/Makefile
==
--- head/lib/csu/arm/Makefile   Sat Jan  2 09:50:19 2010(r201380)
+++ head/lib/csu/arm/Makefile   Sat Jan  2 09:58:07 2010(r201381)
@@ -9,6 +9,8 @@ CFLAGS+=-Wall -Wno-unused \
-I${.CURDIR}/../common \
-I${.CURDIR}/../../libc/include
 
+WARNS?=2
+
 all: ${OBJS}
 
 CLEANFILES=${OBJS}

Modified: head/lib/csu/i386-elf/Makefile
==
--- head/lib/csu/i386-elf/Makefile  Sat Jan  2 09:50:19 2010
(r201380)
+++ head/lib/csu/i386-elf/Makefile  Sat Jan  2 09:58:07 2010
(r201381)
@@ -8,7 +8,6 @@ FILESOWN=   ${LIBOWN}
 FILESGRP=  ${LIBGRP}
 FILESMODE= ${LIBMODE}
 FILESDIR=  ${LIBDIR}
-WARNS?=6
 CFLAGS+=   -I${.CURDIR}/../common \
-I${.CURDIR}/../../libc/include
 CLEANFILES=${FILES} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o

Modified: head/lib/csu/mips/Makefile
==
--- head/lib/csu/mips/Makefile  Sat Jan  2 09:50:19 2010(r201380)
+++ head/lib/csu/mips/Makefile  Sat Jan  2 09:58:07 2010(r201381)
@@ -9,6 +9,8 @@ CFLAGS+=-Wall -Wno-unused \
-I${.CURDIR}/../common \
-I${.CURDIR}/../../libc/include
 
+WARNS?=2
+
 all: ${OBJS}
 
 CLEANFILES=${OBJS}

Modified: head/lib/libarchive/Makefile
==
--- head/lib/libarchive/MakefileSat Jan  2 09:50:19 2010
(r201380)
+++ head/lib/libarchive/MakefileSat Jan  2 09:58:07 2010
(r201381)
@@ -22,8 +22,6 @@ DPADD+=

svn commit: r201382 - in head/usr.bin: ar at banner biff lam login renice rpcgen showmount tail

2010-01-02 Thread Ed Schouten

Author: ed
Date: Sat Jan  2 10:09:20 2010
New Revision: 201382
URL: http://svn.freebsd.org/changeset/base/201382

Log:
  ANSIfy various tools in usr.bin/.
  
  Most of these tools properly build at WARNS=6, except for their KR
  function declarations. Fix this, so we can bump WARNS as well.

Modified:
  head/usr.bin/ar/acpyacc.y
  head/usr.bin/ar/ar.c
  head/usr.bin/at/at.c
  head/usr.bin/banner/banner.c
  head/usr.bin/biff/biff.c
  head/usr.bin/lam/lam.c
  head/usr.bin/login/login.c
  head/usr.bin/login/login_fbtab.c
  head/usr.bin/renice/renice.c
  head/usr.bin/rpcgen/rpc_hout.c
  head/usr.bin/rpcgen/rpc_main.c
  head/usr.bin/showmount/showmount.c
  head/usr.bin/tail/misc.c

Modified: head/usr.bin/ar/acpyacc.y
==
--- head/usr.bin/ar/acpyacc.y   Sat Jan  2 09:58:07 2010(r201381)
+++ head/usr.bin/ar/acpyacc.y   Sat Jan  2 10:09:20 2010(r201382)
@@ -414,7 +414,7 @@ arscp_extract(struct list *list)
 
 /* List modules of archive. (Simple Mode) */
 static void
-arscp_list()
+arscp_list(void)
 {
 
if (!arscp_target_exist())
@@ -483,7 +483,7 @@ arscp_replace(struct list *list)
 
 /* Rename the temporary archive to the target archive. */
 static void
-arscp_save()
+arscp_save(void)
 {
mode_t mask;
 
@@ -512,7 +512,7 @@ arscp_save()
  * invoking CREATE cmd on current archive.
  */
 static void
-arscp_clear()
+arscp_clear(void)
 {
char*new_target;
 
@@ -549,7 +549,7 @@ arscp_end(int eval)
  * issued by user.
  */
 static int
-arscp_target_exist()
+arscp_target_exist(void)
 {
 
if (target)
@@ -624,7 +624,7 @@ arscp_mlist2argv(struct list *list)
 
 /* Free space allocated for argv array and its elements. */
 static void
-arscp_free_argv()
+arscp_free_argv(void)
 {
int i;
 
@@ -636,7 +636,7 @@ arscp_free_argv()
 
 /* Show a prompt if we are in interactive mode */
 static void
-arscp_prompt()
+arscp_prompt(void)
 {
 
if (interactive) {

Modified: head/usr.bin/ar/ar.c
==
--- head/usr.bin/ar/ar.cSat Jan  2 09:58:07 2010(r201381)
+++ head/usr.bin/ar/ar.cSat Jan  2 10:09:20 2010(r201382)
@@ -349,7 +349,7 @@ only_mode(struct bsdar *bsdar, const cha
 }
 
 static void
-bsdar_usage()
+bsdar_usage(void)
 {
 
(void)fprintf(stderr, usage:  ar -d [-Tjsvz] archive file ...\n);
@@ -367,7 +367,7 @@ bsdar_usage()
 }
 
 static void
-ranlib_usage()
+ranlib_usage(void)
 {
 
(void)fprintf(stderr, usage:   ranlib [-t] archive ...\n);
@@ -376,14 +376,14 @@ ranlib_usage()
 }
 
 static void
-bsdar_version()
+bsdar_version(void)
 {
(void)printf(BSD ar %s - %s\n, BSDAR_VERSION, archive_version());
exit(EX_OK);
 }
 
 static void
-ranlib_version()
+ranlib_version(void)
 {
(void)printf(ranlib %s - %s\n, BSDAR_VERSION, archive_version());
exit(EX_OK);

Modified: head/usr.bin/at/at.c
==
--- head/usr.bin/at/at.cSat Jan  2 09:58:07 2010(r201381)
+++ head/usr.bin/at/at.cSat Jan  2 10:09:20 2010(r201382)
@@ -179,7 +179,7 @@ static char *cwdname(void)
 }
 
 static long
-nextjob()
+nextjob(void)
 {
 long jobno;
 FILE *fid;

Modified: head/usr.bin/banner/banner.c
==
--- head/usr.bin/banner/banner.cSat Jan  2 09:58:07 2010
(r201381)
+++ head/usr.bin/banner/banner.cSat Jan  2 10:09:20 2010
(r201382)
@@ -1178,7 +1178,7 @@ main(int argc, char *argv[])
 }
 
 static void
-usage()
+usage(void)
 {
fprintf(stderr, usage: banner [-d] [-t] [-w width] message ...\n);
exit(1);

Modified: head/usr.bin/biff/biff.c
==
--- head/usr.bin/biff/biff.cSat Jan  2 09:58:07 2010(r201381)
+++ head/usr.bin/biff/biff.cSat Jan  2 10:09:20 2010(r201382)
@@ -110,7 +110,7 @@ main(int argc, char *argv[])
 }
 
 static void
-usage()
+usage(void)
 {
(void)fprintf(stderr, usage: biff [n | y | b]\n);
exit(2);

Modified: head/usr.bin/lam/lam.c
==
--- head/usr.bin/lam/lam.c  Sat Jan  2 09:58:07 2010(r201381)
+++ head/usr.bin/lam/lam.c  Sat Jan  2 10:09:20 2010(r201382)
@@ -221,7 +221,7 @@ gatherline(struct openfile *ip)
 }
 
 static void
-usage()
+usage(void)
 {
fprintf(stderr, %s\n%s\n,
 usage: lam [ -f min.max ] [ -s sepstring ] [ -t c ] file ...,

Modified: head/usr.bin/login/login.c
==
--- head/usr.bin/login/login.c  Sat Jan  2 09:58:07 2010(r201381)
+++ head/usr.bin/login/login.c  Sat Jan  2 10:09:20 2010(r201382)
@@ -737,7 +737,7 @@

svn commit: r201383 - head/usr.bin/gprof

2010-01-02 Thread Ed Schouten

Author: ed
Date: Sat Jan  2 10:12:12 2010
New Revision: 201383
URL: http://svn.freebsd.org/changeset/base/201383

Log:
  Add missing #include for string routines.

Modified:
  head/usr.bin/gprof/aout.c

Modified: head/usr.bin/gprof/aout.c
==
--- head/usr.bin/gprof/aout.c   Sat Jan  2 10:09:20 2010(r201382)
+++ head/usr.bin/gprof/aout.c   Sat Jan  2 10:12:12 2010(r201383)
@@ -45,6 +45,7 @@ __FBSDID($FreeBSD$);
 
 #include a.out.h
 #include err.h
+#include string.h
 
 #include gprof.h
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201384 - head/usr.bin/script

2010-01-02 Thread Ed Schouten

Author: ed
Date: Sat Jan  2 10:13:21 2010
New Revision: 201384
URL: http://svn.freebsd.org/changeset/base/201384

Log:
  Remove a warning by adding extra parentheses.
  
  GCC generates warnings when using if (foo = bar). In this case its use
  is valid.

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

Modified: head/usr.bin/script/script.c
==
--- head/usr.bin/script/script.cSat Jan  2 10:12:12 2010
(r201383)
+++ head/usr.bin/script/script.cSat Jan  2 10:13:21 2010
(r201384)
@@ -126,7 +126,7 @@ main(int argc, char *argv[])
if ((fscript = fopen(fname, aflg ? a : w)) == NULL)
err(1, %s, fname);
 
-   if (ttyflg = isatty(STDIN_FILENO)) {
+   if ((ttyflg = isatty(STDIN_FILENO)) != 0) {
if (tcgetattr(STDIN_FILENO, tt) == -1)
err(1, tcgetattr);
if (ioctl(STDIN_FILENO, TIOCGWINSZ, win) == -1)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201385 - in head/usr.bin: passwd sockstat

2010-01-02 Thread Ed Schouten

Author: ed
Date: Sat Jan  2 10:14:35 2010
New Revision: 201385
URL: http://svn.freebsd.org/changeset/base/201385

Log:
  Mute some warnings on uninitialized variables.
  
  The code does the right thing, but the compiler is unable to figure it
  out. All paths that use that variable use the same invariant.

Modified:
  head/usr.bin/passwd/passwd.c
  head/usr.bin/sockstat/sockstat.c

Modified: head/usr.bin/passwd/passwd.c
==
--- head/usr.bin/passwd/passwd.cSat Jan  2 10:13:21 2010
(r201384)
+++ head/usr.bin/passwd/passwd.cSat Jan  2 10:14:35 2010
(r201385)
@@ -67,7 +67,7 @@ int
 main(int argc, char *argv[])
 {
char hostname[MAXHOSTNAMELEN];
-   struct passwd *pwd;
+   struct passwd *pwd = NULL; /* Keep compiler happy. */
int o, pam_err;
uid_t uid;
 

Modified: head/usr.bin/sockstat/sockstat.c
==
--- head/usr.bin/sockstat/sockstat.cSat Jan  2 10:13:21 2010
(r201384)
+++ head/usr.bin/sockstat/sockstat.cSat Jan  2 10:14:35 2010
(r201385)
@@ -496,8 +496,8 @@ printaddr(int af, struct sockaddr_storag
 {
char addrstr[INET6_ADDRSTRLEN] = { '\0', '\0' };
struct sockaddr_un *sun;
-   void *addr;
-   int off, port;
+   void *addr = NULL; /* Keep compiler happy. */
+   int off, port = 0;
 
switch (af) {
case AF_INET:
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201386 - in head/usr.bin: . apply ar at atm/sscop awk bluetooth/bthost bsdiff bzip2 calendar catman chkey chpass colldef compile_et compress cpio cpio/test cpuset ctags dig du elf2aout...

2010-01-02 Thread Ed Schouten

Author: ed
Date: Sat Jan  2 10:27:05 2010
New Revision: 201386
URL: http://svn.freebsd.org/changeset/base/201386

Log:
  Build usr.bin/ with WARNS=6 by default.
  
  Also add some missing $FreeBSD$ to keep svn happy.

Modified:
  head/usr.bin/Makefile.inc
  head/usr.bin/apply/Makefile
  head/usr.bin/ar/Makefile
  head/usr.bin/at/Makefile
  head/usr.bin/atm/sscop/Makefile
  head/usr.bin/awk/Makefile
  head/usr.bin/bluetooth/bthost/Makefile
  head/usr.bin/bsdiff/Makefile.inc
  head/usr.bin/bzip2/Makefile
  head/usr.bin/calendar/Makefile
  head/usr.bin/catman/Makefile
  head/usr.bin/chkey/Makefile
  head/usr.bin/chpass/Makefile
  head/usr.bin/colldef/Makefile
  head/usr.bin/compile_et/Makefile
  head/usr.bin/compress/Makefile
  head/usr.bin/cpio/Makefile
  head/usr.bin/cpio/test/Makefile
  head/usr.bin/cpuset/Makefile
  head/usr.bin/ctags/Makefile
  head/usr.bin/dig/Makefile
  head/usr.bin/du/Makefile
  head/usr.bin/elf2aout/Makefile
  head/usr.bin/elfdump/Makefile
  head/usr.bin/env/Makefile
  head/usr.bin/fetch/Makefile
  head/usr.bin/file2c/Makefile
  head/usr.bin/find/Makefile
  head/usr.bin/finger/Makefile
  head/usr.bin/fstat/Makefile
  head/usr.bin/fsync/Makefile
  head/usr.bin/ftp/Makefile
  head/usr.bin/gcore/Makefile
  head/usr.bin/gencat/Makefile
  head/usr.bin/getent/Makefile
  head/usr.bin/gprof/Makefile
  head/usr.bin/gzip/Makefile
  head/usr.bin/head/Makefile
  head/usr.bin/hexdump/Makefile
  head/usr.bin/host/Makefile
  head/usr.bin/id/Makefile
  head/usr.bin/ipcrm/Makefile
  head/usr.bin/ipcs/Makefile
  head/usr.bin/kdump/Makefile
  head/usr.bin/keylogin/Makefile
  head/usr.bin/ktrace/Makefile
  head/usr.bin/ktrdump/Makefile
  head/usr.bin/last/Makefile
  head/usr.bin/lastcomm/Makefile
  head/usr.bin/ldd/Makefile
  head/usr.bin/leave/Makefile
  head/usr.bin/less/Makefile.common
  head/usr.bin/lex/Makefile
  head/usr.bin/lex/lib/Makefile
  head/usr.bin/limits/Makefile
  head/usr.bin/locate/Makefile.inc
  head/usr.bin/locate/locate/Makefile
  head/usr.bin/lock/Makefile
  head/usr.bin/logger/Makefile
  head/usr.bin/login/Makefile
  head/usr.bin/logins/Makefile
  head/usr.bin/logname/Makefile
  head/usr.bin/look/Makefile
  head/usr.bin/lsvfs/Makefile
  head/usr.bin/m4/Makefile
  head/usr.bin/mail/Makefile
  head/usr.bin/make/Makefile
  head/usr.bin/minigzip/Makefile
  head/usr.bin/mkfifo/Makefile
  head/usr.bin/mklocale/Makefile
  head/usr.bin/mkstr/Makefile
  head/usr.bin/mkuzip/Makefile
  head/usr.bin/msgs/Makefile
  head/usr.bin/nc/Makefile
  head/usr.bin/ncplist/Makefile
  head/usr.bin/newkey/Makefile
  head/usr.bin/nfsstat/Makefile
  head/usr.bin/nl/Makefile
  head/usr.bin/nohup/Makefile
  head/usr.bin/nslookup/Makefile
  head/usr.bin/nsupdate/Makefile
  head/usr.bin/opieinfo/Makefile
  head/usr.bin/opiekey/Makefile
  head/usr.bin/opiepasswd/Makefile
  head/usr.bin/passwd/Makefile
  head/usr.bin/pr/Makefile
  head/usr.bin/printf/Makefile
  head/usr.bin/procstat/Makefile
  head/usr.bin/revoke/Makefile
  head/usr.bin/rlogin/Makefile
  head/usr.bin/rpcgen/Makefile
  head/usr.bin/rpcinfo/Makefile
  head/usr.bin/rsh/Makefile
  head/usr.bin/rup/Makefile
  head/usr.bin/ruptime/Makefile
  head/usr.bin/rusers/Makefile
  head/usr.bin/rwho/Makefile
  head/usr.bin/sed/Makefile
  head/usr.bin/smbutil/Makefile
  head/usr.bin/sockstat/Makefile
  head/usr.bin/su/Makefile
  head/usr.bin/systat/Makefile
  head/usr.bin/tail/Makefile
  head/usr.bin/tar/Makefile
  head/usr.bin/tar/test/Makefile
  head/usr.bin/tcopy/Makefile
  head/usr.bin/telnet/Makefile
  head/usr.bin/time/Makefile
  head/usr.bin/top/Makefile
  head/usr.bin/tr/Makefile
  head/usr.bin/truss/Makefile
  head/usr.bin/unifdef/Makefile
  head/usr.bin/unzip/Makefile
  head/usr.bin/users/Makefile
  head/usr.bin/uudecode/Makefile
  head/usr.bin/uuencode/Makefile
  head/usr.bin/vacation/Makefile
  head/usr.bin/vgrind/Makefile
  head/usr.bin/vi/Makefile
  head/usr.bin/vmstat/Makefile
  head/usr.bin/w/Makefile
  head/usr.bin/wall/Makefile
  head/usr.bin/wc/Makefile
  head/usr.bin/whereis/Makefile
  head/usr.bin/who/Makefile
  head/usr.bin/write/Makefile
  head/usr.bin/xargs/Makefile
  head/usr.bin/xinstall/Makefile
  head/usr.bin/xlint/xlint/Makefile
  head/usr.bin/yacc/Makefile
  head/usr.bin/ypcat/Makefile
  head/usr.bin/ypmatch/Makefile
  head/usr.bin/ypwhich/Makefile

Modified: head/usr.bin/Makefile.inc
==
--- head/usr.bin/Makefile.inc   Sat Jan  2 10:14:35 2010(r201385)
+++ head/usr.bin/Makefile.inc   Sat Jan  2 10:27:05 2010(r201386)
@@ -3,6 +3,4 @@
 
 BINDIR?=   /usr/bin
 
-# Commented out for the time being.
-# I intend to make this default at some stage.
-#WARNS?=   2
+WARNS?=6

Modified: head/usr.bin/apply/Makefile
==
--- head/usr.bin/apply/Makefile Sat Jan  2 10:14:35 2010(r201385)
+++ head/usr.bin/apply/Makefile Sat Jan  2 10:27:05 2010

svn commit: r201387 - in head/usr.sbin: accton ancontrol asf chroot extattrctl faithd inetd kbdcontrol mount_portalfs ndiscvt quotaon rip6query rmt

2010-01-02 Thread Ed Schouten

Author: ed
Date: Sat Jan  2 11:05:34 2010
New Revision: 201387
URL: http://svn.freebsd.org/changeset/base/201387

Log:
  ANSIfy some more tools in usr.sbin/.
  
  Most of these tools build with WARNS=6, except for their use of KR
  function declarations.

Modified:
  head/usr.sbin/accton/accton.c
  head/usr.sbin/ancontrol/ancontrol.c
  head/usr.sbin/asf/asf_kld.c
  head/usr.sbin/chroot/chroot.c
  head/usr.sbin/extattrctl/extattrctl.c
  head/usr.sbin/faithd/faithd.c
  head/usr.sbin/inetd/inetd.c
  head/usr.sbin/kbdcontrol/kbdcontrol.c
  head/usr.sbin/mount_portalfs/mount_portalfs.c
  head/usr.sbin/ndiscvt/ndiscvt.c
  head/usr.sbin/quotaon/quotaon.c
  head/usr.sbin/rip6query/rip6query.c
  head/usr.sbin/rmt/rmt.c

Modified: head/usr.sbin/accton/accton.c
==
--- head/usr.sbin/accton/accton.c   Sat Jan  2 10:27:05 2010
(r201386)
+++ head/usr.sbin/accton/accton.c   Sat Jan  2 11:05:34 2010
(r201387)
@@ -80,7 +80,7 @@ main(int argc, char *argv[])
 }
 
 static void
-usage()
+usage(void)
 {
(void)fprintf(stderr, usage: accton [file]\n);
exit(1);

Modified: head/usr.sbin/ancontrol/ancontrol.c
==
--- head/usr.sbin/ancontrol/ancontrol.c Sat Jan  2 10:27:05 2010
(r201386)
+++ head/usr.sbin/ancontrol/ancontrol.c Sat Jan  2 11:05:34 2010
(r201387)
@@ -1327,8 +1327,8 @@ an_setkeys(const char *iface, const char
}
 }
 
-static void an_readkeyinfo(iface)
-   const char  *iface;
+static void
+an_readkeyinfo(const char *iface)
 {
struct an_req   areq;
struct an_ltv_genconfig *cfg;

Modified: head/usr.sbin/asf/asf_kld.c
==
--- head/usr.sbin/asf/asf_kld.c Sat Jan  2 10:27:05 2010(r201386)
+++ head/usr.sbin/asf/asf_kld.c Sat Jan  2 11:05:34 2010(r201387)
@@ -39,7 +39,7 @@ __FBSDID($FreeBSD$);
  * Works with a live kernel only.
  */
 void
-asf_kld()
+asf_kld(void)
 {
struct kld_file_stat kfs;
int fid = 0;/* indicates the beginning of the linker file list */

Modified: head/usr.sbin/chroot/chroot.c
==
--- head/usr.sbin/chroot/chroot.c   Sat Jan  2 10:27:05 2010
(r201386)
+++ head/usr.sbin/chroot/chroot.c   Sat Jan  2 11:05:34 2010
(r201387)
@@ -61,9 +61,7 @@ char  *group; /* group to switch to ... 
 char   *grouplist; /* group list to switch to ... */
 
 int
-main(argc, argv)
-   int argc;
-   char *argv[];
+main(int argc, char *argv[])
 {
struct group*gp;
struct passwd   *pw;
@@ -179,7 +177,7 @@ main(argc, argv)
 }
 
 static void
-usage()
+usage(void)
 {
(void)fprintf(stderr, usage: chroot [-g group] [-G group,group,...] 
[-u user] newroot [command]\n);

Modified: head/usr.sbin/extattrctl/extattrctl.c
==
--- head/usr.sbin/extattrctl/extattrctl.c   Sat Jan  2 10:27:05 2010
(r201386)
+++ head/usr.sbin/extattrctl/extattrctl.c   Sat Jan  2 11:05:34 2010
(r201387)
@@ -54,7 +54,7 @@ long num_inodes_by_path(char *path);
 void usage(void);
 
 void
-usage()
+usage(void)
 {
 
fprintf(stderr,

Modified: head/usr.sbin/faithd/faithd.c
==
--- head/usr.sbin/faithd/faithd.c   Sat Jan  2 10:27:05 2010
(r201386)
+++ head/usr.sbin/faithd/faithd.c   Sat Jan  2 11:05:34 2010
(r201387)
@@ -791,7 +791,7 @@ exit_success(const char *fmt, ...)
 
 #ifdef USE_ROUTE
 static void
-grab_myaddrs()
+grab_myaddrs(void)
 {
struct ifaddrs *ifap, *ifa;
struct myaddrs *p;
@@ -847,7 +847,7 @@ grab_myaddrs()
 }
 
 static void
-free_myaddrs()
+free_myaddrs(void)
 {
struct myaddrs *p, *q;
 
@@ -861,7 +861,7 @@ free_myaddrs()
 }
 
 static void
-update_myaddrs()
+update_myaddrs(void)
 {
char msg[BUFSIZ];
int len;
@@ -900,7 +900,7 @@ update_myaddrs()
 #endif /*USE_ROUTE*/
 
 static void
-usage()
+usage(void)
 {
fprintf(stderr, usage: %s [-dp] [-f conf] service [serverpath 
[serverargs]]\n,
faithdname);

Modified: head/usr.sbin/inetd/inetd.c
==
--- head/usr.sbin/inetd/inetd.c Sat Jan  2 10:27:05 2010(r201386)
+++ head/usr.sbin/inetd/inetd.c Sat Jan  2 11:05:34 2010(r201387)
@@ -1397,8 +1397,7 @@ setsockopt(fd, SOL_SOCKET, opt, (char *)
 
 #ifdef IPSEC
 void
-ipsecsetup(sep)
-   struct servtab *sep;
+ipsecsetup(struct servtab *sep)
 {
char *buf;
char *policy_in = NULL;

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

svn commit: r201388 - head/usr.sbin/snapinfo

2010-01-02 Thread Ed Schouten

Author: ed
Date: Sat Jan  2 11:06:11 2010
New Revision: 201388
URL: http://svn.freebsd.org/changeset/base/201388

Log:
  Mark ftwv as __unused. This compare function does not need it.

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

Modified: head/usr.sbin/snapinfo/snapinfo.c
==
--- head/usr.sbin/snapinfo/snapinfo.c   Sat Jan  2 11:05:34 2010
(r201387)
+++ head/usr.sbin/snapinfo/snapinfo.c   Sat Jan  2 11:06:11 2010
(r201388)
@@ -140,7 +140,7 @@ find_snapshot(struct statfs *sfs)
 
 int
 compare_function(const char *path, const struct stat *st, int flags,
-struct FTW * ftwv)
+struct FTW * ftwv __unused)
 {
 
if (flags == FTW_F  st-st_ino == inode) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201389 - in head/usr.sbin: sysinstall yppush

2010-01-02 Thread Ed Schouten

Author: ed
Date: Sat Jan  2 11:06:39 2010
New Revision: 201389
URL: http://svn.freebsd.org/changeset/base/201389

Log:
  Remove unused variables.

Modified:
  head/usr.sbin/sysinstall/disks.c
  head/usr.sbin/yppush/yppush_main.c

Modified: head/usr.sbin/sysinstall/disks.c
==
--- head/usr.sbin/sysinstall/disks.cSat Jan  2 11:06:11 2010
(r201388)
+++ head/usr.sbin/sysinstall/disks.cSat Jan  2 11:06:39 2010
(r201389)
@@ -333,7 +333,7 @@ diskGetSelectCount(Device ***devs)
 void
 diskPartition(Device *dev)
 {
-char *cp, *p;
+char *p;
 int rv, key = 0;
 int i;
 Boolean chunking;

Modified: head/usr.sbin/yppush/yppush_main.c
==
--- head/usr.sbin/yppush/yppush_main.c  Sat Jan  2 11:06:11 2010
(r201388)
+++ head/usr.sbin/yppush/yppush_main.c  Sat Jan  2 11:06:39 2010
(r201389)
@@ -487,7 +487,6 @@ main(int argc, char *argv[])
};
struct hostlist *yppush_hostlist = NULL;
struct hostlist *tmp;
-   struct sigaction sa;
 
while ((ch = getopt(argc, argv, d:j:p:h:t:v)) != -1) {
switch (ch) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201390 - in head/usr.sbin: . ac accton acpi/acpiconf acpi/acpidump acpi/iasl amd apm apmd asf audit auditd auditreduce authpf boot0cfg bootparamd bsnmpd/bsnmpd bsnmpd/gensnmptree bsnmp...

2010-01-02 Thread Ed Schouten

Author: ed
Date: Sat Jan  2 11:07:44 2010
New Revision: 201390
URL: http://svn.freebsd.org/changeset/base/201390

Log:
  The last big commit: let usr.sbin/ use WARNS=6 by default.

Modified:
  head/usr.sbin/Makefile.inc
  head/usr.sbin/ac/Makefile
  head/usr.sbin/accton/Makefile
  head/usr.sbin/acpi/acpiconf/Makefile
  head/usr.sbin/acpi/acpidump/Makefile
  head/usr.sbin/acpi/iasl/Makefile
  head/usr.sbin/amd/Makefile.inc
  head/usr.sbin/apm/Makefile
  head/usr.sbin/apmd/Makefile
  head/usr.sbin/asf/Makefile
  head/usr.sbin/audit/Makefile
  head/usr.sbin/auditd/Makefile
  head/usr.sbin/auditreduce/Makefile
  head/usr.sbin/authpf/Makefile
  head/usr.sbin/boot0cfg/Makefile
  head/usr.sbin/bootparamd/Makefile.inc
  head/usr.sbin/bsnmpd/bsnmpd/Makefile
  head/usr.sbin/bsnmpd/gensnmptree/Makefile
  head/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
  head/usr.sbin/btxld/Makefile
  head/usr.sbin/burncd/Makefile
  head/usr.sbin/cdcontrol/Makefile
  head/usr.sbin/chkgrp/Makefile
  head/usr.sbin/chown/Makefile
  head/usr.sbin/chroot/Makefile
  head/usr.sbin/clear_locks/Makefile
  head/usr.sbin/config/Makefile
  head/usr.sbin/cpucontrol/Makefile
  head/usr.sbin/cron/cron/Makefile
  head/usr.sbin/crunch/Makefile.inc
  head/usr.sbin/ctm/ctm/Makefile
  head/usr.sbin/ctm/ctm_dequeue/Makefile
  head/usr.sbin/ctm/ctm_rmail/Makefile
  head/usr.sbin/ctm/ctm_smail/Makefile
  head/usr.sbin/daemon/Makefile
  head/usr.sbin/dconschat/Makefile
  head/usr.sbin/devinfo/Makefile
  head/usr.sbin/digictl/Makefile
  head/usr.sbin/diskinfo/Makefile
  head/usr.sbin/dnssec-dsfromkey/Makefile
  head/usr.sbin/dnssec-keyfromlabel/Makefile
  head/usr.sbin/dnssec-keygen/Makefile
  head/usr.sbin/dnssec-signzone/Makefile
  head/usr.sbin/dumpcis/Makefile
  head/usr.sbin/editmap/Makefile
  head/usr.sbin/edquota/Makefile
  head/usr.sbin/eeprom/Makefile
  head/usr.sbin/extattr/Makefile
  head/usr.sbin/extattrctl/Makefile
  head/usr.sbin/faithd/Makefile
  head/usr.sbin/fdcontrol/Makefile
  head/usr.sbin/fdformat/Makefile
  head/usr.sbin/fdread/Makefile
  head/usr.sbin/fdwrite/Makefile
  head/usr.sbin/fifolog/Makefile.inc
  head/usr.sbin/ftp-proxy/libevent/Makefile
  head/usr.sbin/getfmac/Makefile
  head/usr.sbin/getpmac/Makefile
  head/usr.sbin/gstat/Makefile
  head/usr.sbin/inetd/Makefile
  head/usr.sbin/iostat/Makefile
  head/usr.sbin/ip6addrctl/Makefile
  head/usr.sbin/ipfwpcap/Makefile
  head/usr.sbin/jail/Makefile
  head/usr.sbin/jexec/Makefile
  head/usr.sbin/jls/Makefile
  head/usr.sbin/kernbb/Makefile
  head/usr.sbin/lastlogin/Makefile
  head/usr.sbin/lmcconfig/Makefile
  head/usr.sbin/lpr/common_source/Makefile
  head/usr.sbin/lpr/filters.ru/Makefile.inc
  head/usr.sbin/lpr/lpc/Makefile
  head/usr.sbin/lpr/lpd/Makefile
  head/usr.sbin/lpr/lpr/Makefile
  head/usr.sbin/lptcontrol/Makefile
  head/usr.sbin/mailstats/Makefile
  head/usr.sbin/mailwrapper/Makefile
  head/usr.sbin/makemap/Makefile
  head/usr.sbin/memcontrol/Makefile
  head/usr.sbin/mixer/Makefile
  head/usr.sbin/mld6query/Makefile
  head/usr.sbin/mlxcontrol/Makefile
  head/usr.sbin/mount_smbfs/Makefile
  head/usr.sbin/moused/Makefile
  head/usr.sbin/mptable/Makefile
  head/usr.sbin/mtree/Makefile
  head/usr.sbin/named-checkconf/Makefile
  head/usr.sbin/named-checkzone/Makefile
  head/usr.sbin/named/Makefile
  head/usr.sbin/ndp/Makefile
  head/usr.sbin/newsyslog/Makefile
  head/usr.sbin/nfsd/Makefile
  head/usr.sbin/nghook/Makefile
  head/usr.sbin/ntp/Makefile.inc
  head/usr.sbin/nvram/Makefile
  head/usr.sbin/ofwdump/Makefile
  head/usr.sbin/pciconf/Makefile
  head/usr.sbin/pkg_install/delete/Makefile
  head/usr.sbin/pkg_install/info/Makefile
  head/usr.sbin/pkg_install/updating/Makefile
  head/usr.sbin/pkg_install/version/Makefile
  head/usr.sbin/pmcannotate/Makefile
  head/usr.sbin/pmccontrol/Makefile
  head/usr.sbin/pmcstat/Makefile
  head/usr.sbin/pnpinfo/Makefile
  head/usr.sbin/portsnap/make_index/Makefile
  head/usr.sbin/portsnap/phttpget/Makefile
  head/usr.sbin/powerd/Makefile
  head/usr.sbin/pppctl/Makefile
  head/usr.sbin/praliases/Makefile
  head/usr.sbin/praudit/Makefile
  head/usr.sbin/procctl/Makefile
  head/usr.sbin/pstat/Makefile
  head/usr.sbin/pw/Makefile
  head/usr.sbin/pwd_mkdb/Makefile
  head/usr.sbin/quotaon/Makefile
  head/usr.sbin/repquota/Makefile
  head/usr.sbin/rip6query/Makefile
  head/usr.sbin/rmt/Makefile
  head/usr.sbin/rndc-confgen/Makefile
  head/usr.sbin/rndc/Makefile
  head/usr.sbin/route6d/Makefile
  head/usr.sbin/rpc.lockd/Makefile
  head/usr.sbin/rpc.statd/Makefile
  head/usr.sbin/rpc.umntall/Makefile
  head/usr.sbin/rpc.yppasswdd/Makefile
  head/usr.sbin/rpc.ypupdated/Makefile
  head/usr.sbin/rpc.ypxfrd/Makefile
  head/usr.sbin/rpcbind/Makefile
  head/usr.sbin/rrenumd/Makefile
  head/usr.sbin/rtadvd/Makefile
  head/usr.sbin/rtprio/Makefile
  head/usr.sbin/rtsold/Makefile
  head/usr.sbin/rwhod/Makefile
  head/usr.sbin/sa/Makefile
  head/usr.sbin/sendmail/Makefile
  head/usr.sbin/setfmac/Makefile
  head/usr.sbin/setpmac/Makefile

Re: svn commit: r201284 - head/sys/netinet6

2010-01-02 Thread Ed Schouten

Hi Qing,

Could it be possible that this commit (or r201282) breaks IPv6/ND6 for
me? It seems my system no longer sends responses to ND6, causing all
traffic on the local network to that system to break.

-- 
 Ed Schouten e...@80386.nl
 WWW: http://80386.nl/


pgp7YwqF3Lrku.pgp
Description: PGP signature

svn commit: r201391 - head/release

2010-01-02 Thread Takahashi Yoshihiro

Author: nyan
Date: Sat Jan  2 12:37:54 2010
New Revision: 201391
URL: http://svn.freebsd.org/changeset/base/201391

Log:
  Do kgzip to the loader on pc98, too.  Now pc98's boot2 works for ELF.
  
  MFC after:2 week

Modified:
  head/release/Makefile

Modified: head/release/Makefile
==
--- head/release/Makefile   Sat Jan  2 11:07:44 2010(r201390)
+++ head/release/Makefile   Sat Jan  2 12:37:54 2010(r201391)
@@ -1347,7 +1347,7 @@ buildBootFloppy:
@mkdir ${IMAGEDIR}
@echo Setting up /boot directory for ${FSIMAGE} floppy
@mkdir -p ${IMAGEDIR}/boot
-.if ${TARGET} == i386
+.if ${TARGET_ARCH} == i386
@${WMAKEENV} kgzip -v -l ${RD}/trees/base/usr/lib/kgzldr.o -o \
${IMAGEDIR}/boot/loader ${BOOTDIR}/loader
 .else
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201392 - head/usr.sbin/sysinstall

2010-01-02 Thread Takahashi Yoshihiro

Author: nyan
Date: Sat Jan  2 12:42:33 2010
New Revision: 201392
URL: http://svn.freebsd.org/changeset/base/201392

Log:
  Use UFS2 as default filesystem.  Now pc98's boot2 works for UFS2.
  
  MFC after:2 week.

Modified:
  head/usr.sbin/sysinstall/label.c

Modified: head/usr.sbin/sysinstall/label.c
==
--- head/usr.sbin/sysinstall/label.cSat Jan  2 12:37:54 2010
(r201391)
+++ head/usr.sbin/sysinstall/label.cSat Jan  2 12:42:33 2010
(r201392)
@@ -384,11 +384,7 @@ new_part(PartType type, char *mpoint, Bo
pi-newfs_data.newfs_ufs.acls = FALSE;
pi-newfs_data.newfs_ufs.multilabel = FALSE;
pi-newfs_data.newfs_ufs.softupdates = strcmp(mpoint, /);
-#ifdef PC98
-   pi-newfs_data.newfs_ufs.ufs1 = TRUE;
-#else
pi-newfs_data.newfs_ufs.ufs1 = FALSE;
-#endif
 }
 
 return pi;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201393 - stable/8/sys/dev/ae

2010-01-02 Thread Gavin Atkinson

Author: gavin
Date: Sat Jan  2 13:07:14 2010
New Revision: 201393
URL: http://svn.freebsd.org/changeset/base/201393

Log:
  MFC r200993:  Small spelling fix, Ethetnet - Ethernet
  
  Approved by:  ed (mentor)

Modified:
  stable/8/sys/dev/ae/if_ae.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/ae/if_ae.c
==
--- stable/8/sys/dev/ae/if_ae.c Sat Jan  2 12:42:33 2010(r201392)
+++ stable/8/sys/dev/ae/if_ae.c Sat Jan  2 13:07:14 2010(r201393)
@@ -1047,7 +1047,7 @@ ae_get_reg_eaddr(ae_softc_t *sc, uint32_
if (AE_CHECK_EADDR_VALID(eaddr) != 0) {
if (bootverbose)
device_printf(sc-dev,
-   Ethetnet address registers are invalid.\n);
+   Ethernet address registers are invalid.\n);
return (EINVAL);
}
return (0);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201394 - stable/7/sys/dev/ae

2010-01-02 Thread Gavin Atkinson

Author: gavin
Date: Sat Jan  2 13:07:51 2010
New Revision: 201394
URL: http://svn.freebsd.org/changeset/base/201394

Log:
  MFC r200993:  Small spelling fix, Ethetnet - Ethernet
  
  Approved by:  ed (mentor)

Modified:
  stable/7/sys/dev/ae/if_ae.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/ae/if_ae.c
==
--- stable/7/sys/dev/ae/if_ae.c Sat Jan  2 13:07:14 2010(r201393)
+++ stable/7/sys/dev/ae/if_ae.c Sat Jan  2 13:07:51 2010(r201394)
@@ -1047,7 +1047,7 @@ ae_get_reg_eaddr(ae_softc_t *sc, uint32_
if (AE_CHECK_EADDR_VALID(eaddr) != 0) {
if (bootverbose)
device_printf(sc-dev,
-   Ethetnet address registers are invalid.\n);
+   Ethernet address registers are invalid.\n);
return (EINVAL);
}
return (0);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201395 - head/sys/sparc64/pci

2010-01-02 Thread Marius Strobl

Author: marius
Date: Sat Jan  2 15:19:33 2010
New Revision: 201395
URL: http://svn.freebsd.org/changeset/base/201395

Log:
  - Preserve the PROM IOMMU in order to allow OFW drivers to continue to
work.
  - Sanity check the parameters passed to the implementations of the
pcib_{read,write}_config() methods. Using illegal values can cause
no real harm but it doesn't hurt to avoid unnecessary data error
traps requiring to flush and re-enable the level 1 caches.

Modified:
  head/sys/sparc64/pci/psycho.c
  head/sys/sparc64/pci/psychovar.h
  head/sys/sparc64/pci/schizo.c
  head/sys/sparc64/pci/schizovar.h

Modified: head/sys/sparc64/pci/psycho.c
==
--- head/sys/sparc64/pci/psycho.c   Sat Jan  2 13:07:51 2010
(r201394)
+++ head/sys/sparc64/pci/psycho.c   Sat Jan  2 15:19:33 2010
(r201395)
@@ -556,6 +556,7 @@ psycho_attach(device_t dev)
M_NOWAIT | M_ZERO);
if (sc-sc_is == NULL)
panic(%s: malloc iommu_state failed, __func__);
+   sc-sc_is-is_flags = IOMMU_PRESERVE_PROM;
if (sc-sc_mode == PSYCHO_MODE_SABRE)
sc-sc_is-is_pmaxaddr =
IOMMU_MAXADDR(SABRE_IOMMU_BITS);
@@ -593,10 +594,11 @@ psycho_attach(device_t dev)
panic(%s: could not get bus-range, __func__);
if (i != sizeof(prop_array))
panic(%s: broken bus-range (%d), __func__, i);
+   sc-sc_pci_secbus = prop_array[0];
+   sc-sc_pci_subbus = prop_array[1];
if (bootverbose)
device_printf(dev, bus range %u to %u; PCI bus %d\n,
-   prop_array[0], prop_array[1], prop_array[0]);
-   sc-sc_pci_secbus = prop_array[0];
+   sc-sc_pci_secbus, sc-sc_pci_subbus, sc-sc_pci_secbus);
 
/* Clear any pending PCI error bits. */
PCIB_WRITE_CONFIG(dev, sc-sc_pci_secbus, PCS_DEVICE, PCS_FUNC,
@@ -925,6 +927,10 @@ psycho_read_config(device_t dev, u_int b
int i;
 
sc = device_get_softc(dev);
+   if (bus  sc-sc_pci_secbus || bus  sc-sc_pci_subbus ||
+   slot  PCI_SLOTMAX || func  PCI_FUNCMAX || reg  PCI_REGMAX)
+   return (-1);
+
bh = sc-sc_pci_bh[OFW_PCI_CS_CONFIG];
 
/*
@@ -1005,6 +1011,10 @@ psycho_write_config(device_t dev, u_int 
u_long offset = 0;
 
sc = device_get_softc(dev);
+   if (bus  sc-sc_pci_secbus || bus  sc-sc_pci_subbus ||
+   slot  PCI_SLOTMAX || func  PCI_FUNCMAX || reg  PCI_REGMAX)
+   return;
+
offset = PSYCHO_CONF_OFF(bus, slot, func, reg);
bh = sc-sc_pci_bh[OFW_PCI_CS_CONFIG];
switch (width) {

Modified: head/sys/sparc64/pci/psychovar.h
==
--- head/sys/sparc64/pci/psychovar.hSat Jan  2 13:07:51 2010
(r201394)
+++ head/sys/sparc64/pci/psychovar.hSat Jan  2 15:19:33 2010
(r201395)
@@ -75,6 +75,7 @@ struct psycho_softc {
struct rman sc_pci_io_rman;
 
uint8_t sc_pci_secbus;
+   uint8_t sc_pci_subbus;
 
uint8_t sc_pci_hpbcfg[16];
 

Modified: head/sys/sparc64/pci/schizo.c
==
--- head/sys/sparc64/pci/schizo.c   Sat Jan  2 13:07:51 2010
(r201394)
+++ head/sys/sparc64/pci/schizo.c   Sat Jan  2 15:19:33 2010
(r201395)
@@ -456,6 +456,7 @@ schizo_attach(device_t dev)
 * buffer, in Schizo version  5 (i.e. revision  2.3) it's
 * affected by several errata and basically unusable though.
 */
+   sc-sc_is.is_flags = IOMMU_PRESERVE_PROM;
sc-sc_is.is_pmaxaddr = IOMMU_MAXADDR(STX_IOMMU_BITS);
sc-sc_is.is_sb[0] = sc-sc_is.is_sb[1] = 0;
if (OF_getproplen(node, no-streaming-cache)  0 
@@ -550,10 +551,11 @@ schizo_attach(device_t dev)
panic(%s: could not get bus-range, __func__);
if (i != sizeof(prop_array))
panic(%s: broken bus-range (%d), __func__, i);
+   sc-sc_pci_secbus = prop_array[0];
+   sc-sc_pci_subbus = prop_array[1];
if (bootverbose)
device_printf(dev, bus range %u to %u; PCI bus %d\n,
-   prop_array[0], prop_array[1], prop_array[0]);
-   sc-sc_pci_secbus = prop_array[0];
+   sc-sc_pci_secbus, sc-sc_pci_subbus, sc-sc_pci_secbus);
 
/* Clear any pending PCI error bits. */
PCIB_WRITE_CONFIG(dev, sc-sc_pci_secbus, STX_CS_DEVICE, STX_CS_FUNC,
@@ -929,6 +931,9 @@ schizo_read_config(device_t dev, u_int b
uint8_t byte;
 
sc = device_get_softc(dev);
+   if (bus  sc-sc_pci_secbus || bus  sc-sc_pci_subbus ||
+   slot  PCI_SLOTMAX || func  PCI_FUNCMAX || reg  PCI_REGMAX)
+

svn commit: r201396 - head/sys/sparc64/sparc64

2010-01-02 Thread Marius Strobl

Author: marius
Date: Sat Jan  2 15:44:16 2010
New Revision: 201396
URL: http://svn.freebsd.org/changeset/base/201396

Log:
  - Demapping unused kernel TLB slots has proven to work reliably so move
the associated debugging under bootverbose.
  - Remove freebsd4_sigreturn(); given that FreeBSD 4 didn't supported
sparc64 this only ever served as a transition aid prior to FreeBSD
5.0 and is unused by default since COMPAT_FREEBSD4 was removed from
GENERIC in r143072 nearly 5 years ago.

Modified:
  head/sys/sparc64/sparc64/machdep.c

Modified: head/sys/sparc64/sparc64/machdep.c
==
--- head/sys/sparc64/sparc64/machdep.c  Sat Jan  2 15:19:33 2010
(r201395)
+++ head/sys/sparc64/sparc64/machdep.c  Sat Jan  2 15:44:16 2010
(r201396)
@@ -383,8 +383,9 @@ sparc64_init(caddr_t mdp, u_long o1, u_l
 */
for (va = KERNBASE + (kernel_tlb_slots - 1) * PAGE_SIZE_4M;
va = roundup2(end, PAGE_SIZE_4M); va -= PAGE_SIZE_4M) {
-   printf(demapping unused kernel TLB slot (va %#lx - %#lx)\n,
-   va, va + PAGE_SIZE_4M - 1);
+   if (bootverbose)
+   printf(demapping unused kernel TLB slot 
+   (va %#lx - %#lx)\n, va, va + PAGE_SIZE_4M - 1);
stxa(TLB_DEMAP_VA(va) | TLB_DEMAP_PRIMARY | TLB_DEMAP_PAGE,
ASI_DMMU_DEMAP, 0);
stxa(TLB_DEMAP_VA(va) | TLB_DEMAP_PRIMARY | TLB_DEMAP_PAGE,
@@ -660,15 +661,6 @@ sigreturn(struct thread *td, struct sigr
return (EJUSTRETURN);
 }
 
-#ifdef COMPAT_FREEBSD4
-int
-freebsd4_sigreturn(struct thread *td, struct freebsd4_sigreturn_args *uap)
-{
-
-   return sigreturn(td, (struct sigreturn_args *)uap);
-}
-#endif
-
 /*
  * Construct a PCB from a trapframe. This is called from kdb_trap() where
  * we want to start a backtrace from the function that caused us to enter
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201397 - head/share/man/man4

2010-01-02 Thread Christian Brueffer

Author: brueffer
Date: Sat Jan  2 16:27:25 2010
New Revision: 201397
URL: http://svn.freebsd.org/changeset/base/201397

Log:
  Add one more supported controller.
  
  Submitted by: pluknet pluk...@gmail.com
  MFC after:1 week

Modified:
  head/share/man/man4/mfi.4

Modified: head/share/man/man4/mfi.4
==
--- head/share/man/man4/mfi.4   Sat Jan  2 15:44:16 2010(r201396)
+++ head/share/man/man4/mfi.4   Sat Jan  2 16:27:25 2010(r201397)
@@ -24,7 +24,7 @@
 .\
 .\ $FreeBSD$
 .\
-.Dd November 26, 2009
+.Dd January 2, 2010
 .Dt MFI 4
 .Os
 .Sh NAME
@@ -92,6 +92,8 @@ Dell PERC5
 Dell PERC6
 .It
 IBM ServeRAID-MR10i
+.It
+Intel RAID Controller SROMBSAS18E
 .El
 .Sh FILES
 .Bl -tag -width .Pa /dev/mfid? -compact
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201398 - head/usr.sbin/wake

2010-01-02 Thread Martin Blapp

Author: mbr
Date: Sat Jan  2 17:29:13 2010
New Revision: 201398
URL: http://svn.freebsd.org/changeset/base/201398

Log:
  Make it clear that interface is one out of possibly many interface of the
  local machine (s/the network interface/a network interface).
  
  Submitted by: Marc Balmer m...@msys.ch
  MFC after:3 days

Modified:
  head/usr.sbin/wake/wake.8

Modified: head/usr.sbin/wake/wake.8
==
--- head/usr.sbin/wake/wake.8   Sat Jan  2 16:27:25 2010(r201397)
+++ head/usr.sbin/wake/wake.8   Sat Jan  2 17:29:13 2010(r201398)
@@ -15,7 +15,7 @@
 .\ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\
-.Dd December 21, 2009
+.Dd December 27, 2009
 .Dt WAKE 8
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@ and can be used to power on machines fro
 having physical access to them.
 .Pp
 .Ar interface
-is the network interface of the local machine.
+is a network interface of the local machine.
 .Ar lladdr
 are the link layer addresses of the remote machines
 and can be specified as the actual hardware address
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201399 - in head: sbin/newfs sys/boot/pc98/boot0.5

2010-01-02 Thread Martin Blapp

Author: mbr
Date: Sat Jan  2 17:32:40 2010
New Revision: 201399
URL: http://svn.freebsd.org/changeset/base/201399

Log:
  Fix typo: s/partion/partition/
  
  Submitted by: Marc Balmer m...@msys.ch
  MFC after:3 days

Modified:
  head/sbin/newfs/mkfs.c
  head/sys/boot/pc98/boot0.5/selector.s

Modified: head/sbin/newfs/mkfs.c
==
--- head/sbin/newfs/mkfs.c  Sat Jan  2 17:29:13 2010(r201398)
+++ head/sbin/newfs/mkfs.c  Sat Jan  2 17:32:40 2010(r201399)
@@ -557,7 +557,7 @@ mkfs(struct partition *pp, char *fsys)
sblock.fs_cssize - i : sblock.fs_bsize,
((char *)fscs) + i);
/*
-* Update information about this partion in pack
+* Update information about this partition in pack
 * label, to that it may be updated on disk.
 */
if (pp != NULL) {

Modified: head/sys/boot/pc98/boot0.5/selector.s
==
--- head/sys/boot/pc98/boot0.5/selector.s   Sat Jan  2 17:29:13 2010
(r201398)
+++ head/sys/boot/pc98/boot0.5/selector.s   Sat Jan  2 17:32:40 2010
(r201399)
@@ -35,7 +35,7 @@
 # Display partition table.
 #
 showpartitions:
-   # Clear partion table area
+   # Clear partition table area
movw$16, %cx
 clear_part:
push%cx
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201400 - head/sbin/mount_msdosfs

2010-01-02 Thread Konstantin Belousov

Author: kib
Date: Sat Jan  2 17:45:53 2010
New Revision: 201400
URL: http://svn.freebsd.org/changeset/base/201400

Log:
  Remove reference to the bug in FreeBSD 2.0.
  
  Submitted by: Valentin Nechayev netch segfault kiev ua
  MFC after:3 days

Modified:
  head/sbin/mount_msdosfs/mount_msdosfs.8

Modified: head/sbin/mount_msdosfs/mount_msdosfs.8
==
--- head/sbin/mount_msdosfs/mount_msdosfs.8 Sat Jan  2 17:32:40 2010
(r201399)
+++ head/sbin/mount_msdosfs/mount_msdosfs.8 Sat Jan  2 17:45:53 2010
(r201400)
@@ -205,14 +205,6 @@ The use of the
 flag could result in damaged file systems,
 albeit the damage is in part taken care of by
 procedures similar to the ones used in Win'95.
-.Pp
-.Fx 2.1
-and earlier versions could not handle cluster sizes larger than 16K.
-Just mounting an MS-DOS file system could cause corruption to any
-mounted file system.
-Cluster sizes larger than 16K are unavoidable for file system sizes
-larger than 1G, and also occur when file systems larger than 1G are
-shrunk to smaller than 1G using FIPS.
 .Sh HISTORY
 The
 .Nm
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r201284 - head/sys/netinet6

2010-01-02 Thread Qing Li

Hmm... there is a possibility r201284, but on the other hand,  I have
been running this patch for a while now.
However, that patch was created from several weeks ago, and -current
had evolved.
Would you mind sending me your configuration information, in
particular, ifconfig -a and netstat -rn
and I will take a look.

Thanks,

-- Qing

On Sat, Jan 2, 2010 at 4:24 AM, Ed Schouten e...@80386.nl wrote:
 Hi Qing,

 Could it be possible that this commit (or r201282) breaks IPv6/ND6 for
 me? It seems my system no longer sends responses to ND6, causing all
 traffic on the local network to that system to break.

 --
  Ed Schouten e...@80386.nl
  WWW: http://80386.nl/

___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201401 - head/sbin/growfs

2010-01-02 Thread Gavin Atkinson

Author: gavin
Date: Sat Jan  2 20:18:10 2010
New Revision: 201401
URL: http://svn.freebsd.org/changeset/base/201401

Log:
  Remove dead code.  This section of code is only run in the
  (sblock.fs_magic == FS_UFS1_MAGIC) case, so the check within the
  loop is redundant.
  
  Submitted by: Nate Eldredge  nge cs.hmc.edu
  Reviewed by:  mjacob
  Approved by:  ed (mentor)
  MFC after:1 month

Modified:
  head/sbin/growfs/growfs.c

Modified: head/sbin/growfs/growfs.c
==
--- head/sbin/growfs/growfs.c   Sat Jan  2 17:45:53 2010(r201400)
+++ head/sbin/growfs/growfs.c   Sat Jan  2 20:18:10 2010(r201401)
@@ -376,7 +376,6 @@ initcg(int cylno, time_t utime, int fso,
long d, dlower, dupper, blkno, start;
ufs2_daddr_t i, cbase, dmax;
struct ufs1_dinode *dp1;
-   struct ufs2_dinode *dp2;
struct csum *cs;
 
if (iobuf == NULL  (iobuf = malloc(sblock.fs_bsize)) == NULL) {
@@ -460,16 +459,11 @@ initcg(int cylno, time_t utime, int fso,
for (i = 2 * sblock.fs_frag; i  sblock.fs_ipg / INOPF(sblock);
 i += sblock.fs_frag) {
dp1 = (struct ufs1_dinode *)iobuf;
-   dp2 = (struct ufs2_dinode *)iobuf;
 #ifdef FSIRAND
-   for (j = 0; j  INOPB(sblock); j++)
-   if (sblock.fs_magic == FS_UFS1_MAGIC) {
-   dp1-di_gen = random();
-   dp1++;
-   } else {
-   dp2-di_gen = random();
-   dp2++;
-   }
+   for (j = 0; j  INOPB(sblock); j++) {
+   dp1-di_gen = random();
+   dp1++;
+   }
 #endif
wtfs(fsbtodb(sblock, cgimin(sblock, cylno) + i),
sblock.fs_bsize, iobuf, fso, Nflag);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201402 - head/lib/libc/posix1e

2010-01-02 Thread Ed Schouten

Author: ed
Date: Sat Jan  2 20:27:14 2010
New Revision: 201402
URL: http://svn.freebsd.org/changeset/base/201402

Log:
  Don't forget to clean up the file copied from the kernel sources.
  
  MFC after:1 week

Modified:
  head/lib/libc/posix1e/Makefile.inc

Modified: head/lib/libc/posix1e/Makefile.inc
==
--- head/lib/libc/posix1e/Makefile.inc  Sat Jan  2 20:18:10 2010
(r201401)
+++ head/lib/libc/posix1e/Makefile.inc  Sat Jan  2 20:27:14 2010
(r201402)
@@ -119,3 +119,5 @@ MLINKS+=acl_create_entry.3 acl_create_en
mac_set.3 mac_set_proc.3\
mac_text.3 mac_from_text.3  \
mac_text.3 mac_to_text.3
+
+CLEANFILES+=   subr_acl_nfs4.c
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201403 - stable/8/sys/sys

2010-01-02 Thread Warner Losh

Author: imp
Date: Sat Jan  2 20:34:13 2010
New Revision: 201403
URL: http://svn.freebsd.org/changeset/base/201403

Log:
  Welcome to 2010.

Modified:
  stable/8/sys/sys/copyright.h

Modified: stable/8/sys/sys/copyright.h
==
--- stable/8/sys/sys/copyright.hSat Jan  2 20:27:14 2010
(r201402)
+++ stable/8/sys/sys/copyright.hSat Jan  2 20:34:13 2010
(r201403)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (C) 1992-2009 The FreeBSD Project. All rights reserved.
+ * Copyright (C) 1992-2010 The FreeBSD Project. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,7 +30,7 @@
   
 /* FreeBSD */
 #define COPYRIGHT_FreeBSD \
-   Copyright (c) 1992-2009 The FreeBSD Project.\n
+   Copyright (c) 1992-2010 The FreeBSD Project.\n
 
 /* Foundation */
 #defineTRADEMARK_Foundation \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201404 - stable/7/sys/sys

2010-01-02 Thread Warner Losh

Author: imp
Date: Sat Jan  2 20:35:19 2010
New Revision: 201404
URL: http://svn.freebsd.org/changeset/base/201404

Log:
  Welcome to 2010.

Modified:
  stable/7/sys/sys/copyright.h

Modified: stable/7/sys/sys/copyright.h
==
--- stable/7/sys/sys/copyright.hSat Jan  2 20:34:13 2010
(r201403)
+++ stable/7/sys/sys/copyright.hSat Jan  2 20:35:19 2010
(r201404)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (C) 1992-2009 The FreeBSD Project. All rights reserved.
+ * Copyright (C) 1992-2010 The FreeBSD Project. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,7 +30,7 @@
   
 /* FreeBSD */
 #define COPYRIGHT_FreeBSD \
-   Copyright (c) 1992-2009 The FreeBSD Project.\n
+   Copyright (c) 1992-2010 The FreeBSD Project.\n
 
 /* Foundation */
 #defineTRADEMARK_Foundation \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201405 - stable/6/sys/sys

2010-01-02 Thread Warner Losh

Author: imp
Date: Sat Jan  2 20:36:36 2010
New Revision: 201405
URL: http://svn.freebsd.org/changeset/base/201405

Log:
  Welcome to 2010.  (Note: this was mistakenly not updated for 2009,
  even though there were changes on the releng_6 branch).

Modified:
  stable/6/sys/sys/copyright.h

Modified: stable/6/sys/sys/copyright.h
==
--- stable/6/sys/sys/copyright.hSat Jan  2 20:35:19 2010
(r201404)
+++ stable/6/sys/sys/copyright.hSat Jan  2 20:36:36 2010
(r201405)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (C) 1992-2008 The FreeBSD Project. All rights reserved.
+ * Copyright (C) 1992-2010 The FreeBSD Project. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,7 +30,7 @@
   
 /* FreeBSD */
 #define COPYRIGHT_FreeBSD \
-   Copyright (c) 1992-2008 The FreeBSD Project.\n
+   Copyright (c) 1992-2010 The FreeBSD Project.\n
 
 /* Foundation */
 #defineTRADEMARK_Foundation \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

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

2010-01-02 Thread Xin LI

Author: delphij
Date: Sat Jan  2 23:38:03 2010
New Revision: 201406
URL: http://svn.freebsd.org/changeset/base/201406

Log:
  Reduce diff against OpenSolaris - move Giant acquire/release to
  zfs_znode.c.  As a side effect this also eliminates two potential
  Giant leaks.
  
  Approved by:  pjd
  MFC after:1 month

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

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c   Sat Jan 
 2 20:36:36 2010(r201405)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c   Sat Jan 
 2 23:38:03 2010(r201406)
@@ -557,9 +557,6 @@ zfs_rmnode(znode_t *zp)
dmu_tx_t*tx;
uint64_tacl_obj;
int error;
-   int vfslocked;
-
-   vfslocked = VFS_LOCK_GIANT(zfsvfs-z_vfs);
 
ASSERT(zp-z_phys-zp_links == 0);
 
@@ -593,7 +590,6 @@ zfs_rmnode(znode_t *zp)
 */
zfs_znode_dmu_fini(zp);
zfs_znode_free(zp);
-   VFS_UNLOCK_GIANT(vfslocked);
return;
}
}
@@ -666,7 +662,6 @@ zfs_rmnode(znode_t *zp)
 out:
if (xzp)
VN_RELE(ZTOV(xzp));
-   VFS_UNLOCK_GIANT(vfslocked);
 }
 
 static uint64_t

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Sat Jan 
 2 20:36:36 2010(r201405)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Sat Jan 
 2 23:38:03 2010(r201406)
@@ -1017,6 +1017,7 @@ zfs_zinactive(znode_t *zp)
vnode_t *vp = ZTOV(zp);
zfsvfs_t *zfsvfs = zp-z_zfsvfs;
uint64_t z_id = zp-z_id;
+   int vfslocked;
 
ASSERT(zp-z_dbuf  zp-z_phys);
 
@@ -1049,7 +1050,9 @@ zfs_zinactive(znode_t *zp)
ZFS_OBJ_HOLD_EXIT(zfsvfs, z_id);
ASSERT(vp-v_count == 0);
vrecycle(vp, curthread);
+   vfslocked = VFS_LOCK_GIANT(zfsvfs-z_vfs);
zfs_rmnode(zp);
+   VFS_UNLOCK_GIANT(vfslocked);
return;
}
mutex_exit(zp-z_lock);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201407 - in stable/8/cddl/contrib/opensolaris: cmd/zfs lib/libzfs/common

2010-01-02 Thread Xin LI

Author: delphij
Date: Sun Jan  3 00:27:35 2010
New Revision: 201407
URL: http://svn.freebsd.org/changeset/base/201407

Log:
  MFC r200516:
  
  Add an option to specify that the received ZFS should not be automatically
  mounted (receive -u).
  
  Obtained from:OpenSolaris (onnv revision 8584:327a1b6dd944)
  Approved by:  pjd

Modified:
  stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
Directory Properties:
  stable/8/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  stable/8/cddl/contrib/opensolaris/lib/libzfs/   (props changed)

Modified: stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==
--- stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.cSat Jan  2 
23:38:03 2010(r201406)
+++ stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.cSun Jan  3 
00:27:35 2010(r201407)
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -2457,7 +2457,7 @@ zfs_do_receive(int argc, char **argv)
 
bzero(flags, sizeof (recvflags_t));
/* check options */
-   while ((c = getopt(argc, argv, :dnvF)) != -1) {
+   while ((c = getopt(argc, argv, :dnuvF)) != -1) {
switch (c) {
case 'd':
flags.isprefix = B_TRUE;
@@ -2465,6 +2465,9 @@ zfs_do_receive(int argc, char **argv)
case 'n':
flags.dryrun = B_TRUE;
break;
+   case 'u':
+   flags.nomount = B_TRUE;
+   break;
case 'v':
flags.verbose = B_TRUE;
break;

Modified: stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
==
--- stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.hSat Jan 
 2 23:38:03 2010(r201406)
+++ stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.hSun Jan 
 3 00:27:35 2010(r201407)
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -457,6 +457,9 @@ typedef struct recvflags {
 
/* byteswap flag is used internally; callers need not specify */
int byteswap : 1;
+
+   /* do not mount file systems as they are extracted (private) */
+   int nomount : 1;
 } recvflags_t;
 
 extern int zfs_receive(libzfs_handle_t *, const char *, recvflags_t,

Modified: stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==
--- stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c   
Sat Jan  2 23:38:03 2010(r201406)
+++ stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c   
Sun Jan  3 00:27:35 2010(r201407)
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -2080,7 +2080,7 @@ zfs_receive(libzfs_handle_t *hdl, const 
 
err = zfs_receive_impl(hdl, tosnap, flags, infd, stream_avl, top_zfs);
 
-   if (err == 0  top_zfs) {
+   if (err == 0  !flags.nomount  top_zfs) {
zfs_handle_t *zhp;
prop_changelist_t *clp;
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201408 - head/sys/dev/isp

2010-01-02 Thread Matt Jacob

Author: mjacob
Date: Sun Jan  3 02:43:46 2010
New Revision: 201408
URL: http://svn.freebsd.org/changeset/base/201408

Log:
  Make sure that the WWNN is also created for 2100..2300 cards.
  MFC after:1 day

Modified:
  head/sys/dev/isp/isp.c

Modified: head/sys/dev/isp/isp.c
==
--- head/sys/dev/isp/isp.c  Sun Jan  3 00:27:35 2010(r201407)
+++ head/sys/dev/isp/isp.c  Sun Jan  3 02:43:46 2010(r201408)
@@ -8285,6 +8285,8 @@ isp_parse_nvram_2100(ispsoftc_t *isp, ui
if ((wwn  60) == 0) {
wwn |= (((uint64_t) 2) 60);
}
+   } else {
+   wwn = fcp-isp_wwpn_nvram  ~((uint64_t) 0xfff  48);
}
} else {
wwn = ~((uint64_t) 0xfff  48);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201409 - in stable/8: cddl/contrib/opensolaris/cmd/zdb sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys

2010-01-02 Thread Xin LI

Author: delphij
Date: Sun Jan  3 02:58:05 2010
New Revision: 201409
URL: http://svn.freebsd.org/changeset/base/201409

Log:
  MFC r200724:
  
  Apply fix for Solaris bug  6462803 zfs snapshot -r failed because
  filesystem was busy.
  
  PR:   kern/141387
  Submitted by: mm
  Approved by:  pjd
  Obtained from:OpenSolaris (onnv 8989:cfce31f4eebf)

Modified:
  stable/8/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
Directory Properties:
  stable/8/cddl/contrib/opensolaris/cmd/zdb/   (props changed)
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c
==
--- stable/8/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c  Sun Jan  3 02:43:46 
2010(r201408)
+++ stable/8/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c  Sun Jan  3 02:58:05 
2010(r201409)
@@ -19,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident  %Z%%M% %I% %E% SMI
-
 /*
  * Print intent log header and statistics.
  */
@@ -345,8 +343,10 @@ dump_intent_log(zilog_t *zilog)
if (zh-zh_log.blk_birth == 0 || verbose  2)
return;
 
-   (void) printf(\nZIL header: claim_txg %llu, seq %llu\n,
-   (u_longlong_t)zh-zh_claim_txg, (u_longlong_t)zh-zh_replay_seq);
+   (void) printf(\nZIL header: claim_txg %llu, claim_seq %llu,
+   (u_longlong_t)zh-zh_claim_txg, (u_longlong_t)zh-zh_claim_seq);
+   (void) printf( replay_seq %llu, flags 0x%llx\n,
+   (u_longlong_t)zh-zh_replay_seq, (u_longlong_t)zh-zh_flags);
 
if (verbose = 4)
print_log_bp(zh-zh_log, \n\tfirst block: );

Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h
==
--- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h   Sun Jan 
 3 02:43:46 2010(r201408)
+++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h   Sun Jan 
 3 02:58:05 2010(r201409)
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -56,10 +56,16 @@ typedef struct zil_header {
uint64_t zh_replay_seq; /* highest replayed sequence number */
blkptr_t zh_log;/* log chain */
uint64_t zh_claim_seq;  /* highest claimed sequence number */
-   uint64_t zh_pad[5];
+   uint64_t zh_flags;  /* header flags */
+   uint64_t zh_pad[4];
 } zil_header_t;
 
 /*
+ * zh_flags bit settings
+ */
+#defineZIL_REPLAY_NEEDED 0x1   /* replay needed - internal only */
+
+/*
  * Log block trailer - structure at the end of the header and each log block
  *
  * The zit_bt contains a zbt_cksum which for the intent log is

Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
==
--- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c   Sun Jan 
 3 02:43:46 2010(r201408)
+++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c   Sun Jan 
 3 02:58:05 2010(r201409)
@@ -502,6 +502,25 @@ zil_rollback_destroy(zilog_t *zilog, dmu
tx, zh-zh_claim_txg);
 }
 
+/*
+ * return true if the initial log block is not valid
+ */
+static boolean_t
+zil_empty(zilog_t *zilog)
+{
+   const zil_header_t *zh = zilog-zl_header;
+   arc_buf_t *abuf = NULL;
+
+   if (BP_IS_HOLE(zh-zh_log))
+   return (B_TRUE);
+
+   if (zil_read_log_block(zilog, zh-zh_log, abuf) != 0)
+   return (B_TRUE);
+
+   VERIFY(arc_buf_remove_ref(abuf, abuf) == 1);
+   return (B_FALSE);
+}
+
 int
 zil_claim(char *osname, void *txarg)
 {
@@ -522,6 +541,21 @@ zil_claim(char *osname, void *txarg)
zh = zil_header_in_syncing_context(zilog);
 
/*
+* Record here whether the zil has any records to replay.
+* If the header block pointer is null or the block points
+* to the stubby then we know there are no valid log records.
+* We use the header to store this state as the the zilog gets
+* freed later in dmu_objset_close().
+* The flags (and the rest of the header fields) are cleared in
+* zil_sync() as a result of a

svn commit: r201410 - head/sys/sparc64/conf

2010-01-02 Thread Marius Strobl

Author: marius
Date: Sun Jan  3 02:58:43 2010
New Revision: 201410
URL: http://svn.freebsd.org/changeset/base/201410

Log:
  Exclude options COMPAT_FREEBSD4 now that the MD freebsd4_sigreturn()
  is gone since r201396 and which is also in line with the fact that
  FreeBSD 4 didn't supported sparc64.

Modified:
  head/sys/sparc64/conf/NOTES

Modified: head/sys/sparc64/conf/NOTES
==
--- head/sys/sparc64/conf/NOTES Sun Jan  3 02:58:05 2010(r201409)
+++ head/sys/sparc64/conf/NOTES Sun Jan  3 02:58:43 2010(r201410)
@@ -129,6 +129,7 @@ nodeviceex
 # Options we don't want to deal with
 
 nooption   FDC_DEBUG
+nooption   COMPAT_FREEBSD4
 nooption   SC_RENDER_DEBUG
 nooption   SC_DEBUG_LEVEL
 nooption   PPC_DEBUG
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201411 - in stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys

2010-01-02 Thread Xin LI

Author: delphij
Date: Sun Jan  3 03:05:30 2010
New Revision: 201411
URL: http://svn.freebsd.org/changeset/base/201411

Log:
  MFC r200726:
  
  Apply fix for Solaris bug 6801979: zfs recv can fail with E2BIG
  (onnv revision 8986)
  
  PR:   kern/141355
  Requested by: mm
  Submitted by: pjd
  Obtained from:OpenSolaris

Modified:
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c
==
--- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c
Sun Jan  3 02:58:43 2010(r201410)
+++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c
Sun Jan  3 03:05:30 2010(r201411)
@@ -19,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident  %Z%%M% %I% %E% SMI
-
 #include sys/dmu.h
 #include sys/dmu_objset.h
 #include sys/dmu_tx.h
@@ -108,19 +106,51 @@ dmu_object_claim(objset_t *os, uint64_t 
 
 int
 dmu_object_reclaim(objset_t *os, uint64_t object, dmu_object_type_t ot,
-int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx)
+int blocksize, dmu_object_type_t bonustype, int bonuslen)
 {
dnode_t *dn;
+   dmu_tx_t *tx;
+   int nblkptr;
int err;
 
-   if (object == DMU_META_DNODE_OBJECT  !dmu_tx_private_ok(tx))
+   if (object == DMU_META_DNODE_OBJECT)
return (EBADF);
 
err = dnode_hold_impl(os-os, object, DNODE_MUST_BE_ALLOCATED,
FTAG, dn);
if (err)
return (err);
+
+   if (dn-dn_type == ot  dn-dn_datablksz == blocksize 
+   dn-dn_bonustype == bonustype  dn-dn_bonuslen == bonuslen) {
+   /* nothing is changing, this is a noop */
+   dnode_rele(dn, FTAG);
+   return (0);
+   }
+
+   tx = dmu_tx_create(os);
+   dmu_tx_hold_bonus(tx, object);
+   err = dmu_tx_assign(tx, TXG_WAIT);
+   if (err) {
+   dmu_tx_abort(tx);
+   dnode_rele(dn, FTAG);
+   return (err);
+   }
+
+   nblkptr = 1 + ((DN_MAX_BONUSLEN - bonuslen)  SPA_BLKPTRSHIFT);
+
+   /*
+* If we are losing blkptrs or changing the block size this must
+* be a new file instance.   We must clear out the previous file
+* contents before we can change this type of metadata in the dnode.
+*/
+   if (dn-dn_nblkptr  nblkptr || dn-dn_datablksz != blocksize)
+   dmu_free_long_range(os, object, 0, DMU_OBJECT_END);
+
dnode_reallocate(dn, ot, blocksize, bonustype, bonuslen, tx);
+
+   dmu_tx_commit(tx);
+
dnode_rele(dn, FTAG);
 
return (0);

Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
==
--- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c  Sun Jan 
 3 02:58:43 2010(r201410)
+++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c  Sun Jan 
 3 03:05:30 2010(r201411)
@@ -829,11 +829,6 @@ restore_object(struct restorearg *ra, ob
int err;
dmu_tx_t *tx;
 
-   err = dmu_object_info(os, drro-drr_object, NULL);
-
-   if (err != 0  err != ENOENT)
-   return (EINVAL);
-
if (drro-drr_type == DMU_OT_NONE ||
drro-drr_type = DMU_OT_NUMTYPES ||
drro-drr_bonustype = DMU_OT_NUMTYPES ||
@@ -846,12 +841,15 @@ restore_object(struct restorearg *ra, ob
return (EINVAL);
}
 
-   tx = dmu_tx_create(os);
+   err = dmu_object_info(os, drro-drr_object, NULL);
+
+   if (err != 0  err != ENOENT)
+   return (EINVAL);
 
if (err == ENOENT) {
/* currently free, want to be allocated */
+   tx = dmu_tx_create(os);
dmu_tx_hold_bonus(tx, DMU_NEW_OBJECT);
-   dmu_tx_hold_write(tx, DMU_NEW_OBJECT, 0, 1);
err = dmu_tx_assign(tx, TXG_WAIT);
if (err) {
dmu_tx_abort(tx);
@@ -860,28 +858,23 @@ restore_object(struct restorearg *ra, ob
err = dmu_object_claim(os, drro-drr_object,

svn commit: r201412 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

2010-01-02 Thread Xin LI

Author: delphij
Date: Sun Jan  3 03:10:28 2010
New Revision: 201412
URL: http://svn.freebsd.org/changeset/base/201412

Log:
  MFC r200727:
  
  Apply fix for Solaris bug 6764159: restore_object() makes a call
  that can block while having a tx open but not yet committed
  (onnv revision 7994)
  
  Submitted by: mm
  Approved by:  pjd
  Obtained from:OpenSolaris

Modified:
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
==
--- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c  Sun Jan 
 3 03:05:30 2010(r201411)
+++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c  Sun Jan 
 3 03:10:28 2010(r201412)
@@ -828,6 +828,7 @@ restore_object(struct restorearg *ra, ob
 {
int err;
dmu_tx_t *tx;
+   void *data = NULL;
 
if (drro-drr_type == DMU_OT_NONE ||
drro-drr_type = DMU_OT_NUMTYPES ||
@@ -869,6 +870,12 @@ restore_object(struct restorearg *ra, ob
if (err)
return (EINVAL);
 
+   if (drro-drr_bonuslen) {
+   data = restore_read(ra, P2ROUNDUP(drro-drr_bonuslen, 8));
+   if (ra-err)
+   return (ra-err);
+   }
+
tx = dmu_tx_create(os);
dmu_tx_hold_bonus(tx, drro-drr_object);
err = dmu_tx_assign(tx, TXG_WAIT);
@@ -880,18 +887,13 @@ restore_object(struct restorearg *ra, ob
dmu_object_set_checksum(os, drro-drr_object, drro-drr_checksum, tx);
dmu_object_set_compress(os, drro-drr_object, drro-drr_compress, tx);
 
-   if (drro-drr_bonuslen) {
+   if (data != NULL) {
dmu_buf_t *db;
-   void *data;
+
VERIFY(0 == dmu_bonus_hold(os, drro-drr_object, FTAG, db));
dmu_buf_will_dirty(db, tx);
 
ASSERT3U(db-db_size, =, drro-drr_bonuslen);
-   data = restore_read(ra, P2ROUNDUP(drro-drr_bonuslen, 8));
-   if (data == NULL) {
-   dmu_tx_commit(tx);
-   return (ra-err);
-   }
bcopy(data, db-db_data, drro-drr_bonuslen);
if (ra-byteswap) {
dmu_ot[drro-drr_bonustype].ot_byteswap(db-db_data,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

svn commit: r201413 - stable/7/sys/compat/svr4

2010-01-02 Thread Xin LI

Author: delphij
Date: Sun Jan  3 03:23:17 2010
New Revision: 201413
URL: http://svn.freebsd.org/changeset/base/201413

Log:
  MFC r193012:
  
  Add new sysconfig bits, Fix the bogus numbering of the old bits.
  
  Submitted by: Pedro f. Giffuni giffunip asme org
  Obtained from:NetBSD
  PR:   kern/91293

Modified:
  stable/7/sys/compat/svr4/svr4_misc.c
  stable/7/sys/compat/svr4/svr4_sysconfig.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/compat/svr4/svr4_misc.c
==
--- stable/7/sys/compat/svr4/svr4_misc.cSun Jan  3 03:10:28 2010
(r201412)
+++ stable/7/sys/compat/svr4/svr4_misc.cSun Jan  3 03:23:17 2010
(r201413)
@@ -706,9 +706,6 @@ svr4_sys_sysconfig(td, uap)
retval = (td-td_retval[0]);
 
switch (uap-name) {
-   case SVR4_CONFIG_UNUSED:
-   *retval = 0;
-   break;
case SVR4_CONFIG_NGROUPS:
*retval = NGROUPS_MAX;
break;
@@ -788,7 +785,45 @@ svr4_sys_sysconfig(td, uap)
 #endif
break;
 #endif /* NOTYET */
-
+   case SVR4_CONFIG_COHERENCY:
+   *retval = 0;/* XXX */
+   break;
+   case SVR4_CONFIG_SPLIT_CACHE:
+   *retval = 0;/* XXX */
+   break;
+   case SVR4_CONFIG_ICACHESZ:
+   *retval = 256;  /* XXX */
+   break;
+   case SVR4_CONFIG_DCACHESZ:
+   *retval = 256;  /* XXX */
+   break;
+   case SVR4_CONFIG_ICACHELINESZ:
+   *retval = 64;   /* XXX */
+   break;
+   case SVR4_CONFIG_DCACHELINESZ:
+   *retval = 64;   /* XXX */
+   break;
+   case SVR4_CONFIG_ICACHEBLKSZ:
+   *retval = 64;   /* XXX */
+   break;
+   case SVR4_CONFIG_DCACHEBLKSZ:
+   *retval = 64;   /* XXX */
+   break;
+   case SVR4_CONFIG_DCACHETBLKSZ:
+   *retval = 64;   /* XXX */
+   break;
+   case SVR4_CONFIG_ICACHE_ASSOC:
+   *retval = 1;/* XXX */
+   break;
+   case SVR4_CONFIG_DCACHE_ASSOC:
+   *retval = 1;/* XXX */
+   break;
+   case SVR4_CONFIG_MAXPID:
+   *retval = PID_MAX;
+   break;
+   case SVR4_CONFIG_STACK_PROT:
+   *retval = PROT_READ|PROT_WRITE|PROT_EXEC;
+   break;
default:
return EINVAL;
}

Modified: stable/7/sys/compat/svr4/svr4_sysconfig.h
==
--- stable/7/sys/compat/svr4/svr4_sysconfig.h   Sun Jan  3 03:10:28 2010
(r201412)
+++ stable/7/sys/compat/svr4/svr4_sysconfig.h   Sun Jan  3 03:23:17 2010
(r201413)
@@ -31,7 +31,7 @@
 #ifndef_SVR4_SYSCONFIG_H_
 #define_SVR4_SYSCONFIG_H_
 
-#define SVR4_CONFIG_UNUSED 0x01
+#define SVR4_CONFIG_UNUSED_1   0x01
 #define SVR4_CONFIG_NGROUPS0x02
 #define SVR4_CONFIG_CHILD_MAX  0x03
 #define SVR4_CONFIG_OPEN_FILES 0x04
@@ -43,20 +43,36 @@
 #define SVR4_CONFIG_PROF_TCK   0x0a
 #define SVR4_CONFIG_NPROC_CONF 0x0b
 #defineSVR4_CONFIG_NPROC_ONLN  0x0c
-#defineSVR4_CONFIG_AIO_LISTIO_MAX  0x0e
-#defineSVR4_CONFIG_AIO_MAX 0x0f
-#defineSVR4_CONFIG_AIO_PRIO_DELTA_MAX  0x10
-#defineSVR4_CONFIG_DELAYTIMER_MAX  0x11
-#defineSVR4_CONFIG_MQ_OPEN_MAX 0x12
-#defineSVR4_CONFIG_MQ_PRIO_MAX 0x13
-#defineSVR4_CONFIG_RTSIG_MAX   0x14
-#defineSVR4_CONFIG_SEM_NSEMS_MAX   0x15
-#defineSVR4_CONFIG_SEM_VALUE_MAX   0x16
-#defineSVR4_CONFIG_SIGQUEUE_MAX0x17
-#defineSVR4_CONFIG_SIGRT_MIN   0x18
-#defineSVR4_CONFIG_SIGRT_MAX   0x19
-#defineSVR4_CONFIG_TIMER_MAX   0x20
-#defineSVR4_CONFIG_PHYS_PAGES  0x21
-#defineSVR4_CONFIG_AVPHYS_PAGES0x22
+#defineSVR4_CONFIG_AIO_LISTIO_MAX  0x0d
+#defineSVR4_CONFIG_AIO_MAX 0x0e
+#defineSVR4_CONFIG_AIO_PRIO_DELTA_MAX  0x0f
+#defineSVR4_CONFIG_DELAYTIMER_MAX  0x10
+#defineSVR4_CONFIG_MQ_OPEN_MAX 0x11
+#defineSVR4_CONFIG_MQ_PRIO_MAX 0x12
+#defineSVR4_CONFIG_RTSIG_MAX   0x13
+#defineSVR4_CONFIG_SEM_NSEMS_MAX   0x14
+#defineSVR4_CONFIG_SEM_VALUE_MAX   0x15
+#defineSVR4_CONFIG_SIGQUEUE_MAX0x16
+#defineSVR4_CONFIG_SIGRT_MIN   0x17
+#defineSVR4_CONFIG_SIGRT_MAX   0x18
+#defineSVR4_CONFIG_TIMER_MAX

svn commit: r201414 - stable/6/sys/compat/svr4

2010-01-02 Thread Xin LI

Author: delphij
Date: Sun Jan  3 03:35:23 2010
New Revision: 201414
URL: http://svn.freebsd.org/changeset/base/201414

Log:
  MFC r193012:
  
  Add new sysconfig bits, Fix the bogus numbering of the old bits.
  
  Submitted by: Pedro f. Giffuni giffunip asme org
  Obtained from:NetBSD
  PR:   kern/91293

Modified:
  stable/6/sys/compat/svr4/svr4_misc.c
  stable/6/sys/compat/svr4/svr4_sysconfig.h
Directory Properties:
  stable/6/sys/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)

Modified: stable/6/sys/compat/svr4/svr4_misc.c
==
--- stable/6/sys/compat/svr4/svr4_misc.cSun Jan  3 03:23:17 2010
(r201413)
+++ stable/6/sys/compat/svr4/svr4_misc.cSun Jan  3 03:35:23 2010
(r201414)
@@ -699,9 +699,6 @@ svr4_sys_sysconfig(td, uap)
retval = (td-td_retval[0]);
 
switch (uap-name) {
-   case SVR4_CONFIG_UNUSED:
-   *retval = 0;
-   break;
case SVR4_CONFIG_NGROUPS:
*retval = NGROUPS_MAX;
break;
@@ -781,7 +778,45 @@ svr4_sys_sysconfig(td, uap)
 #endif
break;
 #endif /* NOTYET */
-
+   case SVR4_CONFIG_COHERENCY:
+   *retval = 0;/* XXX */
+   break;
+   case SVR4_CONFIG_SPLIT_CACHE:
+   *retval = 0;/* XXX */
+   break;
+   case SVR4_CONFIG_ICACHESZ:
+   *retval = 256;  /* XXX */
+   break;
+   case SVR4_CONFIG_DCACHESZ:
+   *retval = 256;  /* XXX */
+   break;
+   case SVR4_CONFIG_ICACHELINESZ:
+   *retval = 64;   /* XXX */
+   break;
+   case SVR4_CONFIG_DCACHELINESZ:
+   *retval = 64;   /* XXX */
+   break;
+   case SVR4_CONFIG_ICACHEBLKSZ:
+   *retval = 64;   /* XXX */
+   break;
+   case SVR4_CONFIG_DCACHEBLKSZ:
+   *retval = 64;   /* XXX */
+   break;
+   case SVR4_CONFIG_DCACHETBLKSZ:
+   *retval = 64;   /* XXX */
+   break;
+   case SVR4_CONFIG_ICACHE_ASSOC:
+   *retval = 1;/* XXX */
+   break;
+   case SVR4_CONFIG_DCACHE_ASSOC:
+   *retval = 1;/* XXX */
+   break;
+   case SVR4_CONFIG_MAXPID:
+   *retval = PID_MAX;
+   break;
+   case SVR4_CONFIG_STACK_PROT:
+   *retval = PROT_READ|PROT_WRITE|PROT_EXEC;
+   break;
default:
return EINVAL;
}

Modified: stable/6/sys/compat/svr4/svr4_sysconfig.h
==
--- stable/6/sys/compat/svr4/svr4_sysconfig.h   Sun Jan  3 03:23:17 2010
(r201413)
+++ stable/6/sys/compat/svr4/svr4_sysconfig.h   Sun Jan  3 03:35:23 2010
(r201414)
@@ -31,7 +31,7 @@
 #ifndef_SVR4_SYSCONFIG_H_
 #define_SVR4_SYSCONFIG_H_
 
-#define SVR4_CONFIG_UNUSED 0x01
+#define SVR4_CONFIG_UNUSED_1   0x01
 #define SVR4_CONFIG_NGROUPS0x02
 #define SVR4_CONFIG_CHILD_MAX  0x03
 #define SVR4_CONFIG_OPEN_FILES 0x04
@@ -43,20 +43,36 @@
 #define SVR4_CONFIG_PROF_TCK   0x0a
 #define SVR4_CONFIG_NPROC_CONF 0x0b
 #defineSVR4_CONFIG_NPROC_ONLN  0x0c
-#defineSVR4_CONFIG_AIO_LISTIO_MAX  0x0e
-#defineSVR4_CONFIG_AIO_MAX 0x0f
-#defineSVR4_CONFIG_AIO_PRIO_DELTA_MAX  0x10
-#defineSVR4_CONFIG_DELAYTIMER_MAX  0x11
-#defineSVR4_CONFIG_MQ_OPEN_MAX 0x12
-#defineSVR4_CONFIG_MQ_PRIO_MAX 0x13
-#defineSVR4_CONFIG_RTSIG_MAX   0x14
-#defineSVR4_CONFIG_SEM_NSEMS_MAX   0x15
-#defineSVR4_CONFIG_SEM_VALUE_MAX   0x16
-#defineSVR4_CONFIG_SIGQUEUE_MAX0x17
-#defineSVR4_CONFIG_SIGRT_MIN   0x18
-#defineSVR4_CONFIG_SIGRT_MAX   0x19
-#defineSVR4_CONFIG_TIMER_MAX   0x20
-#defineSVR4_CONFIG_PHYS_PAGES  0x21
-#defineSVR4_CONFIG_AVPHYS_PAGES0x22
+#defineSVR4_CONFIG_AIO_LISTIO_MAX  0x0d
+#defineSVR4_CONFIG_AIO_MAX 0x0e
+#defineSVR4_CONFIG_AIO_PRIO_DELTA_MAX  0x0f
+#defineSVR4_CONFIG_DELAYTIMER_MAX  0x10
+#defineSVR4_CONFIG_MQ_OPEN_MAX 0x11
+#defineSVR4_CONFIG_MQ_PRIO_MAX 0x12
+#defineSVR4_CONFIG_RTSIG_MAX   0x13
+#defineSVR4_CONFIG_SEM_NSEMS_MAX   0x14
+#defineSVR4_CONFIG_SEM_VALUE_MAX   0x15
+#defineSVR4_CONFIG_SIGQUEUE_MAX0x16
+#defineSVR4_CONFIG_SIGRT_MIN   0x17
+#defineSVR4_CONFIG_SIGRT_MAX   0x18
+#defineSVR4_CONFIG_TIMER_MAX   0x19
+#defineSVR4_CONFIG_PHYS_PAGES  0x1a

svn commit: r201415 - head/sys/pc98/conf

2010-01-02 Thread Takahashi Yoshihiro

Author: nyan
Date: Sun Jan  3 04:38:38 2010
New Revision: 201415
URL: http://svn.freebsd.org/changeset/base/201415

Log:
  Re-enable more options and devices.  Now kernel size problem is gone.
  
  MFC after:2 week

Modified:
  head/sys/pc98/conf/GENERIC

Modified: head/sys/pc98/conf/GENERIC
==
--- head/sys/pc98/conf/GENERIC  Sun Jan  3 03:35:23 2010(r201414)
+++ head/sys/pc98/conf/GENERIC  Sun Jan  3 04:38:38 2010(r201415)
@@ -38,7 +38,7 @@ options   SCHED_4BSD  # 4BSD scheduler
 #options   PREEMPTION  # Enable kernel thread preemption
 optionsINET# InterNETworking
 optionsINET6   # IPv6 communications protocols
-#options   SCTP# Stream Control Transmission Protocol
+optionsSCTP# Stream Control Transmission Protocol
 optionsFFS # Berkeley Fast Filesystem
 optionsSOFTUPDATES # Enable FFS soft updates support
 optionsUFS_ACL # Support for access control lists
@@ -46,13 +46,13 @@ options UFS_DIRHASH # Improve performa
 optionsUFS_GJOURNAL# Enable gjournal-based UFS journaling
 optionsMD_ROOT # MD is a potential root device
 optionsNFSCLIENT   # Network Filesystem Client
-#options   NFSSERVER   # Network Filesystem Server
-#options   NFSLOCKD# Network Lock Manager
+optionsNFSSERVER   # Network Filesystem Server
+optionsNFSLOCKD# Network Lock Manager
 optionsNFS_ROOT# NFS usable as /, requires NFSCLIENT
 optionsMSDOSFS # MSDOS Filesystem
 optionsCD9660  # ISO 9660 Filesystem
-#options   PROCFS  # Process filesystem (requires PSEUDOFS)
-#options   PSEUDOFS# Pseudo-filesystem framework
+optionsPROCFS  # Process filesystem (requires PSEUDOFS)
+optionsPSEUDOFS# Pseudo-filesystem framework
 optionsGEOM_PART_GPT   # GUID Partition Tables.
 optionsGEOM_LABEL  # Provides labelization
 optionsCOMPAT_43TTY# BSD 4.3 TTY compat (sgtty)
@@ -66,9 +66,9 @@ options   EPSON_BOUNCEDMA # use bounce b
 #options   LINE30
 optionsKTRACE  # ktrace(1) support
 optionsSTACK   # stack(9) support
-#options   SYSVSHM # SYSV-style shared memory
-#options   SYSVMSG # SYSV-style message queues
-#options   SYSVSEM # SYSV-style semaphores
+optionsSYSVSHM # SYSV-style shared memory
+optionsSYSVMSG # SYSV-style message queues
+optionsSYSVSEM # SYSV-style semaphores
 optionsP1003_1B_SEMAPHORES # POSIX-style semaphores
 options_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time 
extensions
 optionsKBD_INSTALL_CDEV# install a CDEV entry in /dev
@@ -114,9 +114,9 @@ device  sym # NCR/Symbios Logic 
(newer 
 device aic # PC-9801-100
 device ct  # host adapter using WD33C93[ABC] chip (C bus)
 
-#devicencv # NCR 53C500
-#devicensp # Workbit Ninja SCSI-3
-#devicestg # TMC 18C30/18C50
+device ncv # NCR 53C500
+device nsp # Workbit Ninja SCSI-3
+device stg # TMC 18C30/18C50
 
 # SCSI peripherals
 device scbus   # SCSI bus (required for SCSI)
@@ -155,9 +155,9 @@ device  sc
 
 # PCCARD (PCMCIA) support
 # PCMCIA and cardbus bridge support
-#devicecbb # cardbus (yenta) bridge
-#devicepccard  # PC Card (16-bit) bus
-#devicecardbus # CardBus (32-bit) bus
+device cbb # cardbus (yenta) bridge
+device pccard  # PC Card (16-bit) bus
+device cardbus # CardBus (32-bit) bus
 
 # Serial (COM) ports
 #options   COM_MULTIPORT
@@ -169,15 +169,15 @@ devicemse
 #devicejoy
 
 # NEW Parallel port
-#deviceppc
-#deviceppbus   # Parallel port bus (required)
-#devicelpt # Printer
-#deviceplip# TCP/IP over parallel
-#deviceppi # Parallel port interface device
+device ppc
+device ppbus   # Parallel port bus (required)
+device lpt # Printer
+device plip# TCP/IP over parallel
+device ppi #

svn commit: r201416 - head/sys/netinet

2010-01-02 Thread Navdeep Parhar

Author: np
Date: Sun Jan  3 06:43:13 2010
New Revision: 201416
URL: http://svn.freebsd.org/changeset/base/201416

Log:
  Avoid NULL dereference in arpresolve.

Modified:
  head/sys/netinet/if_ether.c

Modified: head/sys/netinet/if_ether.c
==
--- head/sys/netinet/if_ether.c Sun Jan  3 04:38:38 2010(r201415)
+++ head/sys/netinet/if_ether.c Sun Jan  3 06:43:13 2010(r201416)
@@ -372,8 +372,8 @@ retry:
if (la-la_asked  V_arp_maxtries)
error = EWOULDBLOCK;/* First request. */
else
-   error =
-   (rt0-rt_flags  RTF_GATEWAY) ? EHOSTUNREACH : 
EHOSTDOWN;
+   error = rt0 != NULL  (rt0-rt_flags  RTF_GATEWAY) ?
+   EHOSTUNREACH : EHOSTDOWN;
 
if (renew) {
LLE_ADDREF(la);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

40 matches

Mail list logo