svn commit: r265748 - in stable/9/cddl/contrib/opensolaris/cmd: zdb zfs zpool
Author: delphij Date: Fri May 9 07:34:38 2014 New Revision: 265748 URL: http://svnweb.freebsd.org/changeset/base/265748 Log: MFC r263459 (MFV 263436-263438): 3947 zpool(1M) references nonexistent zfs-features(5) 4540 zpool(1M) man page doesn't describe readonly property 3948 zfs sync=default is not accepted 4611 zfs(1M) still mentions 'send -r' in synopsis 4415 zpool(1M) man page missing import -m description 4570 Document dedupditto pool property 4572 Dedup-related documentation additions for zpool and zdb. 1371 Add -D option description to zpool(1M) manpage 4571 Add documentation for -T and interval to zpool list Modified: stable/9/cddl/contrib/opensolaris/cmd/zdb/zdb.8 stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Directory Properties: stable/9/cddl/contrib/opensolaris/ (props changed) stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed) stable/9/cddl/contrib/opensolaris/cmd/zfs/ (props changed) stable/9/cddl/contrib/opensolaris/cmd/zpool/ (props changed) stable/9/cddl/contrib/opensolaris/lib/libzfs/ (props changed) Modified: stable/9/cddl/contrib/opensolaris/cmd/zdb/zdb.8 == --- stable/9/cddl/contrib/opensolaris/cmd/zdb/zdb.8 Fri May 9 07:24:39 2014(r265747) +++ stable/9/cddl/contrib/opensolaris/cmd/zdb/zdb.8 Fri May 9 07:34:38 2014(r265748) @@ -19,7 +19,7 @@ .\ .\ $FreeBSD$ .\ -.Dd December 31, 2013 +.Dd March 20, 2014 .Dt ZDB 8 .Os .Sh NAME @@ -127,6 +127,12 @@ compression ratio (compress), inflation If specified twice, display a histogram of deduplication statistics, showing the allocated (physically present on disk) and referenced (logically referenced in the pool) block counts and sizes by reference count. +.Pp +If specified a third time, display the statistics independently for each deduplication table. +.Pp +If specified a fourth time, dump the contents of the deduplication tables describing duplicate blocks. +.Pp +If specified a fifth time, also dump the contents of the deduplication tables describing unique blocks. .It Fl h Display pool history similar to .Cm zpool history , Modified: stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 == --- stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri May 9 07:24:39 2014(r265747) +++ stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri May 9 07:34:38 2014(r265748) @@ -30,7 +30,7 @@ .\ .\ $FreeBSD$ .\ -.Dd January 2, 2014 +.Dd March 20, 2014 .Dt ZFS 8 .Os .Sh NAME @@ -1329,10 +1329,21 @@ features being supported, the new file s these properties. .Bl -tag -width 4n .It Sy casesensitivity Ns = Ns Cm sensitive | insensitive | mixed +Indicates whether the file name matching algorithm used by the file system +should be case-sensitive, case-insensitive, or allow a combination of both +styles of matching. The default value for the +.Sy casesensitivity +property is +.Cm sensitive . +Traditionally, UNIX and POSIX file systems have case-sensitive file names. +.Pp The +.Cm mixed +value for the .Sy casesensitivity -property is currently not supported on -.Fx . +property indicates that the +file system can support requests for both case-sensitive and case-insensitive +matching behavior. .It Sy normalization Ns = Ns Cm none | formC | formD | formKC | formKD Indicates whether the file system should perform a .Sy unicode Modified: stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8 == --- stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Fri May 9 07:24:39 2014(r265747) +++ stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Fri May 9 07:34:38 2014(r265748) @@ -25,7 +25,7 @@ .\ .\ $FreeBSD$ .\ -.Dd December 31, 2013 +.Dd March 20, 2014 .Dt ZPOOL 8 .Os .Sh NAME @@ -624,6 +624,9 @@ Datasets of this pool can only be mounte .It To write to a read-only pool, a export and import of the pool is required. .El +.Pp +This property can also be referred to by its shortened column name, +.Sy rdonly . .El .Pp The following properties can be set at creation time and import time, and later @@ -682,7 +685,9 @@ property. Threshold for the number of block ditto copies. If the reference count for a deduplicated block increases above this number, a new ditto copy of this block is automatically stored. Default setting is -.Cm 0 . +.Cm 0 +which causes no ditto copies to be created for deduplicated blocks. +The miniumum legal nonzero setting is 100. .It Sy delegation Ns = Ns Cm on No | Cm off Controls whether a non-privileged user is granted access based on the dataset permissions defined on the dataset. See @@ -1152,9 +1157,10 @@ option is also required. .It Fl f Forces import, even if the
svn commit: r265749 - in stable/9/cddl/contrib/opensolaris: cmd/zpool lib/libzfs/common
Author: delphij
Date: Fri May 9 07:35:39 2014
New Revision: 265749
URL: http://svnweb.freebsd.org/changeset/base/265749
Log:
MFC r263889: MFV r263887:
3993 zpool(1M) and zfs(1M) should support -p for list and get
4700 zpool get doesn't support -H or -o options
Modified:
stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8
stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
Directory Properties:
stable/9/cddl/contrib/opensolaris/ (props changed)
stable/9/cddl/contrib/opensolaris/cmd/zpool/ (props changed)
stable/9/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
Modified: stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==
--- stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Fri May 9 07:34:38
2014(r265748)
+++ stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Fri May 9 07:35:39
2014(r265749)
@@ -1,5 +1,6 @@
'\ te
.\ Copyright (c) 2012, Martin Matuska m...@freebsd.org.
+.\ Copyright (c) 2013-2014, Xin Li delp...@freebsd.org.
.\ All Rights Reserved.
.\
.\ The contents of this file are subject to the terms of the
@@ -25,7 +26,7 @@
.\
.\ $FreeBSD$
.\
-.Dd March 20, 2014
+.Dd March 28, 2014
.Dt ZPOOL 8
.Os
.Sh NAME
@@ -70,6 +71,8 @@
.Ar pool ...
.Nm
.Cm get
+.Op Fl Hp
+.Op Fl o Ar field Ns Op , Ns Ar ...
.Ar all | property Ns Op , Ns Ar ...
.Ar pool ...
.Nm
@@ -120,7 +123,7 @@
.Ar device
.Nm
.Cm list
-.Op Fl H
+.Op Fl Hpv
.Op Fl o Ar property Ns Op , Ns Ar ...
.Op Fl T Cm d Ns | Ns Cm u
.Op Ar pool
@@ -1018,6 +1021,8 @@ is currently being used. This may lead t
.It Xo
.Nm
.Cm get
+.Op Fl Hp
+.Op Fl o Ar field Ns Op , Ns Ar ...
.Ar all | property Ns Op , Ns Ar ...
.Ar pool ...
.Xc
@@ -1036,6 +1041,19 @@ the following fields:
See the
.Qq Sx Properties
section for more information on the available pool properties.
+.Pp
+.It Fl H
+Scripted mode. Do not display headers, and separate fields by a single tab
+instead of arbitrary space.
+.It Fl p
+Display numbers in parsable (exact) values.
+.It Fl o Ar field
+A comma-separated list of columns to display.
+.Sy name Ns , Ns
+.Sy property Ns , Ns
+.Sy value Ns , Ns
+.Sy source
+is the default value.
.It Xo
.Nm
.Cm history
@@ -1335,7 +1353,7 @@ Treat exported or foreign devices as ina
.It Xo
.Nm
.Cm list
-.Op Fl Hv
+.Op Fl Hpv
.Op Fl o Ar property Ns Op , Ns Ar ...
.Op Fl T Cm d Ns | Ns Cm u
.Op Ar pool
@@ -1371,6 +1389,8 @@ for unixtime
.It Fl H
Scripted mode. Do not display headers, and separate fields by a single tab
instead of arbitrary space.
+.It Fl p
+Display numbers in parsable (exact) values.
.It Fl v
Show more detailed information.
.It Fl o Ar property Ns Op , Ns Ar ...
Modified: stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==
--- stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.cFri May 9
07:34:38 2014(r265748)
+++ stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool_main.cFri May 9
07:35:39 2014(r265749)
@@ -235,7 +235,7 @@ get_usage(zpool_help_t idx) {
case HELP_LABELCLEAR:
return (gettext(\tlabelclear [-f] vdev\n));
case HELP_LIST:
- return (gettext(\tlist [-Hv] [-o property[,...]]
+ return (gettext(\tlist [-Hpv] [-o property[,...]]
[-T d|u] [pool] ... [interval [count]]\n));
case HELP_OFFLINE:
return (gettext(\toffline [-t] pool device ...\n));
@@ -257,8 +257,8 @@ get_usage(zpool_help_t idx) {
return (gettext(\tupgrade [-v]\n
\tupgrade [-V version] -a | pool ...\n));
case HELP_GET:
- return (gettext(\tget \all\ | property[,...]
- pool ...\n));
+ return (gettext(\tget [-Hp] [-o \all\ | field[,...]]
+ \all\ | property[,...] pool ...\n));
case HELP_SET:
return (gettext(\tset property=value pool \n));
case HELP_SPLIT:
@@ -2755,6 +2755,7 @@ typedef struct list_cbdata {
int cb_namewidth;
boolean_t cb_scripted;
zprop_list_t*cb_proplist;
+ boolean_t cb_literal;
} list_cbdata_t;
/*
@@ -2850,7 +2851,7 @@ print_pool(zpool_handle_t *zhp, list_cbd
zpool_get_prop_int(zhp, pl-pl_prop, NULL) == 0)
propstr = -;
else if (zpool_get_prop(zhp, pl-pl_prop, property,
- sizeof (property), NULL) != 0)
+ sizeof (property), NULL, cb-cb_literal) != 0)
propstr = -;
else
svn commit: r265750 - stable/9/contrib/netcat
Author: delphij Date: Fri May 9 07:38:22 2014 New Revision: 265750 URL: http://svnweb.freebsd.org/changeset/base/265750 Log: MFC: nc(1) from OpenBSD 5.5. Modified: stable/9/contrib/netcat/FREEBSD-vendor stable/9/contrib/netcat/atomicio.c stable/9/contrib/netcat/nc.1 stable/9/contrib/netcat/netcat.c Directory Properties: stable/9/contrib/netcat/ (props changed) Modified: stable/9/contrib/netcat/FREEBSD-vendor == --- stable/9/contrib/netcat/FREEBSD-vendor Fri May 9 07:35:39 2014 (r265749) +++ stable/9/contrib/netcat/FREEBSD-vendor Fri May 9 07:38:22 2014 (r265750) @@ -1,5 +1,5 @@ # $FreeBSD$ Project: netcat (aka src/usr.bin/nc in OpenBSD) ProjectURL:http://www.openbsd.org/ -Version: 5.2 +Version: 5.3 License: BSD Modified: stable/9/contrib/netcat/atomicio.c == --- stable/9/contrib/netcat/atomicio.c Fri May 9 07:35:39 2014 (r265749) +++ stable/9/contrib/netcat/atomicio.c Fri May 9 07:38:22 2014 (r265750) @@ -1,4 +1,4 @@ -/* $OpenBSD: atomicio.c,v 1.10 2011/01/08 00:47:19 jeremy Exp $ */ +/* $OpenBSD: atomicio.c,v 1.11 2012/12/04 02:24:47 deraadt Exp $ */ /* * Copyright (c) 2006 Damien Miller. All rights reserved. * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved. @@ -26,8 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include sys/param.h - #include errno.h #include poll.h #include unistd.h Modified: stable/9/contrib/netcat/nc.1 == --- stable/9/contrib/netcat/nc.1Fri May 9 07:35:39 2014 (r265749) +++ stable/9/contrib/netcat/nc.1Fri May 9 07:38:22 2014 (r265750) @@ -1,4 +1,4 @@ -.\ $OpenBSD: nc.1,v 1.61 2012/07/07 15:33:02 haesbaert Exp $ +.\ $OpenBSD: nc.1,v 1.67 2014/02/26 20:56:11 claudio Exp $ .\ .\ Copyright (c) 1996 David Sacerdote .\ All rights reserved. @@ -27,7 +27,7 @@ .\ .\ $FreeBSD$ .\ -.Dd February 7, 2012 +.Dd April 11, 2014 .Dt NC 1 .Os .Sh NAME @@ -36,7 +36,7 @@ .Sh SYNOPSIS .Nm nc .Bk -words -.Op Fl 46DdEhklnrStUuvz +.Op Fl 46DdEFhklNnrStUuvz .Op Fl e Ar IPsec_policy .Op Fl I Ar length .Op Fl i Ar interval @@ -120,6 +120,21 @@ to be used using the syntax described in .Xr ipsec_set_policy 3 . This flag can be specified up to two times, as typically one policy for each direction is needed. +.It Fl F +Pass the first connected socket using +.Xr sendmsg 2 +to stdout and exit. +This is useful in conjunction with +.Fl X +to have +.Nm +perform connection setup with a proxy but then leave the rest of the +connection to another program (e.g.\ +.Xr ssh 1 +using the +.Xr ssh_config 5 +.Cm ProxyUseFdPass +option). .It Fl h Prints out .Nm @@ -155,6 +170,10 @@ options. Additionally, any timeouts specified with the .Fl w option are ignored. +.It Fl N +.Xr shutdown 2 +the network socket after EOF on the input. +Some servers require this to finish their work. .It Fl n Do not do any DNS or service lookups on any specified addresses, hostnames or ports. @@ -232,7 +251,6 @@ flag is given. Set the routing table .Pq Dq FIB to be used. -The default is 0. .It Fl v Have .Nm @@ -361,7 +379,7 @@ Using a second machine, connect to the l .Nm process, feeding it the file which is to be transferred: .Pp -.Dl $ nc host.example.com 1234 \*(Lt filename.in +.Dl $ nc -N host.example.com 1234 \*(Lt filename.in .Pp After the file has been transferred, the connection will close automatically. .Sh TALKING TO SERVERS @@ -486,10 +504,10 @@ if the proxy requires it: .Xr tcp 4 .Sh AUTHORS Original implementation by *Hobbit* -.Aq hob...@avian.org . +.Aq Mt hob...@avian.org . .br Rewritten with IPv6 support by -.An Eric Jackson Aq er...@monkey.org . +.An Eric Jackson Aq Mt er...@monkey.org . .Sh CAVEATS UDP port scans using the .Fl uz Modified: stable/9/contrib/netcat/netcat.c == --- stable/9/contrib/netcat/netcat.cFri May 9 07:35:39 2014 (r265749) +++ stable/9/contrib/netcat/netcat.cFri May 9 07:38:22 2014 (r265750) @@ -1,4 +1,4 @@ -/* $OpenBSD: netcat.c,v 1.109 2012/07/07 15:33:02 haesbaert Exp $ */ +/* $OpenBSD: netcat.c,v 1.117 2013/10/26 21:33:29 sthen Exp $ */ /* * Copyright (c) 2001 Eric Jackson er...@monkey.org * @@ -38,6 +38,7 @@ #include sys/socket.h #include sys/sysctl.h #include sys/time.h +#include sys/uio.h #include sys/un.h #include netinet/in.h @@ -74,9 +75,11 @@ /* Command Line Options */ intdflag; /* detached, no stdin */ +intFflag; /* fdpass sock to stdout */ unsigned int iflag;/* Interval Flag */ intkflag;
svn commit: r265751 - in stable/9: cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/lib/libzpool/common cddl/contrib/opensolaris/lib/libzpool/common/sys sys/cddl/contrib/opensolaris/uts/co...
Author: delphij
Date: Fri May 9 07:54:59 2014
New Revision: 265751
URL: http://svnweb.freebsd.org/changeset/base/265751
Log:
MFC r264669: MFV r264666:
4374 dn_free_ranges should use range_tree_t
Modified:
stable/9/cddl/contrib/opensolaris/cmd/zdb/zdb.c
stable/9/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
stable/9/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/range_tree.h
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h
stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
Directory Properties:
stable/9/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/9/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==
--- stable/9/cddl/contrib/opensolaris/cmd/zdb/zdb.c Fri May 9 07:38:22
2014(r265750)
+++ stable/9/cddl/contrib/opensolaris/cmd/zdb/zdb.c Fri May 9 07:54:59
2014(r265751)
@@ -21,7 +21,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
*/
#include stdio.h
@@ -2741,7 +2741,8 @@ dump_simulated_ddt(spa_t *spa)
dds.dds_ref_psize = zdde-zdde_ref_psize;
dds.dds_ref_dsize = zdde-zdde_ref_dsize;
- ddt_stat_add(ddh_total.ddh_stat[highbit(refcnt) - 1], dds, 0);
+ ddt_stat_add(ddh_total.ddh_stat[highbit64(refcnt) - 1],
+ dds, 0);
umem_free(zdde, sizeof (*zdde));
}
Modified: stable/9/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
==
--- stable/9/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Fri May
9 07:38:22 2014(r265750)
+++ stable/9/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Fri May
9 07:54:59 2014(r265751)
@@ -20,6 +20,8 @@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
*/
#include assert.h
@@ -800,20 +802,17 @@ delay(clock_t ticks)
/*
* Find highest one bit set.
* Returns bit number + 1 of highest bit that is set, otherwise returns 0.
- * High order bit is 31 (or 63 in _LP64 kernel).
*/
int
-highbit(ulong_t i)
+highbit64(uint64_t i)
{
- register int h = 1;
+ int h = 1;
if (i == 0)
return (0);
-#ifdef _LP64
- if (i 0xul) {
+ if (i 0xULL) {
h += 32; i = 32;
}
-#endif
if (i 0x) {
h += 16; i = 16;
}
Modified:
stable/9/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
==
--- stable/9/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
Fri May 9 07:38:22 2014(r265750)
+++ stable/9/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
Fri May 9 07:54:59 2014(r265751)
@@ -20,7 +20,7 @@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
* Copyright (c) 2012, Joyent, Inc. All rights reserved.
*/
/*
@@ -566,7 +566,7 @@ extern void delay(clock_t ticks);
extern uint64_t physmem;
-extern int highbit(ulong_t i);
+extern int highbit64(uint64_t i);
extern int random_get_bytes(uint8_t *ptr, size_t len);
extern int random_get_pseudo_bytes(uint8_t *ptr, size_t len);
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
svn commit: r265752 - in stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys
Author: delphij
Date: Fri May 9 08:02:52 2014
New Revision: 265752
URL: http://svnweb.freebsd.org/changeset/base/265752
Log:
MFC r264671:
MFV r264668:
4754 io issued to near-full luns even after setting noalloc threshold
4755 mg_alloc_failures is no longer needed
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
Directory Properties:
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
==
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c Fri May
9 07:54:59 2014(r265751)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c Fri May
9 08:02:52 2014(r265752)
@@ -41,7 +41,7 @@ SYSCTL_NODE(_vfs_zfs, OID_AUTO, metaslab
* avoid having to load lots of space_maps in a given txg. There are,
* however, some cases where we want to avoid fast ganging and instead
* we want to do an exhaustive search of all metaslabs on this device.
- * Currently we don't allow any gang, zil, or dump device related allocations
+ * Currently we don't allow any gang, slog, or dump device related allocations
* to fast gang.
*/
#defineCAN_FASTGANG(flags) \
@@ -74,18 +74,6 @@ SYSCTL_INT(_vfs_zfs, OID_AUTO, condense_
of in-memory counterpart);
/*
- * This value defines the number of allowed allocation failures per vdev.
- * If a device reaches this threshold in a given txg then we consider skipping
- * allocations on that device. The value of zfs_mg_alloc_failures is computed
- * in zio_init() unless it has been overridden in /etc/system.
- */
-int zfs_mg_alloc_failures = 0;
-TUNABLE_INT(vfs.zfs.mg_alloc_failures, zfs_mg_alloc_failures);
-SYSCTL_INT(_vfs_zfs, OID_AUTO, mg_alloc_failures, CTLFLAG_RWTUN,
-zfs_mg_alloc_failures, 0,
-Number of allowed allocation failures per vdev);
-
-/*
* The zfs_mg_noalloc_threshold defines which metaslab groups should
* be eligible for allocation. The value is defined as a percentage of
* a free space. Metaslab groups that have more free space than
@@ -1708,10 +1696,7 @@ metaslab_sync_done(metaslab_t *msp, uint
void
metaslab_sync_reassess(metaslab_group_t *mg)
{
- int64_t failures = mg-mg_alloc_failures;
-
metaslab_group_alloc_update(mg);
- atomic_add_64(mg-mg_alloc_failures, -failures);
/*
* Preload the next potential metaslabs
@@ -1738,7 +1723,7 @@ metaslab_distance(metaslab_t *msp, dva_t
static uint64_t
metaslab_group_alloc(metaslab_group_t *mg, uint64_t psize, uint64_t asize,
-uint64_t txg, uint64_t min_distance, dva_t *dva, int d, int flags)
+uint64_t txg, uint64_t min_distance, dva_t *dva, int d)
{
spa_t *spa = mg-mg_vd-vdev_spa;
metaslab_t *msp = NULL;
@@ -1765,10 +1750,9 @@ metaslab_group_alloc(metaslab_group_t *m
spa_dbgmsg(spa, %s: failed to meet weight
requirement: vdev %llu, txg %llu, mg %p,
msp %p, psize %llu, asize %llu,
- failures %llu, weight %llu,
- spa_name(spa), mg-mg_vd-vdev_id, txg,
- mg, msp, psize, asize,
- mg-mg_alloc_failures, msp-ms_weight);
+ weight %llu, spa_name(spa),
+ mg-mg_vd-vdev_id, txg,
+ mg, msp, psize, asize, msp-ms_weight);
mutex_exit(mg-mg_lock);
return (-1ULL);
}
@@ -1801,27 +1785,6 @@ metaslab_group_alloc(metaslab_group_t *m
mutex_enter(msp-ms_lock);
/*
-* If we've already reached the allowable number of failed
-* allocation attempts on this metaslab group then we
-* consider skipping it. We skip it only if we're allowed
-* to fast gang, the physical size is larger than
-* a gang block, and we're attempting to allocate from
-* the primary metaslab.
-*/
- if (mg-mg_alloc_failures zfs_mg_alloc_failures
- CAN_FASTGANG(flags) psize SPA_GANGBLOCKSIZE
- activation_weight == METASLAB_WEIGHT_PRIMARY) {
- spa_dbgmsg(spa, %s: skipping metaslab group:
- vdev %llu, txg %llu, mg %p, msp[%llu] %p,
- psize %llu, asize %llu, failures %llu,
- spa_name(spa), mg-mg_vd-vdev_id, txg, mg,
- msp-ms_id, msp, psize, asize,
-
svn commit: r265753 - stable/9/usr.sbin/portsnap/portsnap
Author: delphij
Date: Fri May 9 08:07:05 2014
New Revision: 265753
URL: http://svnweb.freebsd.org/changeset/base/265753
Log:
MFC r264740:
Use case insensitive match in portsnap.
PR: bin/186510
Submitted by: olli
Modified:
stable/9/usr.sbin/portsnap/portsnap/portsnap.sh
Directory Properties:
stable/9/usr.sbin/portsnap/ (props changed)
stable/9/usr.sbin/portsnap/portsnap/ (props changed)
Modified: stable/9/usr.sbin/portsnap/portsnap/portsnap.sh
==
--- stable/9/usr.sbin/portsnap/portsnap/portsnap.sh Fri May 9 08:02:52
2014(r265752)
+++ stable/9/usr.sbin/portsnap/portsnap/portsnap.sh Fri May 9 08:07:05
2014(r265753)
@@ -348,7 +348,7 @@ fetch_pick_server_init() {
# $name server selection ...; we allow either format.
MLIST=_http._tcp.${SERVERNAME}
host -t srv ${MLIST} |
- sed -nE s/${MLIST} (has SRV record|server selection) //p |
+ sed -nE s/${MLIST} (has SRV record|server selection) //Ip |
cut -f 1,2,4 -d ' ' |
sed -e 's/\.$//' |
sort serverlist_full
___
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to svn-src-stable-9-unsubscr...@freebsd.org
svn commit: r265754 - in stable/9: cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libzfs/common sys/cddl/contrib/opensolaris/common/zfs sys/cddl/co...
Author: delphij Date: Fri May 9 08:10:33 2014 New Revision: 265754 URL: http://svnweb.freebsd.org/changeset/base/265754 Log: MFC r264835: MFV r264829: 3897 zfs filesystem and snapshot limits Modified: stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 stable/9/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c stable/9/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c stable/9/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h stable/9/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h Directory Properties: stable/9/cddl/contrib/opensolaris/ (props changed) stable/9/cddl/contrib/opensolaris/cmd/zfs/ (props changed) stable/9/cddl/contrib/opensolaris/cmd/zpool/ (props changed) stable/9/cddl/contrib/opensolaris/lib/libzfs/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 == --- stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri May 9 08:07:05 2014(r265753) +++ stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri May 9 08:10:33 2014(r265754) @@ -24,13 +24,13 @@ .\ Copyright (c) 2012, Glen Barber g...@freebsd.org .\ Copyright (c) 2013 by Saso Kiselkov. All rights reserved. .\ Copyright (c) 2013 Nexenta Systems, Inc. All Rights Reserved. -.\ Copyright (c) 2013, Joyent, Inc. All rights reserved. +.\ Copyright (c) 2014, Joyent, Inc. All rights reserved. .\ Copyright (c) 2013, Steven Hartland s...@freebsd.org .\ Copyright (c) 2014, Xin LI delp...@freebsd.org .\ .\ $FreeBSD$ .\ -.Dd March 20, 2014 +.Dd April 23, 2014 .Dt ZFS 8 .Os .Sh NAME @@ -536,6 +536,13 @@ if the snapshot has been marked for defe .Qq Nm Cm destroy -d command. Otherwise, the property is .Cm off . +.It Sy filesystem_count +The total number of filesystems and volumes that exist under this location in the +dataset tree. +This value is only available when a +.Sy filesystem_limit +has +been set somewhere in the tree under which the dataset resides. .It Sy logicalreferenced The amount of space that is .Qq logically @@ -594,6 +601,12 @@ The compression ratio achieved for the space of this dataset, expressed as a multiplier. See also the .Sy compressratio property. +.It Sy snapshot_count +The total number of snapshots that exist under this location in the dataset tree. +This value is only available when a +.Sy snapshot_limit +has been set somewhere +in the tree under which the dataset resides. .It Sy type The type of dataset: .Sy filesystem , volume , No or Sy snapshot . @@ -1014,6 +1027,23 @@ The .Sy mlslabel property is currently not supported on .Fx . +.It Sy filesystem_limit Ns = Ns Ar count | Cm none +Limits the number of filesystems and volumes that can exist under this point in +the dataset tree. +The limit is not enforced if the user is allowed to change +the limit. +Setting a +.Sy filesystem_limit +on a descendent of a filesystem that +already has a +.Sy filesystem_limit +does not override the ancestor's +.Sy filesystem_limit , +but rather imposes an additional limit. +This feature must be enabled to be used +.Po see +.Xr zpool-features 7 +.Pc . .It Sy mountpoint Ns = Ns Ar path | Cm none | legacy Controls the mount point used for this file system. See the .Qq Sx Mount Points @@ -1055,6 +1085,27 @@ the ancestor's quota, but rather imposes Quotas cannot be set on volumes, as the .Sy volsize property acts as an implicit quota. +.It Sy snapshot_limit Ns = Ns Ar count | Cm none +Limits the number of snapshots that can be created on a dataset and its +descendents. +Setting a +.Sy snapshot_limit +on a descendent of a dataset that already +has a +.Sy snapshot_limit +does not override the ancestor's +.Sy snapshot_limit , +but +rather imposes an additional limit. +The limit is not enforced if the user is +allowed to change the limit. +For example, this means that recursive snapshots +taken from the global zone are counted against each delegated dataset within +a jail. +This feature must be enabled to be used +.Po see +.Xr zpool-features 7 +.Pc . .It Sy
svn commit: r265755 - in stable/9/sys/cddl/contrib/opensolaris: common/avl uts/common/sys
Author: delphij
Date: Fri May 9 08:13:11 2014
New Revision: 265755
URL: http://svnweb.freebsd.org/changeset/base/265755
Log:
MFC r264836: MFV r264830:
4745 fix AVL code misspellings
Modified:
stable/9/sys/cddl/contrib/opensolaris/common/avl/avl.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h
Directory Properties:
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/9/sys/cddl/contrib/opensolaris/common/avl/avl.c
==
--- stable/9/sys/cddl/contrib/opensolaris/common/avl/avl.c Fri May 9
08:10:33 2014(r265754)
+++ stable/9/sys/cddl/contrib/opensolaris/common/avl/avl.c Fri May 9
08:13:11 2014(r265755)
@@ -37,7 +37,7 @@
* insertion and deletion relatively efficiently. Searching the tree is
* still a fast operation, roughly O(log(N)).
*
- * The key to insertion and deletion is a set of tree maniuplations called
+ * The key to insertion and deletion is a set of tree manipulations called
* rotations, which bring unbalanced subtrees back into the semi-balanced
state.
*
* This implementation of AVL trees has the following peculiarities:
@@ -45,7 +45,7 @@
* - The AVL specific data structures are physically embedded as fields
* in the using data structures. To maintain generality the code
* must constantly translate between avl_node_t * and containing
- * data structure void *s by adding/subracting the avl_offset.
+ * data structure void *s by adding/subtracting the avl_offset.
*
* - Since the AVL data is always embedded in other structures, there is
* no locking or memory allocation in the AVL routines. This must be
@@ -94,7 +94,7 @@
#include sys/avl.h
/*
- * Small arrays to translate between balance (or diff) values and child
indeces.
+ * Small arrays to translate between balance (or diff) values and child
indices.
*
* Code that deals with binary tree data structures will randomly use
* left and right children when examining a tree. C if() statements
@@ -114,7 +114,8 @@ static const int avl_balance2child[] =
*
* - If there is a left child, go to it, then to it's rightmost descendant.
*
- * - otherwise we return thru parent nodes until we've come from a right child.
+ * - otherwise we return through parent nodes until we've come from a right
+ * child.
*
* Return Value:
* NULL - if at the end of the nodes
@@ -919,7 +920,7 @@ avl_is_empty(avl_tree_t *tree)
/*
* Post-order tree walk used to visit all tree nodes and destroy the tree
- * in post order. This is used for destroying a tree w/o paying any cost
+ * in post order. This is used for destroying a tree without paying any cost
* for rebalancing it.
*
* example:
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h
==
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h Fri May 9
08:10:33 2014(r265754)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h Fri May 9
08:13:11 2014(r265755)
@@ -39,7 +39,7 @@ extern C {
#include sys/avl_impl.h
/*
- * This is a generic implemenatation of AVL trees for use in the Solaris
kernel.
+ * This is a generic implementation of AVL trees for use in the Solaris kernel.
* The interfaces provide an efficient way of implementing an ordered set of
* data structures.
*
@@ -175,7 +175,7 @@ extern void avl_insert(avl_tree_t *tree,
* Insert new_data in tree in the given direction either after
* or before the data here.
*
- * This might be usefull for avl clients caching recently accessed
+ * This might be useful for avl clients caching recently accessed
* data to avoid doing avl_find() again for insertion.
*
* new_data- new data to insert
___
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to svn-src-stable-9-unsubscr...@freebsd.org
svn commit: r265756 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: delphij Date: Fri May 9 08:15:35 2014 New Revision: 265756 URL: http://svnweb.freebsd.org/changeset/base/265756 Log: MFC r265458: Import George Wilson's change for Illumos #4730: 4730 metaslab group taskq should be destroyed in metaslab_group_destroy() Reviewed by: Alex Reece alex.re...@delphix.com Reviewed by: Matthew Ahrens mahr...@delphix.com Reviewed by: Sebastien Roy sebastien@delphix.com Original author: George Wilson Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c Directory Properties: stable/9/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c == --- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c Fri May 9 08:13:11 2014(r265755) +++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c Fri May 9 08:15:35 2014(r265756) @@ -412,7 +412,7 @@ metaslab_group_create(metaslab_class_t * mg-mg_class = mc; mg-mg_activation_count = 0; - mg-mg_taskq = taskq_create(metaslab_group_tasksq, metaslab_load_pct, + mg-mg_taskq = taskq_create(metaslab_group_taskq, metaslab_load_pct, minclsyspri, 10, INT_MAX, TASKQ_THREADS_CPU_PCT); return (mg); @@ -430,6 +430,7 @@ metaslab_group_destroy(metaslab_group_t */ ASSERT(mg-mg_activation_count = 0); + taskq_destroy(mg-mg_taskq); avl_destroy(mg-mg_metaslab_tree); mutex_destroy(mg-mg_lock); kmem_free(mg, sizeof (metaslab_group_t)); ___ svn-src-stable-9@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9 To unsubscribe, send any mail to svn-src-stable-9-unsubscr...@freebsd.org
svn commit: r265757 - stable/9/lib/libmagic
Author: delphij
Date: Fri May 9 08:18:57 2014
New Revision: 265757
URL: http://svnweb.freebsd.org/changeset/base/265757
Log:
MFC r265464:
Sort .ALLSRC before concatenating files together. This makes sure that the
file are always built the same.
(Note that Header and Localstuff must appear first and in that order, the
sorting does not affect as a coincident effect).
Submitted by: sjg
Modified:
stable/9/lib/libmagic/Makefile
Directory Properties:
stable/9/lib/libmagic/ (props changed)
Modified: stable/9/lib/libmagic/Makefile
==
--- stable/9/lib/libmagic/Makefile Fri May 9 08:15:35 2014
(r265756)
+++ stable/9/lib/libmagic/Makefile Fri May 9 08:18:57 2014
(r265757)
@@ -33,7 +33,7 @@ MAGFILES= ${CONTRDIR}/Header\
${CONTRDIR}/Magdir/[a-z]*
magic: ${MAGFILES}
- cat ${.ALLSRC} ${.TARGET}
+ cat ${.ALLSRC:O} ${.TARGET}
magic.mgc: mkmagic magic
./mkmagic magic
___
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to svn-src-stable-9-unsubscr...@freebsd.org
svn commit: r265769 - stable/9/sys/kern
Author: brueffer
Date: Fri May 9 13:21:14 2014
New Revision: 265769
URL: http://svnweb.freebsd.org/changeset/base/265769
Log:
MFC: r265244
Free resources in an error case.
CID: 1018947
Found with: Coverity Prevent(tm)
Modified:
stable/9/sys/kern/kern_cpu.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/kern/kern_cpu.c
==
--- stable/9/sys/kern/kern_cpu.cFri May 9 13:18:24 2014
(r265768)
+++ stable/9/sys/kern/kern_cpu.cFri May 9 13:21:14 2014
(r265769)
@@ -1037,6 +1037,7 @@ cpufreq_unregister(device_t dev)
if (cf_dev == NULL) {
device_printf(dev,
warning: cpufreq_unregister called with no cpufreq device active\n);
+ free(devs, M_TEMP);
return (0);
}
cfcount = 0;
___
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to svn-src-stable-9-unsubscr...@freebsd.org
svn commit: r265796 - in stable/9/sys: dev/bxe modules/bxe
Author: davidcs Date: Sat May 10 02:09:09 2014 New Revision: 265796 URL: http://svnweb.freebsd.org/changeset/base/265796 Log: MFC r265411 Modify Copyright information to reflect Qlogic Corporation's purchase of Broadcom's NetXtreme business Submitted by:David C Somayajulu (davi...@freebsd.org) QLogic Corporation Modified: stable/9/sys/dev/bxe/57710_init_values.c stable/9/sys/dev/bxe/57710_int_offsets.h stable/9/sys/dev/bxe/57711_init_values.c stable/9/sys/dev/bxe/57711_int_offsets.h stable/9/sys/dev/bxe/57712_init_values.c stable/9/sys/dev/bxe/57712_int_offsets.h stable/9/sys/dev/bxe/bxe.c stable/9/sys/dev/bxe/bxe.h stable/9/sys/dev/bxe/bxe_dcb.h stable/9/sys/dev/bxe/bxe_debug.c stable/9/sys/dev/bxe/bxe_elink.c stable/9/sys/dev/bxe/bxe_elink.h stable/9/sys/dev/bxe/bxe_stats.c stable/9/sys/dev/bxe/bxe_stats.h stable/9/sys/dev/bxe/ecore_fw_defs.h stable/9/sys/dev/bxe/ecore_hsi.h stable/9/sys/dev/bxe/ecore_init.h stable/9/sys/dev/bxe/ecore_init_ops.h stable/9/sys/dev/bxe/ecore_mfw_req.h stable/9/sys/dev/bxe/ecore_reg.h stable/9/sys/dev/bxe/ecore_sp.c stable/9/sys/dev/bxe/ecore_sp.h stable/9/sys/modules/bxe/Makefile Directory Properties: stable/9/ (props changed) stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/modules/ (props changed) Modified: stable/9/sys/dev/bxe/57710_init_values.c == --- stable/9/sys/dev/bxe/57710_init_values.cSat May 10 02:08:04 2014 (r265795) +++ stable/9/sys/dev/bxe/57710_init_values.cSat May 10 02:09:09 2014 (r265796) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Daviseda...@broadcom.com - * David Christensen davi...@broadcom.com - * Gary Zambrano zambr...@broadcom.com + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - *may be used to endorse or promote products derived from this software - *without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/9/sys/dev/bxe/57710_int_offsets.h == --- stable/9/sys/dev/bxe/57710_int_offsets.hSat May 10 02:08:04 2014 (r265795) +++ stable/9/sys/dev/bxe/57710_int_offsets.hSat May 10 02:09:09 2014 (r265796) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Daviseda...@broadcom.com - * David Christensen davi...@broadcom.com - * Gary Zambrano zambr...@broadcom.com + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. Neither the name of Broadcom Corporation nor the name of its contributors - *may be used to endorse or promote products derived from this software - *without specific prior written consent. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Modified: stable/9/sys/dev/bxe/57711_init_values.c == --- stable/9/sys/dev/bxe/57711_init_values.cSat May 10 02:08:04 2014 (r265795) +++ stable/9/sys/dev/bxe/57711_init_values.cSat May 10 02:09:09 2014 (r265796) @@ -1,9 +1,5 @@ /*- - * Copyright (c) 2007-2013 Broadcom Corporation. All rights reserved. - * - * Eric Daviseda...@broadcom.com - * David Christensen davi...@broadcom.com - * Gary Zambrano zambr...@broadcom.com + * Copyright (c) 2007-2014 QLogic Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,9 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the
