Mercurial > illumos > illumos-gate
changeset 13832:8e4bcbc31a4a
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 <josh@sysmgr.org>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Dan McDonald <danmcd@nexenta.com>
author | Yuri Pankov <yuri.pankov@nexenta.com> |
---|---|
date | Fri, 21 Sep 2012 06:38:43 +0400 |
parents | df991d875843 |
children | 6bef548f1800 |
files | README usr/src/cmd/date/date.c usr/src/cmd/power/powerd.c usr/src/cmd/zfs/zfs_main.c usr/src/man/man1m/zfs.1m usr/src/prototypes/README usr/src/prototypes/prototype.Makefile usr/src/prototypes/prototype.c usr/src/prototypes/prototype.csh usr/src/prototypes/prototype.h usr/src/prototypes/prototype.java usr/src/prototypes/prototype.ksh usr/src/prototypes/prototype.man usr/src/prototypes/prototype.mapfile-vers usr/src/prototypes/prototype.pl usr/src/prototypes/prototype.py usr/src/prototypes/prototype.s usr/src/prototypes/prototype.sh usr/src/uts/common/fs/vfs.c |
diffstat | 19 files changed, 61 insertions(+), 72 deletions(-) [+] |
line wrap: on
line diff
--- a/README Thu Sep 20 22:14:11 2012 -0400 +++ b/README Fri Sep 21 06:38:43 2012 +0400 @@ -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 @@ 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 @@ 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 <frodo.baggins@underhill.net> + Reviewed by: Legolas <elf-coder@mirkwood.org> + Approved by: Gandalf The Grey <rti-advocate@white-council.com> 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. +RTI Advocates: advocates@lists.illumos.org +Developer Council: developer-council@lists.illumos.org -Gatekeeper: garrett@nexenta.com (Interim) -IRC channel: #illumos on irc.freenode.net -Mailing list: developer@lists.illumos.org - +IRC channel: #illumos on irc.freenode.net +Mailing list: developer@lists.illumos.org
--- a/usr/src/cmd/date/date.c Thu Sep 20 22:14:11 2012 -0400 +++ b/usr/src/cmd/date/date.c Fri Sep 21 06:38:43 2012 +0400 @@ -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 @@ {"", "", 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;
--- a/usr/src/cmd/power/powerd.c Thu Sep 20 22:14:11 2012 -0400 +++ b/usr/src/cmd/power/powerd.c Fri Sep 21 06:38:43 2012 +0400 @@ -399,7 +399,6 @@ 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
--- a/usr/src/cmd/zfs/zfs_main.c Thu Sep 20 22:14:11 2012 -0400 +++ b/usr/src/cmd/zfs/zfs_main.c Fri Sep 21 06:38:43 2012 +0400 @@ -252,7 +252,7 @@ case HELP_ROLLBACK: return (gettext("\trollback [-rRf] <snapshot>\n")); case HELP_SEND: - return (gettext("\tsend [-DnPpRrv] [-[iI] snapshot] " + return (gettext("\tsend [-DnPpRv] [-[iI] snapshot] " "<snapshot>\n")); case HELP_SET: return (gettext("\tset <property=value> "
--- a/usr/src/man/man1m/zfs.1m Thu Sep 20 22:14:11 2012 -0400 +++ b/usr/src/man/man1m/zfs.1m Fri Sep 21 06:38:43 2012 +0400 @@ -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 @@ .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 @@ .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 @@ .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
--- a/usr/src/prototypes/README Thu Sep 20 22:14:11 2012 -0400 +++ b/usr/src/prototypes/README Fri Sep 21 06:38:43 2012 +0400 @@ -17,5 +17,5 @@ */ /* - * Copyright 2010 <contributor>. All rights reserved. + * Copyright 2012 <contributor>. All rights reserved. */
--- a/usr/src/prototypes/prototype.Makefile Thu Sep 20 22:14:11 2012 -0400 +++ b/usr/src/prototypes/prototype.Makefile Fri Sep 21 06:38:43 2012 +0400 @@ -10,6 +10,6 @@ # # -# Copyright 2011 <contributor>. All rights reserved. +# Copyright 2012 <contributor>. All rights reserved. #
--- a/usr/src/prototypes/prototype.c Thu Sep 20 22:14:11 2012 -0400 +++ b/usr/src/prototypes/prototype.c Fri Sep 21 06:38:43 2012 +0400 @@ -10,7 +10,7 @@ */ /* - * Copyright 2011 <contributor>. All rights reserved. + * Copyright 2012 <contributor>. All rights reserved. */ /*
--- a/usr/src/prototypes/prototype.csh Thu Sep 20 22:14:11 2012 -0400 +++ b/usr/src/prototypes/prototype.csh Fri Sep 21 06:38:43 2012 +0400 @@ -12,6 +12,6 @@ # # -# Copyright 2011 <contributor>. All rights reserved. +# Copyright 2012 <contributor>. All rights reserved. #
--- a/usr/src/prototypes/prototype.h Thu Sep 20 22:14:11 2012 -0400 +++ b/usr/src/prototypes/prototype.h Fri Sep 21 06:38:43 2012 +0400 @@ -10,7 +10,7 @@ */ /* - * Copyright 2011 <contributor>. All rights reserved. + * Copyright 2012 <contributor>. All rights reserved. */ #ifndef _PROTOTYPE_H
--- a/usr/src/prototypes/prototype.java Thu Sep 20 22:14:11 2012 -0400 +++ b/usr/src/prototypes/prototype.java Fri Sep 21 06:38:43 2012 +0400 @@ -10,7 +10,7 @@ */ /* - * Copyright 2011 <contributor>. All rights reserved. + * Copyright 2012 <contributor>. All rights reserved. */ /*
--- a/usr/src/prototypes/prototype.ksh Thu Sep 20 22:14:11 2012 -0400 +++ b/usr/src/prototypes/prototype.ksh Fri Sep 21 06:38:43 2012 +0400 @@ -12,6 +12,6 @@ # # -# Copyright 2011 <contributor>. All rights reserved. +# Copyright 2012 <contributor>. All rights reserved. #
--- a/usr/src/prototypes/prototype.man Thu Sep 20 22:14:11 2012 -0400 +++ b/usr/src/prototypes/prototype.man Fri Sep 21 06:38:43 2012 +0400 @@ -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 <contributor>. All rights reserved. +.\" Copyright 2012 <contributor>. All rights reserved. .\"
--- a/usr/src/prototypes/prototype.mapfile-vers Thu Sep 20 22:14:11 2012 -0400 +++ b/usr/src/prototypes/prototype.mapfile-vers Fri Sep 21 06:38:43 2012 +0400 @@ -10,7 +10,7 @@ # # -# Copyright 2011 <contributor>. All rights reserved. +# Copyright 2012 <contributor>. All rights reserved. # #
--- a/usr/src/prototypes/prototype.pl Thu Sep 20 22:14:11 2012 -0400 +++ b/usr/src/prototypes/prototype.pl Fri Sep 21 06:38:43 2012 +0400 @@ -11,7 +11,7 @@ # # -# Copyright 2011 <contributor>. All rights reserved. +# Copyright 2012 <contributor>. All rights reserved. # #
--- a/usr/src/prototypes/prototype.py Thu Sep 20 22:14:11 2012 -0400 +++ b/usr/src/prototypes/prototype.py Fri Sep 21 06:38:43 2012 +0400 @@ -11,7 +11,7 @@ # # -# Copyright 2011 <contributor>. All rights reserved. +# Copyright 2012 <contributor>. All rights reserved. # #
--- a/usr/src/prototypes/prototype.s Thu Sep 20 22:14:11 2012 -0400 +++ b/usr/src/prototypes/prototype.s Fri Sep 21 06:38:43 2012 +0400 @@ -10,7 +10,7 @@ */ /* - * Copyright 2011 <contributor>. All rights reserved. + * Copyright 2012 <contributor>. All rights reserved. */ .file "prototype.s"
--- a/usr/src/prototypes/prototype.sh Thu Sep 20 22:14:11 2012 -0400 +++ b/usr/src/prototypes/prototype.sh Fri Sep 21 06:38:43 2012 +0400 @@ -12,6 +12,6 @@ # # -# Copyright 2011 <contributor>. All rights reserved. +# Copyright 2012 <contributor>. All rights reserved. #
--- a/usr/src/uts/common/fs/vfs.c Thu Sep 20 22:14:11 2012 -0400 +++ b/usr/src/uts/common/fs/vfs.c Fri Sep 21 06:38:43 2012 +0400 @@ -935,29 +935,33 @@ } #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 (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'; + 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)) { + + /* 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(); }