From bde2df36223c26750e6e5e801907d885e088ee30 Mon Sep 17 00:00:00 2001 From: Yuri Pankov Date: Fri, 21 Sep 2012 06:38:43 +0400 Subject: [PATCH] 1126 date(1)'s usage message doesn't mention -R 1788 "WARNING: Cannot lookup root device: /devices" is useless when rootfs is zfs 1828 powerd's "Able to open /dev/srn" notice is useless 2547 Minor updates to README 2678 zfs manpage mis-identifies checksum default value 2811 missing implementation: zfs send -r 3199 Update copyright years in usr/src/prototypes/ Reviewed by: Joshua M. Clulow Reviewed by: Garrett D'Amore Approved by: Dan McDonald --- README | 35 +++++++++++++-------------- usr/src/cmd/date/date.c | 4 ++-- usr/src/cmd/power/powerd.c | 1 - usr/src/cmd/zfs/zfs_main.c | 2 +- usr/src/man/man1m/zfs.1m | 20 ++++------------ usr/src/prototypes/README | 2 +- usr/src/prototypes/prototype.Makefile | 2 +- usr/src/prototypes/prototype.c | 2 +- usr/src/prototypes/prototype.csh | 2 +- usr/src/prototypes/prototype.h | 2 +- usr/src/prototypes/prototype.java | 2 +- usr/src/prototypes/prototype.ksh | 2 +- usr/src/prototypes/prototype.man | 3 +-- usr/src/prototypes/prototype.mapfile-vers | 2 +- usr/src/prototypes/prototype.pl | 2 +- usr/src/prototypes/prototype.py | 2 +- usr/src/prototypes/prototype.s | 2 +- usr/src/prototypes/prototype.sh | 2 +- usr/src/uts/common/fs/vfs.c | 40 +++++++++++++++++-------------- 19 files changed, 59 insertions(+), 70 deletions(-) diff --git a/README b/README index a2759b6940..9fd99ad6c8 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -illumos gate README - Sept 12, 2010. +illumos gate README - Sep 16, 2012. This is the illumos gate. This is the illumos source tree. It contains the following subdirectories: @@ -12,7 +12,7 @@ the following subdirectories: Integration Rules: - All changes must have been reviewed, and approved by and advocate + All changes must have been reviewed, and approved by an advocate (below). A code review may be performed by someone other than the advocate, but the final integration should still be approved by the advocate. @@ -24,27 +24,26 @@ Integration Rules: All changes must adhere to typical ON style and quality rules. For example, pass full cstyle, applicable lint rules, etc. - All commits must include either a CDDL license, unless - approved otherwise by the gatekeeper, or the modified code - already carries a different license. Exceptions shall require - the approval of the gatekeeper. + All new code must be licensed under CDDL, and modifications to existing + code may not alter the original license terms. Integrations of code + from upstream sources that use another liberal open source license are + permissible, subject to approval of the advocates or developer council. + Exceptions to this policy shall require the approval of the developer + council. - Hg commits should have comments of the following form: + Commits should have comments of the following form: 1234 This is a sample bug report synopsis - 4567 If you have a second bug synopsis... - Reviewed by: codereviewer@somewhere.net - Approved by: gatekeeper@somewhere.else.com + 4567 If you have a second bug synopsis… + Reviewed by: Frodo Baggins + Reviewed by: Legolas + Approved by: Gandalf The Grey Each commit must have at least one bug id that is listed in the illumos-gate project at www.illumos.org. -Branches: - - Please talk to the gatekeeper about personal branches. In general, - they will be allowed as long as we don't go *too* wild on them. - -Gatekeeper: garrett@nexenta.com (Interim) -IRC channel: #illumos on irc.freenode.net -Mailing list: developer@lists.illumos.org +RTI Advocates: advocates@lists.illumos.org +Developer Council: developer-council@lists.illumos.org +IRC channel: #illumos on irc.freenode.net +Mailing list: developer@lists.illumos.org diff --git a/usr/src/cmd/date/date.c b/usr/src/cmd/date/date.c index 7c3d674b74..2d74cf8e4d 100644 --- a/usr/src/cmd/date/date.c +++ b/usr/src/cmd/date/date.c @@ -24,7 +24,7 @@ * Use is subject to license terms. */ /* - * Copyright 2011 Nexenta Systems, Inc. All rights reserved. + * Copyright 2012 Nexenta Systems, Inc. All rights reserved. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ @@ -68,7 +68,7 @@ static struct utmpx wtmpx[2] = { {"", "", NTIME_MSG, 0, NEW_TIME, 0, 0, 0} }; static char *usage = - "usage:\tdate [-u] mmddHHMM[[cc]yy][.SS]\n\tdate [-u] [+format]\n" + "usage:\tdate [-u] mmddHHMM[[cc]yy][.SS]\n\tdate [-Ru] [+format]\n" "\tdate -a [-]sss[.fff]\n"; static int uflag = 0; static int Rflag = 0; diff --git a/usr/src/cmd/power/powerd.c b/usr/src/cmd/power/powerd.c index 227e91ac38..2d4a3ae274 100644 --- a/usr/src/cmd/power/powerd.c +++ b/usr/src/cmd/power/powerd.c @@ -399,7 +399,6 @@ autos3_monitor(void) logerror("Unable to open %s: %s", SRN, strerror(errno)); thr_exit((void *) errno); } - logerror("Able to open %s", SRN); /* * Tell device we want the special sauce diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c index a59d45eced..ee9d289a11 100644 --- a/usr/src/cmd/zfs/zfs_main.c +++ b/usr/src/cmd/zfs/zfs_main.c @@ -252,7 +252,7 @@ get_usage(zfs_help_t idx) case HELP_ROLLBACK: return (gettext("\trollback [-rRf] \n")); case HELP_SEND: - return (gettext("\tsend [-DnPpRrv] [-[iI] snapshot] " + return (gettext("\tsend [-DnPpRv] [-[iI] snapshot] " "\n")); case HELP_SET: return (gettext("\tset " diff --git a/usr/src/man/man1m/zfs.1m b/usr/src/man/man1m/zfs.1m index 0fcb40bb81..d2af571347 100644 --- a/usr/src/man/man1m/zfs.1m +++ b/usr/src/man/man1m/zfs.1m @@ -26,7 +26,7 @@ .\" Copyright (c) 2012, Joyent, Inc. All rights reserved. .\" Copyright 2012 Nexenta Systems, Inc. All Rights Reserved. .\" -.TH ZFS 1M "Aug 16, 2012" +.TH ZFS 1M "Sep 16, 2012" .SH NAME zfs \- configures ZFS file systems .SH SYNOPSIS @@ -886,14 +886,14 @@ This property is not inherited. .sp .ne 2 .na -\fB\fBchecksum\fR=\fBon\fR | \fBoff\fR | \fBfletcher2,\fR| \fBfletcher4\fR | +\fB\fBchecksum\fR=\fBon\fR | \fBoff\fR | \fBfletcher2\fR | \fBfletcher4\fR | \fBsha256\fR\fR .ad .sp .6 .RS 4n Controls the checksum used to verify data integrity. The default value is \fBon\fR, which automatically selects an appropriate algorithm (currently, -\fBfletcher2\fR, but this may change in future releases). The value \fBoff\fR +\fBfletcher4\fR, but this may change in future releases). The value \fBoff\fR disables integrity checking on user data. Disabling checksums is \fBNOT\fR a recommended practice. .sp @@ -2733,7 +2733,7 @@ Unshare the specified filesystem. The command can also be given a path to a .sp .ne 2 .na -\fBzfs send\fR [\fB-DnPpRrv\fR] [\fB-\fR[\fBiI\fR] \fIsnapshot\fR] \fIsnapshot\fR +\fBzfs send\fR [\fB-DnPpRv\fR] [\fB-\fR[\fBiI\fR] \fIsnapshot\fR] \fIsnapshot\fR .ad .sp .6 .RS 4n @@ -2809,18 +2809,6 @@ will be much better if the filesystem uses a dedup-capable checksum (eg. .sp .ne 2 .na -\fB\fB-r\fR\fR -.ad -.sp .6 -.RS 4n -Recursively send all descendant snapshots. This is similar to the \fB-R\fR -flag, but information about deleted and renamed datasets is not included, and -property information is only included if the \fB-p\fR flag is specified. -.RE - -.sp -.ne 2 -.na \fB\fB-p\fR\fR .ad .sp .6 diff --git a/usr/src/prototypes/README b/usr/src/prototypes/README index e622b1aeba..1ec179bb56 100644 --- a/usr/src/prototypes/README +++ b/usr/src/prototypes/README @@ -17,5 +17,5 @@ CDDL version 1.0 for each new file introduced in illumos. */ /* - * Copyright 2010 . All rights reserved. + * Copyright 2012 . All rights reserved. */ diff --git a/usr/src/prototypes/prototype.Makefile b/usr/src/prototypes/prototype.Makefile index 9539bab329..b12c91d527 100644 --- a/usr/src/prototypes/prototype.Makefile +++ b/usr/src/prototypes/prototype.Makefile @@ -10,6 +10,6 @@ # # -# Copyright 2011 . All rights reserved. +# Copyright 2012 . All rights reserved. # diff --git a/usr/src/prototypes/prototype.c b/usr/src/prototypes/prototype.c index 5154139aba..816c5475b9 100644 --- a/usr/src/prototypes/prototype.c +++ b/usr/src/prototypes/prototype.c @@ -10,7 +10,7 @@ */ /* - * Copyright 2011 . All rights reserved. + * Copyright 2012 . All rights reserved. */ /* diff --git a/usr/src/prototypes/prototype.csh b/usr/src/prototypes/prototype.csh index f1a7fc2ad9..38f17e0a09 100644 --- a/usr/src/prototypes/prototype.csh +++ b/usr/src/prototypes/prototype.csh @@ -12,6 +12,6 @@ # # -# Copyright 2011 . All rights reserved. +# Copyright 2012 . All rights reserved. # diff --git a/usr/src/prototypes/prototype.h b/usr/src/prototypes/prototype.h index 16016b2a5d..4082ec8eae 100644 --- a/usr/src/prototypes/prototype.h +++ b/usr/src/prototypes/prototype.h @@ -10,7 +10,7 @@ */ /* - * Copyright 2011 . All rights reserved. + * Copyright 2012 . All rights reserved. */ #ifndef _PROTOTYPE_H diff --git a/usr/src/prototypes/prototype.java b/usr/src/prototypes/prototype.java index 4673163b91..b9ffa24112 100644 --- a/usr/src/prototypes/prototype.java +++ b/usr/src/prototypes/prototype.java @@ -10,7 +10,7 @@ */ /* - * Copyright 2011 . All rights reserved. + * Copyright 2012 . All rights reserved. */ /* diff --git a/usr/src/prototypes/prototype.ksh b/usr/src/prototypes/prototype.ksh index 4f211f4466..44c20c48c9 100644 --- a/usr/src/prototypes/prototype.ksh +++ b/usr/src/prototypes/prototype.ksh @@ -12,6 +12,6 @@ # # -# Copyright 2011 . All rights reserved. +# Copyright 2012 . All rights reserved. # diff --git a/usr/src/prototypes/prototype.man b/usr/src/prototypes/prototype.man index b9b3db4423..4c07f19993 100644 --- a/usr/src/prototypes/prototype.man +++ b/usr/src/prototypes/prototype.man @@ -1,4 +1,3 @@ -'\" t .\" .\" This file and its contents are supplied under the terms of the .\" Common Development and Distribution License ("CDDL"), version 1.0. @@ -10,5 +9,5 @@ .\" http://www.illumos.org/license/CDDL. .\" .\" -.\" Copyright 2011 . All rights reserved. +.\" Copyright 2012 . All rights reserved. .\" diff --git a/usr/src/prototypes/prototype.mapfile-vers b/usr/src/prototypes/prototype.mapfile-vers index 3f44813564..780ef6c1ef 100644 --- a/usr/src/prototypes/prototype.mapfile-vers +++ b/usr/src/prototypes/prototype.mapfile-vers @@ -10,7 +10,7 @@ # # -# Copyright 2011 . All rights reserved. +# Copyright 2012 . All rights reserved. # # diff --git a/usr/src/prototypes/prototype.pl b/usr/src/prototypes/prototype.pl index 92ef47f3c1..53cb464b27 100644 --- a/usr/src/prototypes/prototype.pl +++ b/usr/src/prototypes/prototype.pl @@ -11,7 +11,7 @@ # # -# Copyright 2011 . All rights reserved. +# Copyright 2012 . All rights reserved. # # diff --git a/usr/src/prototypes/prototype.py b/usr/src/prototypes/prototype.py index 17edc4d88d..484eb8c9ba 100644 --- a/usr/src/prototypes/prototype.py +++ b/usr/src/prototypes/prototype.py @@ -11,7 +11,7 @@ # # -# Copyright 2011 . All rights reserved. +# Copyright 2012 . All rights reserved. # # diff --git a/usr/src/prototypes/prototype.s b/usr/src/prototypes/prototype.s index 81feaf7682..5a48f83716 100644 --- a/usr/src/prototypes/prototype.s +++ b/usr/src/prototypes/prototype.s @@ -10,7 +10,7 @@ */ /* - * Copyright 2011 . All rights reserved. + * Copyright 2012 . All rights reserved. */ .file "prototype.s" diff --git a/usr/src/prototypes/prototype.sh b/usr/src/prototypes/prototype.sh index 0b054bcb4d..9216640337 100644 --- a/usr/src/prototypes/prototype.sh +++ b/usr/src/prototypes/prototype.sh @@ -12,6 +12,6 @@ # # -# Copyright 2011 . All rights reserved. +# Copyright 2012 . All rights reserved. # diff --git a/usr/src/uts/common/fs/vfs.c b/usr/src/uts/common/fs/vfs.c index e24f2d3b32..83c53d859d 100644 --- a/usr/src/uts/common/fs/vfs.c +++ b/usr/src/uts/common/fs/vfs.c @@ -935,29 +935,33 @@ vfs_mountroot(void) } #endif /* __sparc */ - /* - * Look up the root device via devfs so that a dv_node is - * created for it. The vnode is never VN_RELE()ed. - * We allocate more than MAXPATHLEN so that the - * buffer passed to i_ddi_prompath_to_devfspath() is - * exactly MAXPATHLEN (the function expects a buffer - * of that length). - */ - plen = strlen("/devices"); - path = kmem_alloc(plen + MAXPATHLEN, KM_SLEEP); - (void) strcpy(path, "/devices"); + if (strcmp(rootfs.bo_fstype, "zfs") != 0) { + /* + * Look up the root device via devfs so that a dv_node is + * created for it. The vnode is never VN_RELE()ed. + * We allocate more than MAXPATHLEN so that the + * buffer passed to i_ddi_prompath_to_devfspath() is + * exactly MAXPATHLEN (the function expects a buffer + * of that length). + */ + plen = strlen("/devices"); + path = kmem_alloc(plen + MAXPATHLEN, KM_SLEEP); + (void) strcpy(path, "/devices"); - if (i_ddi_prompath_to_devfspath(rootfs.bo_name, path + plen) - != DDI_SUCCESS || - lookupname(path, UIO_SYSSPACE, FOLLOW, NULLVPP, &rvp)) { + if (i_ddi_prompath_to_devfspath(rootfs.bo_name, path + plen) + != DDI_SUCCESS || + lookupname(path, UIO_SYSSPACE, FOLLOW, NULLVPP, &rvp)) { - /* NUL terminate in case "path" has garbage */ - path[plen + MAXPATHLEN - 1] = '\0'; + /* NUL terminate in case "path" has garbage */ + path[plen + MAXPATHLEN - 1] = '\0'; #ifdef DEBUG - cmn_err(CE_WARN, "!Cannot lookup root device: %s", path); + cmn_err(CE_WARN, "!Cannot lookup root device: %s", + path); #endif + } + kmem_free(path, plen + MAXPATHLEN); } - kmem_free(path, plen + MAXPATHLEN); + vfs_mnttabvp_setup(); } -- 2.11.4.GIT