svn commit: r208184 - head/lib/libarchive
Author: delphij
Date: Mon May 17 07:06:54 2010
New Revision: 208184
URL: http://svn.freebsd.org/changeset/base/208184
Log:
Fix build.
Modified:
head/lib/libarchive/Makefile
Modified: head/lib/libarchive/Makefile
==
--- head/lib/libarchive/MakefileMon May 17 03:51:57 2010
(r208183)
+++ head/lib/libarchive/MakefileMon May 17 07:06:54 2010
(r208184)
@@ -7,7 +7,7 @@ LDADD= -lz -lmd
DPADD+= ${LIBBZ2}
LDADD+= -lbz2
-CFLAGS+= -DHAVE_BZLIB_H 1
+CFLAGS+= -DHAVE_BZLIB_H=1
DPADD+= ${LIBLZMA}
LDADD+= -llzma
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r208189 - head/usr.bin/ar
Author: kaiw
Date: Mon May 17 09:37:59 2010
New Revision: 208189
URL: http://svn.freebsd.org/changeset/base/208189
Log:
Removed ar(1)'s support for compressed archives. This change removes
ar(1)'s dependencies on compressor libraries -lz, -lbz2 and -llzma and
fixes building HEAD on some versions of FreeBSD[78]. Option -j and -z
is now accepted but ignored.
Compressed ar(1) archives are not useful without a ld(1) that can read
them. Also, the current ar(1) compression scheme prevents random
access of archive members and needs to be redesigned anyway.
Submitted by: kientzle (original patch)
Reviewed by: delphij
Discussed on: -current mailing list
Modified:
head/usr.bin/ar/Makefile
head/usr.bin/ar/acpyacc.y
head/usr.bin/ar/ar.1
head/usr.bin/ar/ar.c
head/usr.bin/ar/ar.h
head/usr.bin/ar/read.c
head/usr.bin/ar/write.c
Modified: head/usr.bin/ar/Makefile
==
--- head/usr.bin/ar/MakefileMon May 17 08:46:27 2010(r208188)
+++ head/usr.bin/ar/MakefileMon May 17 09:37:59 2010(r208189)
@@ -3,8 +3,8 @@
PROG= ar
SRCS= ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h
-DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} ${LIBELF}
-LDADD= -larchive -lbz2 -lz -llzma -lelf
+DPADD= ${LIBARCHIVE} ${LIBELF}
+LDADD= -larchive -lelf
CFLAGS+=-I. -I${.CURDIR}
Modified: head/usr.bin/ar/acpyacc.y
==
--- head/usr.bin/ar/acpyacc.y Mon May 17 08:46:27 2010(r208188)
+++ head/usr.bin/ar/acpyacc.y Mon May 17 09:37:59 2010(r208189)
@@ -250,7 +250,7 @@ arscp_open(char *fname)
if ((a = archive_read_new()) == NULL)
bsdar_errc(bsdar, EX_SOFTWARE, 0, archive_read_new failed);
- archive_read_support_compression_all(a);
+ archive_read_support_compression_none(a);
archive_read_support_format_ar(a);
AC(archive_read_open_file(a, fname, DEF_BLKSZ));
if ((r = archive_read_next_header(a, entry)))
Modified: head/usr.bin/ar/ar.1
==
--- head/usr.bin/ar/ar.1Mon May 17 08:46:27 2010(r208188)
+++ head/usr.bin/ar/ar.1Mon May 17 09:37:59 2010(r208189)
@@ -23,7 +23,7 @@
.\
.\ $FreeBSD$
.\
-.Dd August 31, 2007
+.Dd May 17, 2010
.Dt AR 1
.Os
.Sh NAME
@@ -186,8 +186,7 @@ Synonymous with option
Synonymous with option
.Fl b .
.It Fl j
-Compress the resulting archive with
-.Xr bzip2 1 .
+This option is accepted but ignored.
.It Fl m
Move archive members specified by arguments
.Ar files ...
@@ -344,8 +343,7 @@ of extraction unless the
.Fl o
option was specified.
.It Fl z
-Compress the resulting archive with
-.Xr gzip 1 .
+This option is accepted but ignored.
.El
.Sh EXAMPLES
To create a new archive
Modified: head/usr.bin/ar/ar.c
==
--- head/usr.bin/ar/ar.cMon May 17 08:46:27 2010(r208188)
+++ head/usr.bin/ar/ar.cMon May 17 09:37:59 2010(r208189)
@@ -178,7 +178,7 @@ main(int argc, char **argv)
bsdar-options |= AR_TR;
break;
case 'j':
- bsdar-options |= AR_J;
+ /* ignored */
break;
case 'l':
/* ignored, for GNU ar comptibility */
@@ -223,7 +223,7 @@ main(int argc, char **argv)
set_mode(bsdar, opt);
break;
case 'z':
- bsdar-options |= AR_Z;
+ /* ignored */
break;
case OPTION_HELP:
bsdar_usage();
Modified: head/usr.bin/ar/ar.h
==
--- head/usr.bin/ar/ar.hMon May 17 08:46:27 2010(r208188)
+++ head/usr.bin/ar/ar.hMon May 17 09:37:59 2010(r208189)
@@ -81,7 +81,6 @@ struct bsdar {
const char *addlib; /* target of ADDLIB. */
const char *posarg; /* position arg for modifiers -a, -b. */
char mode; /* program mode */
- char compression; /* compression mode */
int options; /* command line options */
const char *progname; /* program name */
Modified: head/usr.bin/ar/read.c
==
--- head/usr.bin/ar/read.c Mon May 17 08:46:27 2010(r208188)
+++ head/usr.bin/ar/read.c Mon May 17 09:37:59 2010(r208189)
@@ -87,7 +87,7 @@ read_archive(struct bsdar *bsdar, char m
if ((a = archive_read_new()) == NULL)
bsdar_errc(bsdar, EX_SOFTWARE, 0,
Re: svn commit: r208189 - head/usr.bin/ar
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 2010/05/17 02:37, Kai Wang wrote: Author: kaiw Date: Mon May 17 09:37:59 2010 New Revision: 208189 URL: http://svn.freebsd.org/changeset/base/208189 Log: Removed ar(1)'s support for compressed archives. This change removes ar(1)'s dependencies on compressor libraries -lz, -lbz2 and -llzma and fixes building HEAD on some versions of FreeBSD[78]. Option -j and -z is now accepted but ignored. Compressed ar(1) archives are not useful without a ld(1) that can read them. Also, the current ar(1) compression scheme prevents random access of archive members and needs to be redesigned anyway. Submitted by: kientzle (original patch) Thanks! Cheers, - -- Xin LI delp...@delphij.nethttp://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.14 (FreeBSD) iQEcBAEBAgAGBQJL8SBDAAoJEATO+BI/yjfB5L8H/1g1dYSRfWF46pTaRVmaXVFq SwehL5jGPtN9UxZzSeLD9XTqOCQc1VSl5yrkTp+FtHxwh8gG6H8J8rQeQlVvguzd Ns3HXTL3b64LOPvumYj22+kklbapvP7ZjZHCT4pixcGA8wyteM8Zi5hjN0bELINM 0eq62DJuaC59UzPksfWGO7pdlGmkWeAYzPWXsPpaCX65MAkHJpIwmTrrMiNELvvu bhmxw3Op2iVmiY4AJuQX/yjL9AHSpriHC/sb1n9iQMfcqJ0OQRKHR2DR04omWAbF RUF6p5N501yylLAEI3MOGZH/f47/GIr84eAheuNbC4WzI93StWllB7s6DHdlN1U= =/81y -END PGP SIGNATURE- ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r208190 - head/usr.sbin/daemon
Author: ivoras Date: Mon May 17 11:18:33 2010 New Revision: 208190 URL: http://svn.freebsd.org/changeset/base/208190 Log: Slightly improve wording. Modified: head/usr.sbin/daemon/daemon.8 Modified: head/usr.sbin/daemon/daemon.8 == --- head/usr.sbin/daemon/daemon.8 Mon May 17 09:37:59 2010 (r208189) +++ head/usr.sbin/daemon/daemon.8 Mon May 17 11:18:33 2010 (r208190) @@ -63,7 +63,8 @@ Note, that the file will be created shor actually executed, and will remain after the process exits (although it will be removed if the execution fails). .It Fl u Ar user -Run the program with the rights of user specified, requires privilege. +Login name of the user to execute the program under. +Requires adequate superuser privileges. .El .Sh EXIT STATUS The ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
RE: svn commit: r208003 - in head/sys: kern sys
From: Kostik Belousov [mailto:kostik...@gmail.com] On Wed, May 12, 2010 at 09:24:46PM +, Zachary Loafman wrote: Author: zml Date: Wed May 12 21:24:46 2010 New Revision: 208003 URL: http://svn.freebsd.org/changeset/base/208003 Log: Add VOP_ADVLOCKPURGE so that the file system is called when purging locks (in the case where the VFS impl isn't using lf_*) Submitted by: Matthew Fleming matthew.flem...@isilon.com Reviewed by:zml, dfr After looking at what happen to nullfs, see r208003, I wonder why the vop is needed. It is called after VOP_RECLAIM is called by vgonel(), after fs-specific data are destroyed. So, on the one hand, vop can only operate on struct vnode proper, on the other hand, the actions performed by vop_advlockpurge implementation can be done by vop_reclaim as well. Could you, please, give some details on the supposed use of the vop ? From a design perspective, it makes little sense to allow overriding the advlock operation, but not the purge. A specific example is if an implementation does not use struct lockf to implement advlock, then the hack you mention of purging in VOP_RECLAIM is needed. After looking over the history of the changes, I believe it would be sufficient to have the lock purge done before the reclaim. The vnode is locked exclusively for both operations, so I don't believe there will be any timing windows. But I am still not 100% sure when the file lock is used versus the interlock for serializing access to various fields. The advlock VOPs are analogous to the regular VOP_LOCK in that we expect an implementation may override the VOP and also the data structures used, e.g. to not use the vnode's v_lock field for the VOP_LOCK. Thus any code which refers to v_lockf should be wrapped in a VOP to allow correct overriding. Thanks, matthew ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r208003 - in head/sys: kern sys
On Mon, May 17, 2010 at 08:33:52AM -0700, Matthew Fleming wrote: From: Kostik Belousov [mailto:kostik...@gmail.com] On Wed, May 12, 2010 at 09:24:46PM +, Zachary Loafman wrote: Author: zml Date: Wed May 12 21:24:46 2010 New Revision: 208003 URL: http://svn.freebsd.org/changeset/base/208003 Log: Add VOP_ADVLOCKPURGE so that the file system is called when purging locks (in the case where the VFS impl isn't using lf_*) Submitted by: Matthew Fleming matthew.flem...@isilon.com Reviewed by:zml, dfr After looking at what happen to nullfs, see r208003, I wonder why the vop is needed. It is called after VOP_RECLAIM is called by vgonel(), after fs-specific data are destroyed. So, on the one hand, vop can only operate on struct vnode proper, on the other hand, the actions performed by vop_advlockpurge implementation can be done by vop_reclaim as well. Could you, please, give some details on the supposed use of the vop ? From a design perspective, it makes little sense to allow overriding the advlock operation, but not the purge. A specific example is if an implementation does not use struct lockf to implement advlock, then the hack you mention of purging in VOP_RECLAIM is needed. After looking over the history of the changes, I believe it would be sufficient to have the lock purge done before the reclaim. The vnode is locked exclusively for both operations, so I don't believe there will be any timing windows. But I am still not 100% sure when the file lock is used versus the interlock for serializing access to various fields. The advlock VOPs are analogous to the regular VOP_LOCK in that we expect an implementation may override the VOP and also the data structures used, e.g. to not use the vnode's v_lock field for the VOP_LOCK. Thus any code which refers to v_lockf should be wrapped in a VOP to allow correct overriding. Essentially, my argument is that whatever you do in VOP_ADVLOCKPURGE, can be and should be done in VOP_RECLAIM. This would also cover the v_data issue. pgpCLKzTeglGc.pgp Description: PGP signature
RE: svn commit: r208003 - in head/sys: kern sys
From: Kostik Belousov [mailto:kostik...@gmail.com] Essentially, my argument is that whatever you do in VOP_ADVLOCKPURGE, can be and should be done in VOP_RECLAIM. This would also cover the v_data issue. I disagree about the should. I believe that if BSD wants to allow overriding lf_advlock(9) with VOP_ADVLOCK it should fully support the overriding. Alternatively, the call to lf_purgelocks(9) should be pushed down into each filesystem's VOP_RECLAIM for consistency. Thanks, matthew ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r208172 - in head/sys: dev/ofw powerpc/aim powerpc/ofw
On Sun, May 16, 2010 at 10:01:43PM +, Nathan Whitehorn wrote: Author: nwhitehorn Date: Sun May 16 22:01:43 2010 New Revision: 208172 URL: http://svn.freebsd.org/changeset/base/208172 Log: Pull OF_quiesce() out of the MI Open Firmware layer and entirely into PPC ofw_machdep.c, in recognition of its state as a machine specific hack. Thanks! Marius ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r208210 - head/usr.bin/wc
Author: pjd Date: Mon May 17 19:13:49 2010 New Revision: 208210 URL: http://svn.freebsd.org/changeset/base/208210 Log: Use better type for siginfo (volatile sig_atomic_t instead of int). Pointed out by: jh Modified: head/usr.bin/wc/wc.c Modified: head/usr.bin/wc/wc.c == --- head/usr.bin/wc/wc.cMon May 17 17:56:27 2010(r208209) +++ head/usr.bin/wc/wc.cMon May 17 19:13:49 2010(r208210) @@ -63,7 +63,8 @@ __FBSDID($FreeBSD$); #include wctype.h uintmax_t tlinect, twordct, tcharct, tlongline; -int doline, doword, dochar, domulti, dolongline, siginfo; +int doline, doword, dochar, domulti, dolongline; +static volatile sig_atomic_t siginfo; static voidshow_cnt(const char *file, uintmax_t linect, uintmax_t wordct, uintmax_t charct, uintmax_t llct); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r208165 - in head/sys: kern mips/conf mips/include mips/mips mips/rmi mips/rmi/dev/xlr
On 16 May 2010, at 20:54, Juli Mallett wrote: On Sun, May 16, 2010 at 12:43, Randall Stewart r...@freebsd.org wrote: Author: rrs Date: Sun May 16 19:43:48 2010 New Revision: 208165 URL: http://svn.freebsd.org/changeset/base/208165 Log: This pushes all of JC's patches that I have in place. I am now able to run 32 cores ok.. but I still will hang on buildworld with a NFS problem. I suspect I am missing a patch for the netlogic rge driver. JC check and see if I am missing anything except your core-mask changes This isn't a very good commit message. Commits communicate things going forward. A follow-up E-Mail CCing JC would have been a good way to chat with him about its completeness. More importantly, though, there's just no description of the contents. This is particularly frustrating as it's also not broken up into functional chunks very well. Given the fact that there are MI changes and pan-MIPS changes here it would be nice to see a little more care taken. The changes to the MIPS MP code, for instance, I thought we had discussed and decided were sub-par and easily made less invasive. I can't comment on the RMI-specific stuff except to say that it's an unenumerated jumble of VM, networking and SMP changes. I completely agree. Regards, -- Rui Paulo ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r208234 - head/sys/fs/nfsclient
Author: rmacklem
Date: Mon May 17 23:55:38 2010
New Revision: 208234
URL: http://svn.freebsd.org/changeset/base/208234
Log:
Add a sanity check for a negative args.fhsize to the experimental
NFS client.
MFC after:5 days
Modified:
head/sys/fs/nfsclient/nfs_clvfsops.c
Modified: head/sys/fs/nfsclient/nfs_clvfsops.c
==
--- head/sys/fs/nfsclient/nfs_clvfsops.cMon May 17 23:55:23 2010
(r208233)
+++ head/sys/fs/nfsclient/nfs_clvfsops.cMon May 17 23:55:38 2010
(r208234)
@@ -951,7 +951,7 @@ nfs_mount(struct mount *mp)
if (vfs_getopt(mp-mnt_optnew, fh, (void **)args.fh,
args.fhsize) == 0) {
- if (args.fhsize NFSX_FHMAX) {
+ if (args.fhsize 0 || args.fhsize NFSX_FHMAX) {
vfs_mount_error(mp, Bad file handle);
error = EINVAL;
goto out;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r208241 - head/sbin/tunefs
Author: jeff
Date: Tue May 18 01:45:28 2010
New Revision: 208241
URL: http://svn.freebsd.org/changeset/base/208241
Log:
- Round up the journal size to the block size so we don't confuse fsck.
Reported by: Mikolaj Golub to.my.troc...@gmail.com
- Only require 256k of blocks per-cg when trying to allocate contiguous
journal blocks. The storage may not actually be contiguous but is at
least within one cg.
- When disabling SUJ leave SU enabled and report this to the user. It
is expected that users will upgrade SU filesystems to SUJ and want
a similar downgrade path.
Modified:
head/sbin/tunefs/tunefs.c
Modified: head/sbin/tunefs/tunefs.c
==
--- head/sbin/tunefs/tunefs.c Tue May 18 00:46:15 2010(r208240)
+++ head/sbin/tunefs/tunefs.c Tue May 18 01:45:28 2010(r208241)
@@ -358,10 +358,12 @@ main(int argc, char *argv[])
warnx(%s remains unchanged as disabled, name);
} else {
journal_clear();
- sblock.fs_flags = ~(FS_DOSOFTDEP | FS_SUJ);
+ sblock.fs_flags = ~FS_SUJ;
sblock.fs_sujfree = 0;
- warnx(%s cleared,
- remove .sujournal to reclaim space, name);
+ warnx(%s cleared but soft updates still set.,
+ name);
+
+ warnx(remove .sujournal to reclaim space);
}
}
}
@@ -546,7 +548,7 @@ journal_balloc(void)
* Try to minimize fragmentation by requiring a minimum
* number of blocks present.
*/
- if (cgp-cg_cs.cs_nbfree 128 * 1024 * 1024)
+ if (cgp-cg_cs.cs_nbfree 256 * 1024)
break;
if (contig == 0 cgp-cg_cs.cs_nbfree)
break;
@@ -906,6 +908,8 @@ journal_alloc(int64_t size)
if (size / sblock.fs_fsize sblock.fs_fpg)
size = sblock.fs_fpg * sblock.fs_fsize;
size = MAX(SUJ_MIN, size);
+ /* fsck does not support fragments in journal files. */
+ size = roundup(size, sblock.fs_bsize);
}
resid = blocks = size / sblock.fs_bsize;
if (sblock.fs_cstotal.cs_nbfree blocks) {
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r208253 - head/sys/mips/sibyte
Author: neel
Date: Tue May 18 05:12:54 2010
New Revision: 208253
URL: http://svn.freebsd.org/changeset/base/208253
Log:
Fix Sibyte SMP kernel breakage caused by r208249.
We need to include the header file that provides declaration of the
smp_topo_none() function.
Modified:
head/sys/mips/sibyte/sb_machdep.c
Modified: head/sys/mips/sibyte/sb_machdep.c
==
--- head/sys/mips/sibyte/sb_machdep.c Tue May 18 04:21:50 2010
(r208252)
+++ head/sys/mips/sibyte/sb_machdep.c Tue May 18 05:12:54 2010
(r208253)
@@ -76,6 +76,7 @@ __FBSDID($FreeBSD$);
#include machine/vmparam.h
#ifdef SMP
+#include sys/smp.h
#include machine/smp.h
#endif
@@ -347,6 +348,7 @@ platform_ipi_intrnum(void)
struct cpu_group *
platform_smp_topo(void)
{
+
return (smp_topo_none());
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
