svn commit: r223620 - head/cddl/contrib/opensolaris/cmd/zfs
Author: mm
Date: Tue Jun 28 06:16:33 2011
New Revision: 223620
URL: http://svn.freebsd.org/changeset/base/223620
Log:
Allow mountpoints as arguments for the 'zfs get' command.
Illumos-gate revision:13295
Obtained from:Illumos (Feature #510)
MFC after:1 week
Modified:
head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.cTue Jun 28 05:04:31
2011(r223619)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.cTue Jun 28 06:16:33
2011(r223620)
@@ -21,7 +21,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2010 Nexenta Systems, Inc. All rights reserved.
+ * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
*/
#include assert.h
@@ -1292,7 +1292,7 @@ static int
zfs_do_get(int argc, char **argv)
{
zprop_get_cbdata_t cb = { 0 };
- int i, c, flags = 0;
+ int i, c, flags = ZFS_ITER_ARGS_CAN_BE_PATHS;
char *value, *fields;
int ret;
int limit = 0;
___
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: r223622 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: mm Date: Tue Jun 28 06:32:35 2011 New Revision: 223622 URL: http://svn.freebsd.org/changeset/base/223622 Log: Disable vdev cache (readahead) by default. The vdev cache is very underutilized (hit ratio 30%-70%) and may consume excessive memory on systems with many vdevs. Illumos-gate revision:13346 Obtained from:Illumos (Bug #175) MFC after:1 week Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c == --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.cTue Jun 28 06:26:03 2011(r223621) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.cTue Jun 28 06:32:35 2011(r223622) @@ -71,9 +71,16 @@ * 1zfs_vdev_cache_bshift byte reads by the vdev_cache (aka software * track buffer). At most zfs_vdev_cache_size bytes will be kept in each * vdev's vdev_cache. + * + * TODO: Note that with the current ZFS code, it turns out that the + * vdev cache is not helpful, and in some cases actually harmful. It + * is better if we disable this. Once some time has passed, we should + * actually remove this to simplify the code. For now we just disable + * it by setting the zfs_vdev_cache_size to zero. Note that Solaris 11 + * has made these same changes. */ int zfs_vdev_cache_max = 114;/* 16KB */ -int zfs_vdev_cache_size = 10ULL 20; /* 10MB */ +int zfs_vdev_cache_size = 0; int zfs_vdev_cache_bshift = 16; #defineVCBS (1 zfs_vdev_cache_bshift) /* 64KB */ ___ 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: r223623 - in head: cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/lib/libzfs/common sys/cddl/contrib/opensolaris/common/zfs sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys...
Author: mm Date: Tue Jun 28 07:52:01 2011 New Revision: 223623 URL: http://svn.freebsd.org/changeset/base/223623 Log: Add a new REFCOMPRESSRATIO property. For snapshots, this is the same as COMPRESSRATIO, but for filesystems/volumes, the COMPRESSRATIO is based on the data USED (ie, includes blocks in children, but not blocks shared with the origin). This is needed to figure out how much space a filesystem would use if it were not compressed (ignoring snapshots). Illumos-gate revision:13387 Obtained from:Illumos (Feature #1092) MFC after:2 weeks Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c head/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c head/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 == --- head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Tue Jun 28 06:32:35 2011 (r223622) +++ head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Tue Jun 28 07:52:01 2011 (r223623) @@ -6,6 +6,7 @@ .\ The contents of this file are subject to the terms of the Common Development and Distribution License (the License). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. .\ See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with .\ the fields enclosed by brackets [] replaced with your own identifying information: Portions Copyright [] [name of copyright owner] +.\ Copyright 2011 by Delphix. All rights reserved. .TH zfs 1M 24 Sep 2009 SunOS 5.11 System Administration Commands .SH NAME zfs \- configures ZFS file systems @@ -389,7 +390,7 @@ This property can also be referred to by .ad .sp .6 .RS 4n -The compression ratio achieved for this dataset, expressed as a multiplier. Compression can be turned on by running: \fBzfs set compression=on \fIdataset\fR\fR. The default value is \fBoff\fR. +For non-snapshots, the compression ratio achieved for the \fBused\fR space of this dataset, expressed as a multiplier. The \fBused\fR property includes descendant datasets, and, for clones, does not include the space shared with the origin snapshot. For snapshots, the \fBcompressratio\fR is the same as the \fBrefcompressratio\fR property. Compression can be turned on by running: \fBzfs set compression=on \fIdataset\fR\fR. The default value is \fBoff\fR. .RE .sp @@ -453,6 +454,17 @@ This property can also be referred to by .ne 2 .mk .na +\fB\fBrefcompressratio\fR\fR +.ad +.sp .6 +.RS 4n +The compression ratio achieved for the \fBreferenced\fR space of this dataset, expressed as a multiplier. See also the \fBcompressratio\fR property. +.RE + +.sp +.ne 2 +.mk +.na \fB\fBtype\fR\fR .ad .sp .6 @@ -1278,7 +1290,7 @@ Recursively destroy all dependents, incl Force an unmount of any file systems using the \fBunmount -f\fR command. This option has no effect on non-file systems or unmounted file systems. .RE -Extreme care should be taken when applying either the \fB-r\fR or the \fB-f\fR options, as they can destroy large portions of a pool and cause unexpected behavior for mounted file systems in use. +Extreme care should be taken when applying either the \fB-r\fR or the \fB-R\fR options, as they can destroy large portions of a pool and cause unexpected behavior for mounted file systems in use. .RE .sp Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c == --- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.cTue Jun 28 06:32:35 2011(r223622) +++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.cTue Jun 28 07:52:01 2011(r223623) @@ -22,6 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2010 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2011 by Delphix. All rights reserved. */ #include ctype.h @@ -2038,6 +2039,7 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop } break; + case ZFS_PROP_REFRATIO: case ZFS_PROP_COMPRESSRATIO: if (get_numeric_property(zhp, prop, src, source, val) != 0) return (-1); Modified: head/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c == ---
svn commit: r223625 - head/sys/net
Author: pluknet Date: Tue Jun 28 08:41:44 2011 New Revision: 223625 URL: http://svn.freebsd.org/changeset/base/223625 Log: Update ifc_len field of struct ifconf passed for the ioctl SIOCGIFCONF32 (i.e. under COMPAT_FREEBSD32) in case ifconf() returned success to match the native SIOCGIFCONF behavior. PR: kern/158369 Reported by: Paul Procacci pprocacci att gmail com MFC after:1 week Modified: head/sys/net/if.c Modified: head/sys/net/if.c == --- head/sys/net/if.c Tue Jun 28 08:36:48 2011(r223624) +++ head/sys/net/if.c Tue Jun 28 08:41:44 2011(r223625) @@ -2467,6 +2467,8 @@ ifioctl(struct socket *so, u_long cmd, c error = ifconf(SIOCGIFCONF, (void *)ifc); CURVNET_RESTORE(); + if (error == 0) + ifc32-ifc_len = ifc.ifc_len; return (error); } #endif ___ 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: r223519 - head/etc/devd
On Sun, Jun 26, 2011 at 10:14:13PM -0600, Warner Losh wrote: Not in GENERIC. 9.0 is getting ready to feature freeze any minute, so there's no time to do the testing that a radical change like that would require. Fair enough. Right now, this work seems to cover only USB kernel modules, is it so? Is expansion into generic PCI area also planned, provided that you've already had some ideas and seem to be willing to pick up the work given enough support from the other developers (please excuse me if my understanding is wrong)? ./danfe ___ 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: r223626 - head/contrib/ntp/ntpd
Author: bz
Date: Tue Jun 28 09:46:25 2011
New Revision: 223626
URL: http://svn.freebsd.org/changeset/base/223626
Log:
Compare port numbers correctly. They are stored by SRCPORT()
in host byte order, so we need to compare them as such.
Properly compare IPv6 addresses as well.
This allows the, by default, 8 badaddrs slots per address
family to work correctly and only print sendto() errors once.
The change is no longer applicable to any latest upstream versions.
Approved by: roberto
Sponsored by: Sandvine Incorporated
MFC after:1 week
Modified:
head/contrib/ntp/ntpd/ntp_io.c
Modified: head/contrib/ntp/ntpd/ntp_io.c
==
--- head/contrib/ntp/ntpd/ntp_io.c Tue Jun 28 08:41:44 2011
(r223625)
+++ head/contrib/ntp/ntpd/ntp_io.c Tue Jun 28 09:46:25 2011
(r223626)
@@ -2716,14 +2716,14 @@ sendpkt(
for (slot = ERRORCACHESIZE; --slot = 0; )
if(dest-ss_family == AF_INET) {
- if (badaddrs[slot].port == ((struct
sockaddr_in*)dest)-sin_port
+ if (badaddrs[slot].port == SRCPORT(dest)
badaddrs[slot].addr.s_addr == ((struct
sockaddr_in*)dest)-sin_addr.s_addr)
break;
}
#ifdef INCLUDE_IPV6_SUPPORT
else if (dest-ss_family == AF_INET6) {
- if (badaddrs6[slot].port == ((struct
sockaddr_in6*)dest)-sin6_port
- badaddrs6[slot].addr.s6_addr == ((struct
sockaddr_in6*)dest)-sin6_addr.s6_addr)
+ if (badaddrs6[slot].port == SRCPORT(dest)
+ !memcmp(badaddrs6[slot].addr, ((struct
sockaddr_in6*)dest)-sin6_addr, sizeof(struct in6_addr)))
break;
}
#endif /* INCLUDE_IPV6_SUPPORT */
___
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: r223629 - head/contrib/tzdata
Author: edwin Date: Tue Jun 28 10:24:01 2011 New Revision: 223629 URL: http://svn.freebsd.org/changeset/base/223629 Log: MFV of tzdata2011h, r223627 - Russia scraps DST in 2011 - Remove Netherlands Antilles, add Bonaire, Curacao, Sint Maarten Modified: head/contrib/tzdata/antarctica head/contrib/tzdata/asia head/contrib/tzdata/europe head/contrib/tzdata/southamerica head/contrib/tzdata/zone.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/antarctica == --- head/contrib/tzdata/antarctica Tue Jun 28 10:15:03 2011 (r223628) +++ head/contrib/tzdata/antarctica Tue Jun 28 10:24:01 2011 (r223629) @@ -1,5 +1,5 @@ # pre -# @(#)antarctica 8.8 +# @(#)antarctica 8.9 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -19,18 +19,6 @@ # I made up all time zone abbreviations mentioned here; corrections welcome! # FORMAT is `zzz' and GMTOFF is 0 for locations while uninhabited. -# These rules are stolen from the `europe' file. -# Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S -Rule RussAQ 19811984- Apr 1 0:00 1:00S -Rule RussAQ 19811983- Oct 1 0:00 0 - -Rule RussAQ 19841991- Sep lastSun 2:00s 0 - -Rule RussAQ 19851991- Mar lastSun 2:00s 1:00S -Rule RussAQ 1992only- Mar lastSat 23:00 1:00S -Rule RussAQ 1992only- Sep lastSat 23:00 0 - -Rule RussAQ 1993max - Mar lastSun 2:00s 1:00S -Rule RussAQ 19931995- Sep lastSun 2:00s 0 - -Rule RussAQ 1996max - Oct lastSun 2:00s 0 - - # These rules are stolen from the `southamerica' file. # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule ArgAQ 19641966- Mar 1 0:000 - Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaTue Jun 28 10:15:03 2011(r223628) +++ head/contrib/tzdata/asiaTue Jun 28 10:24:01 2011(r223629) @@ -1,4 +1,4 @@ -# @(#)asia 8.64 +# @(#)asia 8.65 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -77,6 +77,10 @@ Rule RussiaAsia 1993max - Mar lastSun Rule RussiaAsia19931995- Sep lastSun 2:00s 0 - Rule RussiaAsia1996max - Oct lastSun 2:00s 0 - +# From Arthur David Olson (2011-06-15): +# While Russia abandoned DST in 2011, Armenia may choose to +# follow Russia's old rules. + # Afghanistan # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Asia/Kabul 4:36:48 - LMT 1890 Modified: head/contrib/tzdata/europe == --- head/contrib/tzdata/europe Tue Jun 28 10:15:03 2011(r223628) +++ head/contrib/tzdata/europe Tue Jun 28 10:24:01 2011(r223629) @@ -1,5 +1,5 @@ # pre -# @(#)europe 8.32 +# @(#)europe 8.33 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -565,6 +565,26 @@ Rule Russia 1993max - Mar lastSun 2:00 Rule Russia 19931995- Sep lastSun 2:00s 0 - Rule Russia 1996max - Oct lastSun 2:00s 0 - +# From Alexander Krivenyshev (2011-06-14): +# According to Kremlin press service, Russian President Dmitry Medvedev +# signed a federal law On calculation of time on June 9, 2011. +# According to the law Russia is abolishing daylight saving time. +# +# Medvedev signed a law On the Calculation of Time (in russian): +# a href=http://bmockbe.ru/events/?ID=7583; +# http://bmockbe.ru/events/?ID=7583 +# /a +# +# Medvedev signed a law on the calculation of the time (in russian): +# a href=http://www.regnum.ru/news/polit/1413906.html; +# http://www.regnum.ru/news/polit/1413906.html +# /a + +# From Arthur David Olson (2011-06-15): +# Take abolishing daylight saving time to mean that time is now considered +# to be standard. +# At least for now, keep the old Russia rules for the benefit of Belarus. + # These are for backward compatibility with older versions. # Zone NAMEGMTOFF RULES FORMAT [UNTIL] @@ -2013,7 +2033,8 @@ Zone Europe/Kaliningrad1:22:00 - LMT 1 1:00 C-Eur CE%sT 1945 2:00 Poland CE%sT 1946 3:00 Russia MSK/MSD 1991 Mar 31 2:00s -2:00 Russia EE%sT +2:00 Russia EE%sT 2011 Mar 27 2:00s +
svn commit: r223633 - head/share/misc
Author: edwin Date: Tue Jun 28 10:38:12 2011 New Revision: 223633 URL: http://svn.freebsd.org/changeset/base/223633 Log: Remove AN again now that tzdata2011h has been imported. Modified: head/share/misc/iso3166 Modified: head/share/misc/iso3166 == --- head/share/misc/iso3166 Tue Jun 28 10:30:30 2011(r223632) +++ head/share/misc/iso3166 Tue Jun 28 10:38:12 2011(r223633) @@ -176,7 +176,6 @@ NA NAM 516 Namibia NR NRU 520 Nauru NP NPL 524 Nepal NL NLD 528 Netherlands -AN ANT 530 Netherlands Antilles NC NCL 540 New Caledonia NZ NZL 554 New Zealand NI NIC 558 Nicaragua ___ 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: r223637 - in head: . contrib/pf/authpf contrib/pf/ftp-proxy contrib/pf/man contrib/pf/pfctl contrib/pf/pflogd sbin/pflogd sys/conf sys/contrib/altq/altq sys/contrib/pf/net sys/modules s...
Author: bz Date: Tue Jun 28 11:57:25 2011 New Revision: 223637 URL: http://svn.freebsd.org/changeset/base/223637 Log: Update packet filter (pf) code to OpenBSD 4.5. You need to update userland (world and ports) tools to be in sync with the kernel. Submitted by: mlaier Submitted by: eri Added: head/sys/contrib/pf/net/if_pflow.h (contents, props changed) head/sys/contrib/pf/net/pf_lb.c (contents, props changed) head/sys/modules/pfsync/ head/sys/modules/pfsync/Makefile (contents, props changed) Deleted: head/sys/contrib/pf/net/pf_subr.c Modified: head/UPDATING head/contrib/pf/authpf/authpf.8 head/contrib/pf/authpf/authpf.c head/contrib/pf/authpf/pathnames.h head/contrib/pf/ftp-proxy/filter.c head/contrib/pf/ftp-proxy/filter.h head/contrib/pf/ftp-proxy/ftp-proxy.8 head/contrib/pf/ftp-proxy/ftp-proxy.c head/contrib/pf/man/pf.4 head/contrib/pf/man/pf.conf.5 head/contrib/pf/man/pf.os.5 head/contrib/pf/man/pflog.4 head/contrib/pf/man/pfsync.4 head/contrib/pf/pfctl/parse.y head/contrib/pf/pfctl/pf_print_state.c head/contrib/pf/pfctl/pfctl.8 head/contrib/pf/pfctl/pfctl.c head/contrib/pf/pfctl/pfctl.h head/contrib/pf/pfctl/pfctl_altq.c head/contrib/pf/pfctl/pfctl_optimize.c head/contrib/pf/pfctl/pfctl_osfp.c head/contrib/pf/pfctl/pfctl_parser.c head/contrib/pf/pfctl/pfctl_parser.h head/contrib/pf/pfctl/pfctl_qstats.c head/contrib/pf/pfctl/pfctl_radix.c head/contrib/pf/pfctl/pfctl_table.c head/contrib/pf/pflogd/pflogd.8 head/contrib/pf/pflogd/pflogd.c head/contrib/pf/pflogd/privsep.c head/contrib/pf/pflogd/privsep_fdpass.c head/sbin/pflogd/Makefile head/sys/conf/files head/sys/contrib/altq/altq/altq_red.c head/sys/contrib/pf/net/if_pflog.c head/sys/contrib/pf/net/if_pflog.h head/sys/contrib/pf/net/if_pfsync.c head/sys/contrib/pf/net/if_pfsync.h head/sys/contrib/pf/net/pf.c head/sys/contrib/pf/net/pf_if.c head/sys/contrib/pf/net/pf_ioctl.c head/sys/contrib/pf/net/pf_mtag.h head/sys/contrib/pf/net/pf_norm.c head/sys/contrib/pf/net/pf_osfp.c head/sys/contrib/pf/net/pf_ruleset.c head/sys/contrib/pf/net/pf_table.c head/sys/contrib/pf/net/pfvar.h head/sys/modules/Makefile head/sys/modules/pf/Makefile head/sys/modules/pflog/Makefile head/sys/netinet/in_gif.c head/sys/netinet/ip_icmp.c head/sys/netinet/ipfw/ip_fw2.c head/sys/netinet/raw_ip.c head/sys/netinet6/icmp6.c head/sys/netinet6/in6_gif.c head/sys/netipsec/ipsec_input.c head/sys/netipsec/ipsec_output.c head/sys/netipsec/xform_ipip.c head/sys/sys/mbuf.h head/sys/sys/param.h head/usr.sbin/ftp-proxy/ftp-proxy/Makefile Modified: head/UPDATING == --- head/UPDATING Tue Jun 28 11:03:39 2011(r223636) +++ head/UPDATING Tue Jun 28 11:57:25 2011(r223637) @@ -22,6 +22,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20110628: + The packet filter (pf) code has been updated to OpenBSD 4.5. + You need to update userland tools to be in sync with kernel. + 20110608: The following sysctls and tunables are retired on x86 platforms: machdep.hlt_cpus Modified: head/contrib/pf/authpf/authpf.8 == --- head/contrib/pf/authpf/authpf.8 Tue Jun 28 11:03:39 2011 (r223636) +++ head/contrib/pf/authpf/authpf.8 Tue Jun 28 11:57:25 2011 (r223637) @@ -1,5 +1,5 @@ .\ $FreeBSD$ -.\ $OpenBSD: authpf.8,v 1.43 2007/02/24 17:21:04 beck Exp $ +.\ $OpenBSD: authpf.8,v 1.47 2009/01/06 03:11:50 mcbride Exp $ .\ .\ Copyright (c) 1998-2007 Bob Beck (b...@openbsd.org. All rights reserved. .\ @@ -15,14 +15,16 @@ .\ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\ -.Dd March 28, 2006 +.Dd January 6 2009 .Dt AUTHPF 8 .Os .Sh NAME -.Nm authpf +.Nm authpf , +.Nm authpf-noip .Nd authenticating gateway user shell .Sh SYNOPSIS .Nm authpf +.Nm authpf-noip .Sh DESCRIPTION .Nm is a user shell for authenticating gateways. @@ -31,47 +33,63 @@ It is used to change rules when a user authenticates and starts a session with .Xr sshd 8 and to undo these changes when the user's session exits. -It is designed for changing filter and translation rules for an individual -source IP address as long as a user maintains an active -.Xr ssh 1 -session. Typical use would be for a gateway that authenticates users before allowing them Internet use, or a gateway that allows different users into different places. +Combined with properly set up filter rules and secure switches, .Nm -logs the successful start and end of a session to -.Xr syslogd 8 . -This, combined with properly set up filter rules and secure switches, can be used
svn commit: r223638 - head/usr.bin/calendar/calendars/ru_RU.KOI8-R
Author: osa (ports committer) Date: Tue Jun 28 12:32:24 2011 New Revision: 223638 URL: http://svn.freebsd.org/changeset/base/223638 Log: Remove needless file due to Russia scraps DST in 2011. Description of fields to fill in above: 76 columns --| PR:If a GNATS PR is affected by the change. Submitted by: If someone else sent in the change. Reviewed by: If someone else reviewed your modification. Approved by: If you needed approval for this commit. Obtained from: If the change is from a third party. MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email. Security: Vulnerability reference (one per line) or description. Empty fields above will be automatically removed. Mcalendars/ru_RU.KOI8-R/calendar.all Dcalendars/ru_RU.KOI8-R/calendar.msk Deleted: head/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk Modified: head/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all Modified: head/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all == --- head/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all Tue Jun 28 11:57:25 2011(r223637) +++ head/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all Tue Jun 28 12:32:24 2011(r223638) @@ -10,7 +10,6 @@ #include ru_RU.KOI8-R/calendar.common #include ru_RU.KOI8-R/calendar.holiday #include ru_RU.KOI8-R/calendar.military -#include ru_RU.KOI8-R/calendar.msk #include ru_RU.KOI8-R/calendar.orthodox #include ru_RU.KOI8-R/calendar.pagan ___ 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: r223642 - head/lib/libusb
Author: hselasky Date: Tue Jun 28 14:07:28 2011 New Revision: 223642 URL: http://svn.freebsd.org/changeset/base/223642 Log: LibUSB v1.0: Need at least one frame when doing the dummy open else clear stall won't work in that case. Modified: head/lib/libusb/libusb10.c Modified: head/lib/libusb/libusb10.c == --- head/lib/libusb/libusb10.c Tue Jun 28 13:14:39 2011(r223641) +++ head/lib/libusb/libusb10.c Tue Jun 28 14:07:28 2011(r223642) @@ -636,7 +636,7 @@ libusb_clear_halt(struct libusb20_device return (LIBUSB_ERROR_INVALID_PARAM); CTX_LOCK(dev-ctx); - err = libusb20_tr_open(xfer, 0, 0, endpoint); + err = libusb20_tr_open(xfer, 0, 1, endpoint); CTX_UNLOCK(dev-ctx); if (err != 0 err != LIBUSB20_ERROR_BUSY) ___ 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: r223644 - head/etc/rc.d
Author: pluknet
Date: Tue Jun 28 14:26:34 2011
New Revision: 223644
URL: http://svn.freebsd.org/changeset/base/223644
Log:
Run load_rc_config before stop_cmd definition, so that ${quotaoff_flags}
is correctly expanded inside stop_cmd instead of getting nothing.
PR: conf/157687
Reported by: Dmitry Banschikov d.banschikov peterhost ru
MFC after:1 week
Modified:
head/etc/rc.d/quota
Modified: head/etc/rc.d/quota
==
--- head/etc/rc.d/quota Tue Jun 28 14:10:39 2011(r223643)
+++ head/etc/rc.d/quota Tue Jun 28 14:26:34 2011(r223644)
@@ -14,6 +14,7 @@
name=quota
rcvar=`set_rcvar`
+load_rc_config $name
start_cmd=quota_start
stop_cmd=/usr/sbin/quotaoff ${quotaoff_flags}
@@ -30,5 +31,4 @@ quota_start()
echo ' done.'
}
-load_rc_config $name
run_rc_command $1
___
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: r223519 - head/etc/devd
On Jun 28, 2011, at 2:45 AM, Alexey Dokuchaev wrote: On Sun, Jun 26, 2011 at 10:14:13PM -0600, Warner Losh wrote: Not in GENERIC. 9.0 is getting ready to feature freeze any minute, so there's no time to do the testing that a radical change like that would require. Fair enough. Right now, this work seems to cover only USB kernel modules, is it so? Is expansion into generic PCI area also planned, provided that you've already had some ideas and seem to be willing to pick up the work given enough support from the other developers (please excuse me if my understanding is wrong)? The reason we were able to relatively quickly generate this file from USB is because USB is very regular and uniform in its probe routines. They all have (or could be converted to have) something approximating the same format. PCI isn't even remotely close to this, and the techniques that worked for USB (and some of the short cuts taken) can't work for PCI for us. There's no uniformity in the PCI space, although many of the PCI drivers use a similar design pattern. They would all have to be converted to using the same thing, which is kinda impractical at the moment (since many have additional, driver specific fields). While the tool is kinda flexible enough to cope with this situation, more and more code winds up in the tool to cope than is appropriate for the tool. That's why this feature is experimental. For what it works for, it works great. For everything else, it is a lot of work to make it happy on a wide-spread enough scale. It is very instructive for how to approach things, but embeds too much knowledge of the bus code into the tool to generate these files than is appropriate (since it is duplicated information from the driver, not exported from the bus/driver). Warner ___ 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: r223648 - head/sys/dev/gem
Author: marius
Date: Tue Jun 28 16:16:43 2011
New Revision: 223648
URL: http://svn.freebsd.org/changeset/base/223648
Log:
- In gem_reset_rx() also reset the RX MAC which is necessary in order to
get it out of a stuck condition that can be caused by GEM_MAC_RX_OVERFLOW.
- In gem_reset_rxdma() call gem_setladrf() in order to reprogram the RX
filter and restore the previous content of GEM_MAC_RX_CONFIG. While at it
consistently use the newly introduced sc_mac_rxcfg throughout the driver
instead of reading the its old content.
- Increment if_iqdrops instead of if_ierrors in case of RX buffer allocation
failure.
- According to the GEM datasheet the RX MAC should also be disabled in
gem_setladrf() before changing its configuration.
- Add error messages to gem_disable_{r,t}x() and take advantage of these
throughout the driver instead of duplicating their functionality all over
the place.
In joint forces with: yongari
Modified:
head/sys/dev/gem/if_gem.c
head/sys/dev/gem/if_gemvar.h
Modified: head/sys/dev/gem/if_gem.c
==
--- head/sys/dev/gem/if_gem.c Tue Jun 28 15:19:45 2011(r223647)
+++ head/sys/dev/gem/if_gem.c Tue Jun 28 16:16:43 2011(r223648)
@@ -121,7 +121,7 @@ static void gem_rint_timeout(void *arg);
#endif
static inline void gem_rxcksum(struct mbuf *m, uint64_t flags);
static voidgem_rxdrain(struct gem_softc *sc);
-static voidgem_setladrf(struct gem_softc *sc);
+static voidgem_setladrf(struct gem_softc *sc, u_int enable);
static voidgem_start(struct ifnet *ifp);
static voidgem_start_locked(struct ifnet *ifp);
static voidgem_stop(struct ifnet *ifp, int disable);
@@ -705,7 +705,7 @@ gem_reset_rx(struct gem_softc *sc)
* Resetting while DMA is in progress can cause a bus hang, so we
* disable DMA first.
*/
- gem_disable_rx(sc);
+ (void)gem_disable_rx(sc);
GEM_BANK1_WRITE_4(sc, GEM_RX_CONFIG, 0);
GEM_BANK1_BARRIER(sc, GEM_RX_CONFIG, 4,
BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
@@ -715,7 +715,7 @@ gem_reset_rx(struct gem_softc *sc)
/* Wait 5ms extra. */
DELAY(5000);
- /* Finally, reset the ERX. */
+ /* Reset the ERX. */
GEM_BANK2_WRITE_4(sc, GEM_RESET, GEM_RESET_RX);
GEM_BANK2_BARRIER(sc, GEM_RESET, 4,
BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
@@ -724,6 +724,16 @@ gem_reset_rx(struct gem_softc *sc)
device_printf(sc-sc_dev, cannot reset receiver\n);
return (1);
}
+
+ /* Finally, reset RX MAC. */
+ GEM_BANK1_WRITE_4(sc, GEM_MAC_RXRESET, 1);
+ GEM_BANK1_BARRIER(sc, GEM_MAC_RXRESET, 4,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
+ if (!GEM_BANK1_BITWAIT(sc, GEM_MAC_RXRESET, 1, 0)) {
+ device_printf(sc-sc_dev, cannot reset RX MAC\n);
+ return (1);
+ }
+
return (0);
}
@@ -766,12 +776,17 @@ gem_reset_rxdma(struct gem_softc *sc)
GEM_BANK1_WRITE_4(sc, GEM_RX_PAUSE_THRESH,
(3 * sc-sc_rxfifosize / 256) |
((sc-sc_rxfifosize / 256) 12));
+ /*
+* Clear the RX filter and reprogram it. This will also set the
+* current RX MAC configuration.
+*/
+ gem_setladrf(sc, 0);
GEM_BANK1_WRITE_4(sc, GEM_RX_CONFIG,
GEM_BANK1_READ_4(sc, GEM_RX_CONFIG) | GEM_RX_CONFIG_RXDMA_EN);
GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_MASK,
GEM_MAC_RX_DONE | GEM_MAC_RX_FRAME_CNT);
GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_CONFIG,
- GEM_BANK1_READ_4(sc, GEM_MAC_RX_CONFIG) | GEM_MAC_RX_ENABLE);
+ sc-sc_mac_rxcfg | GEM_MAC_RX_ENABLE);
}
static int
@@ -782,7 +797,7 @@ gem_reset_tx(struct gem_softc *sc)
* Resetting while DMA is in progress can cause a bus hang, so we
* disable DMA first.
*/
- gem_disable_tx(sc);
+ (void)gem_disable_tx(sc);
GEM_BANK1_WRITE_4(sc, GEM_TX_CONFIG, 0);
GEM_BANK1_BARRIER(sc, GEM_TX_CONFIG, 4,
BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
@@ -812,8 +827,10 @@ gem_disable_rx(struct gem_softc *sc)
GEM_BANK1_READ_4(sc, GEM_MAC_RX_CONFIG) ~GEM_MAC_RX_ENABLE);
GEM_BANK1_BARRIER(sc, GEM_MAC_RX_CONFIG, 4,
BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
- return (GEM_BANK1_BITWAIT(sc, GEM_MAC_RX_CONFIG, GEM_MAC_RX_ENABLE,
- 0));
+ if (GEM_BANK1_BITWAIT(sc, GEM_MAC_RX_CONFIG, GEM_MAC_RX_ENABLE, 0))
+ return (1);
+ device_printf(sc-sc_dev, cannot disable RX MAC\n);
+ return (0);
}
static int
@@ -824,8 +841,10 @@ gem_disable_tx(struct gem_softc *sc)
GEM_BANK1_READ_4(sc, GEM_MAC_TX_CONFIG) ~GEM_MAC_TX_ENABLE);
GEM_BANK1_BARRIER(sc, GEM_MAC_TX_CONFIG, 4,
BUS_SPACE_BARRIER_READ |
svn commit: r223649 - head/sys/dev/gem
Author: marius Date: Tue Jun 28 16:44:02 2011 New Revision: 223649 URL: http://svn.freebsd.org/changeset/base/223649 Log: Fix typo in r223648 which was accidentally committed Modified: head/sys/dev/gem/if_gem.c Modified: head/sys/dev/gem/if_gem.c == --- head/sys/dev/gem/if_gem.c Tue Jun 28 16:16:43 2011(r223648) +++ head/sys/dev/gem/if_gem.c Tue Jun 28 16:44:02 2011(r223649) @@ -2209,7 +2209,7 @@ gem_setladrf(struct gem_softc *sc, u_int * Turn off the RX MAC and the hash filter as required by the Sun GEM * programming restrictions. */ - v = sc-sc_mac_rxcfg GEM_MAC_RX_HASH_FILTER; + v = sc-sc_mac_rxcfg ~GEM_MAC_RX_HASH_FILTER; GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_CONFIG, v); GEM_BANK1_BARRIER(sc, GEM_MAC_RX_CONFIG, 4, BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); ___ 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: r223652 - head/sbin/growfs
Author: trasz Date: Tue Jun 28 19:59:46 2011 New Revision: 223652 URL: http://svn.freebsd.org/changeset/base/223652 Log: Revert the mechanical change from 'file system' to 'filesystem', committed in r223429. As bde@ pointed out, it was mostly backwards. Modified: head/sbin/growfs/growfs.8 head/sbin/growfs/growfs.c Modified: head/sbin/growfs/growfs.8 == --- head/sbin/growfs/growfs.8 Tue Jun 28 19:27:34 2011(r223651) +++ head/sbin/growfs/growfs.8 Tue Jun 28 19:59:46 2011(r223652) @@ -37,12 +37,12 @@ .\ $TSHeader: src/sbin/growfs/growfs.8,v 1.3 2000/12/12 19:31:00 tomsoft Exp $ .\ $FreeBSD$ .\ -.Dd June 22, 2011 +.Dd June 29, 2011 .Dt GROWFS 8 .Os .Sh NAME .Nm growfs -.Nd expand an existing UFS filesystem +.Nd expand an existing UFS file system .Sh SYNOPSIS .Nm .Op Fl Ny @@ -58,8 +58,8 @@ Before starting .Nm the disk must be labeled to a bigger size using .Xr bsdlabel 8 . -If you wish to grow a filesystem beyond the boundary of -the slice it resides in, you must resize the slice using +If you wish to grow a file system beyond the boundary of +the slice it resides in, you must re-size the slice using .Xr gpart 8 before running .Nm . @@ -67,17 +67,17 @@ If you are using volumes you must enlarg .Xr gvinum 8 . The .Nm -utility extends the size of the filesystem on the specified special file. +utility extends the size of the file system on the specified special file. Currently .Nm -can only enlarge unmounted filesystems. -Do not try enlarging a mounted filesystem, your system may panic and you will -not be able to use the filesystem any longer. +can only enlarge unmounted file systems. +Do not try enlarging a mounted file system, your system may panic and you will +not be able to use the file system any longer. Most of the .Xr newfs 8 options cannot be changed by .Nm . -In fact, you can only increase the size of the filesystem. +In fact, you can only increase the size of the file system. Use .Xr tunefs 8 for other changes. @@ -86,8 +86,8 @@ The following options are available: .Bl -tag -width indent .It Fl N .Dq Test mode . -Causes the new filesystem parameters to be printed out without actually -enlarging the filesystem. +Causes the new file system parameters to be printed out without actually +enlarging the file system. .It Fl y .Dq Expert mode . Usually @@ -102,12 +102,12 @@ So use this option with great care! .It Fl s Ar size Determines the .Ar size -of the filesystem after enlarging in sectors. +of the file system after enlarging in sectors. This value defaults to the size of the raw partition specified in .Ar special (in other words, .Nm -will enlarge the filesystem to the size of the entire partition). +will enlarge the file system to the size of the entire partition). .El .Sh EXAMPLES .Dl growfs -s 4194304 /dev/vinum/testvol @@ -122,9 +122,9 @@ up to 2GB if there is enough space in .Xr ffsinfo 8 , .Xr fsck 8 , .Xr gpart 8 , +.Xr gvinum 8 , .Xr newfs 8 , -.Xr tunefs 8 , -.Xr gvinum 8 +.Xr tunefs 8 .Sh HISTORY The .Nm @@ -144,12 +144,12 @@ There may be cases on .Fx 3.x only, when .Nm -does not recognize properly whether or not the filesystem is mounted and +does not recognize properly whether or not the file system is mounted and exits with an error message. Then please use .Nm .Fl y -if you are sure that the filesystem is not mounted. +if you are sure that the file system is not mounted. It is also recommended to always use .Xr fsck 8 after enlarging (just to be on the safe side). @@ -183,8 +183,8 @@ on the first cylinder group to verify th in the CYLINDER SUMMARY (internal cs) of the CYLINDER GROUP .Em cgr0 has enough blocks. -As a rule of thumb for default filesystem parameters one block is needed for -every 2 GB of total filesystem size. +As a rule of thumb for default file system parameters one block is needed for +every 2 GB of total file system size. .Pp Normally .Nm Modified: head/sbin/growfs/growfs.c == --- head/sbin/growfs/growfs.c Tue Jun 28 19:27:34 2011(r223651) +++ head/sbin/growfs/growfs.c Tue Jun 28 19:59:46 2011(r223652) @@ -160,7 +160,7 @@ static void get_dev_size(int, int *); /* growfs * */ /* - * Here we actually start growing the filesystem. We basically read the + * Here we actually start growing the file system. We basically read the * cylinder summary from the first cylinder group as we want to update * this on the fly during our various operations. First we handle the * changes in the former last cylinder group. Afterwards we create all new @@ -231,7 +231,7 @@ growfs(int fsi, int fso, unsigned int Nf updjcg(osblock.fs_ncg-1, modtime, fsi, fso, Nflag); /* -* Dump out summary information about filesystem. +*
svn commit: r223654 - head/sbin/hastd
Author: trociny
Date: Tue Jun 28 20:57:54 2011
New Revision: 223654
URL: http://svn.freebsd.org/changeset/base/223654
Log:
Make activemap_write_start/complete check the keepdirty list, when
stating if we need to update activemap on disk. This makes keepdirty
serve its purpose -- to reduce number of metadata updates.
Discussed with: pjd
Approved by: pjd (mentor)
Modified:
head/sbin/hastd/activemap.c
Modified: head/sbin/hastd/activemap.c
==
--- head/sbin/hastd/activemap.c Tue Jun 28 20:28:11 2011(r223653)
+++ head/sbin/hastd/activemap.c Tue Jun 28 20:57:54 2011(r223654)
@@ -205,7 +205,7 @@ keepdirty_find(struct activemap *amp, in
return (kd);
}
-static void
+static bool
keepdirty_add(struct activemap *amp, int extent)
{
struct keepdirty *kd;
@@ -217,7 +217,7 @@ keepdirty_add(struct activemap *amp, int
*/
TAILQ_REMOVE(amp-am_keepdirty, kd, kd_next);
TAILQ_INSERT_HEAD(amp-am_keepdirty, kd, kd_next);
- return;
+ return (false);
}
/*
* Add new element, but first remove the most unused one if
@@ -238,6 +238,8 @@ keepdirty_add(struct activemap *amp, int
amp-am_nkeepdirty++;
TAILQ_INSERT_HEAD(amp-am_keepdirty, kd, kd_next);
}
+
+ return (true);
}
static void
@@ -308,9 +310,9 @@ activemap_write_start(struct activemap *
assert(!bit_test(amp-am_memmap, ext));
bit_set(amp-am_memmap, ext);
amp-am_ndirty++;
- modified = true;
}
- keepdirty_add(amp, ext);
+ if (keepdirty_add(amp, ext))
+ modified = true;
}
return (modified);
@@ -345,7 +347,8 @@ activemap_write_complete(struct activema
if (--amp-am_memtab[ext] == 0) {
bit_clear(amp-am_memmap, ext);
amp-am_ndirty--;
- modified = true;
+ if (keepdirty_find(amp, ext) == NULL)
+ modified = true;
}
}
___
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: r223655 - head/sbin/hastd
Author: trociny
Date: Tue Jun 28 21:01:32 2011
New Revision: 223655
URL: http://svn.freebsd.org/changeset/base/223655
Log:
Check the returned value of activemap_write_complete() and update matadata on
disk if needed. This should fix a potential case when extents are cleared in
activemap but metadata is not updated on disk.
Suggested by: pjd
Approved by: pjd (mentor)
Modified:
head/sbin/hastd/primary.c
Modified: head/sbin/hastd/primary.c
==
--- head/sbin/hastd/primary.c Tue Jun 28 20:57:54 2011(r223654)
+++ head/sbin/hastd/primary.c Tue Jun 28 21:01:32 2011(r223655)
@@ -1687,8 +1687,11 @@ ggate_send_thread(void *arg)
}
if (ggio-gctl_error == 0 ggio-gctl_cmd == BIO_WRITE) {
mtx_lock(res-hr_amp_lock);
- activemap_write_complete(res-hr_amp,
- ggio-gctl_offset, ggio-gctl_length);
+ if (activemap_write_complete(res-hr_amp,
+ ggio-gctl_offset, ggio-gctl_length)) {
+ res-hr_stat_activemap_update++;
+ (void)hast_activemap_flush(res);
+ }
mtx_unlock(res-hr_amp_lock);
}
if (ggio-gctl_cmd == BIO_WRITE) {
___
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: r223657 - in head/sys/fs: nfs nfsclient
Author: rmacklem
Date: Tue Jun 28 22:52:38 2011
New Revision: 223657
URL: http://svn.freebsd.org/changeset/base/223657
Log:
Fix the new NFSv4 client so that it doesn't fill the cached
mode attribute in as 0 when doing writes. The change adds
the Mode attribute plus the others except Owner and Owner_group
to the list requested by the NFSv4 Write Operation. This fixed
a problem where an executable file built by cc would get mode
0111 instead of 0755 for some NFSv4 servers.
Found at the recent NFSv4 interoperability Bakeathon.
Tested by:tdh at excfb.com
MFC after:2 weeks
Modified:
head/sys/fs/nfs/nfsproto.h
head/sys/fs/nfsclient/nfs_clport.c
head/sys/fs/nfsclient/nfs_clrpcops.c
Modified: head/sys/fs/nfs/nfsproto.h
==
--- head/sys/fs/nfs/nfsproto.h Tue Jun 28 21:21:10 2011(r223656)
+++ head/sys/fs/nfs/nfsproto.h Tue Jun 28 22:52:38 2011(r223657)
@@ -868,15 +868,24 @@ struct nfsv3_sattr {
* NFSATTRBIT_WRITEGETATTR0 - bits 0-31
*/
#defineNFSATTRBIT_WRITEGETATTR0
\
- (NFSATTRBM_CHANGE | \
+ (NFSATTRBM_SUPPORTEDATTRS | \
+ NFSATTRBM_TYPE |\
+ NFSATTRBM_CHANGE | \
NFSATTRBM_SIZE |\
- NFSATTRBM_FSID)
+ NFSATTRBM_FSID |\
+ NFSATTRBM_FILEID | \
+ NFSATTRBM_MAXREAD)
/*
* NFSATTRBIT_WRITEGETATTR1 - bits 32-63
*/
#defineNFSATTRBIT_WRITEGETATTR1
\
- (NFSATTRBM_TIMEMETADATA | \
+ (NFSATTRBM_MODE | \
+ NFSATTRBM_NUMLINKS |\
+ NFSATTRBM_RAWDEV | \
+ NFSATTRBM_SPACEUSED | \
+ NFSATTRBM_TIMEACCESS | \
+ NFSATTRBM_TIMEMETADATA |\
NFSATTRBM_TIMEMODIFY)
/*
Modified: head/sys/fs/nfsclient/nfs_clport.c
==
--- head/sys/fs/nfsclient/nfs_clport.c Tue Jun 28 21:21:10 2011
(r223656)
+++ head/sys/fs/nfsclient/nfs_clport.c Tue Jun 28 22:52:38 2011
(r223657)
@@ -388,6 +388,7 @@ nfscl_loadattrcache(struct vnode **vpp,
np-n_vattr.na_mtime = nap-na_mtime;
np-n_vattr.na_ctime = nap-na_ctime;
np-n_vattr.na_fsid = nap-na_fsid;
+ np-n_vattr.na_mode = nap-na_mode;
} else {
NFSBCOPY((caddr_t)nap, (caddr_t)np-n_vattr,
sizeof (struct nfsvattr));
Modified: head/sys/fs/nfsclient/nfs_clrpcops.c
==
--- head/sys/fs/nfsclient/nfs_clrpcops.cTue Jun 28 21:21:10 2011
(r223656)
+++ head/sys/fs/nfsclient/nfs_clrpcops.cTue Jun 28 22:52:38 2011
(r223657)
@@ -1527,8 +1527,8 @@ nfsrpc_writerpc(vnode_t vp, struct uio *
* deadlock, is that the upcall times out and allows
* the write to complete. However, progress is so slow
* that it might just as well be deadlocked.
-* So, we just get the attributes that change with each
-* write Op.
+* As such, we get the rest of the attributes, but not
+* Owner or Owner_group.
* nb: nfscl_loadattrcache() needs to be told that these
* partial attributes from a write rpc are being
* passed in, via a argument flag.
___
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: r222723 - head/sys/sys
On Mon, 6 Jun 2011, Andriy Gapon wrote: Woops! I admit I just copied the description and the patch from the PR. How inattentive I could be while doing that? Gerald, should the patch have actually introduced SNDCTL_DSP_HALT as the description says? Yikes! You are totally right, Pan Tsu and Andriy. Below you'll find the corresponding patch I got into Wine upstream, so clearly this should have been about SNDCTL_DSP_HALT. Sorry about the snafu on this and the delay in getting back to this; in between business travel and vacation I haven't been home for more than three weeks. Gerald patch From: Gerald Pfeifer ger...@pfeifer.com To: wine-patc...@winehq.org Cc: Andrew Eikum aei...@codeweavers.com Date: Thu, 19 May 2011 08:24:23 -0600 (MDT) Subject: wineoss.drv: Cope with system which lack SNDCTL_DSP_HALT. This is the last patch that is necessary to make vanilla Wine build on current versions of FreeBSD. I will also send a summary in response to Andrew's question around this Gerald --- dlls/wineoss.drv/mmdevdrv.c |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 7dec1e0..0edcb25 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -53,6 +53,13 @@ #include audiopolicy.h #include audioclient.h + +/* Some implementations of OSS, such as FreeBSD older than 9.0, lack + SNDCTL_DSP_HALT which is just a synonym for the older SNDCTL_DSP_RESET. */ +#ifndef SNDCTL_DSP_HALT +#define SNDCTL_DSP_HALT SNDCTL_DSP_RESET +#endif + WINE_DEFAULT_DEBUG_CHANNEL(oss); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) -- 1.7.4.1 ___ 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: r223660 - head/sys/geom/part
Author: ae
Date: Wed Jun 29 05:41:14 2011
New Revision: 223660
URL: http://svn.freebsd.org/changeset/base/223660
Log:
Initialize elements of state array when creating the GPT table.
This fixes the problem, when the secondary GPT header is not erased when
partition table destroyed. Move equal operations from g_part_gpt_create
and g_part_gpt_recover to the separate function g_gpt_set_defaults.
Reported by: dwhite
MFC after:1 week
Modified:
head/sys/geom/part/g_part_gpt.c
Modified: head/sys/geom/part/g_part_gpt.c
==
--- head/sys/geom/part/g_part_gpt.c Wed Jun 29 01:32:50 2011
(r223659)
+++ head/sys/geom/part/g_part_gpt.c Wed Jun 29 05:41:14 2011
(r223660)
@@ -88,6 +88,7 @@ struct g_part_gpt_entry {
static void g_gpt_printf_utf16(struct sbuf *, uint16_t *, size_t);
static void g_gpt_utf8_to_utf16(const uint8_t *, uint16_t *, size_t);
+static void g_gpt_set_defaults(struct g_part_table *, struct g_provider *);
static int g_part_gpt_add(struct g_part_table *, struct g_part_entry *,
struct g_part_parms *);
@@ -493,12 +494,7 @@ g_part_gpt_create(struct g_part_table *b
table-mbr[DOSPARTOFF + 6] = 0xff; /* esect */
table-mbr[DOSPARTOFF + 7] = 0xff; /* ecyl */
le32enc(table-mbr + DOSPARTOFF + 8, 1);/* start */
- le32enc(table-mbr + DOSPARTOFF + 12, MIN(last, 0xLL));
-
- table-lba[GPT_ELT_PRIHDR] = 1;
- table-lba[GPT_ELT_PRITBL] = 2;
- table-lba[GPT_ELT_SECHDR] = last;
- table-lba[GPT_ELT_SECTBL] = last - tblsz;
+ le32enc(table-mbr + DOSPARTOFF + 12, MIN(last, UINT32_MAX));
/* Allocate space for the header */
table-hdr = g_malloc(sizeof(struct gpt_hdr), M_WAITOK | M_ZERO);
@@ -506,14 +502,11 @@ g_part_gpt_create(struct g_part_table *b
bcopy(GPT_HDR_SIG, table-hdr-hdr_sig, sizeof(table-hdr-hdr_sig));
table-hdr-hdr_revision = GPT_HDR_REVISION;
table-hdr-hdr_size = offsetof(struct gpt_hdr, padding);
- table-hdr-hdr_lba_start = 2 + tblsz;
- table-hdr-hdr_lba_end = last - tblsz - 1;
kern_uuidgen(table-hdr-hdr_uuid, 1);
table-hdr-hdr_entries = basetable-gpt_entries;
table-hdr-hdr_entsz = sizeof(struct gpt_ent);
- basetable-gpt_first = table-hdr-hdr_lba_start;
- basetable-gpt_last = table-hdr-hdr_lba_end;
+ g_gpt_set_defaults(basetable, pp);
return (0);
}
@@ -815,32 +808,10 @@ g_part_gpt_read(struct g_part_table *bas
static int
g_part_gpt_recover(struct g_part_table *basetable)
{
- struct g_part_gpt_table *table;
- struct g_provider *pp;
- uint64_t last;
- size_t tblsz;
-
- table = (struct g_part_gpt_table *)basetable;
- pp = LIST_FIRST(basetable-gpt_gp-consumer)-provider;
- last = pp-mediasize / pp-sectorsize - 1;
- tblsz = (table-hdr-hdr_entries * table-hdr-hdr_entsz +
- pp-sectorsize - 1) / pp-sectorsize;
-
- table-lba[GPT_ELT_PRIHDR] = 1;
- table-lba[GPT_ELT_PRITBL] = 2;
- table-lba[GPT_ELT_SECHDR] = last;
- table-lba[GPT_ELT_SECTBL] = last - tblsz;
- table-state[GPT_ELT_PRIHDR] = GPT_STATE_OK;
- table-state[GPT_ELT_PRITBL] = GPT_STATE_OK;
- table-state[GPT_ELT_SECHDR] = GPT_STATE_OK;
- table-state[GPT_ELT_SECTBL] = GPT_STATE_OK;
- table-hdr-hdr_lba_start = 2 + tblsz;
- table-hdr-hdr_lba_end = last - tblsz - 1;
- basetable-gpt_first = table-hdr-hdr_lba_start;
- basetable-gpt_last = table-hdr-hdr_lba_end;
+ g_gpt_set_defaults(basetable,
+ LIST_FIRST(basetable-gpt_gp-consumer)-provider);
basetable-gpt_corrupt = 0;
-
return (0);
}
@@ -1039,6 +1010,34 @@ g_part_gpt_write(struct g_part_table *ba
}
static void
+g_gpt_set_defaults(struct g_part_table *basetable, struct g_provider *pp)
+{
+ struct g_part_gpt_table *table;
+ quad_t last;
+ size_t tblsz;
+
+ table = (struct g_part_gpt_table *)basetable;
+ last = pp-mediasize / pp-sectorsize - 1;
+ tblsz = (basetable-gpt_entries * sizeof(struct gpt_ent) +
+ pp-sectorsize - 1) / pp-sectorsize;
+
+ table-lba[GPT_ELT_PRIHDR] = 1;
+ table-lba[GPT_ELT_PRITBL] = 2;
+ table-lba[GPT_ELT_SECHDR] = last;
+ table-lba[GPT_ELT_SECTBL] = last - tblsz;
+ table-state[GPT_ELT_PRIHDR] = GPT_STATE_OK;
+ table-state[GPT_ELT_PRITBL] = GPT_STATE_OK;
+ table-state[GPT_ELT_SECHDR] = GPT_STATE_OK;
+ table-state[GPT_ELT_SECTBL] = GPT_STATE_OK;
+
+ table-hdr-hdr_lba_start = 2 + tblsz;
+ table-hdr-hdr_lba_end = last - tblsz - 1;
+
+ basetable-gpt_first = table-hdr-hdr_lba_start;
+ basetable-gpt_last = table-hdr-hdr_lba_end;
+}
+
+static void
g_gpt_printf_utf16(struct sbuf *sb, uint16_t *str, size_t len)
{
u_int bo;
___
