diff options
Diffstat (limited to 'usr/src/uts/sparc/os')
| -rw-r--r-- | usr/src/uts/sparc/os/cpr_sparc.c | 20 | ||||
| -rw-r--r-- | usr/src/uts/sparc/os/minor_perm | 2 | ||||
| -rw-r--r-- | usr/src/uts/sparc/os/name_to_major | 1 |
3 files changed, 13 insertions, 10 deletions
diff --git a/usr/src/uts/sparc/os/cpr_sparc.c b/usr/src/uts/sparc/os/cpr_sparc.c index e9b802b5be..ebc452b8fe 100644 --- a/usr/src/uts/sparc/os/cpr_sparc.c +++ b/usr/src/uts/sparc/os/cpr_sparc.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -67,13 +67,13 @@ static cdef_t orig_def_info = { static char *cpr_next_component(char **); static char *cpr_get_prefix(char *); -static char *cpr_build_nodename(dnode_t); +static char *cpr_build_nodename(pnode_t); static void cpr_abbreviate_devpath(char *, char *); static int cpr_show_props = 0; static int -cpr_get_options_node(dnode_t *nodep) +cpr_get_options_node(pnode_t *nodep) { *nodep = prom_optionsnode(); if (*nodep == OBP_NONODE || *nodep == OBP_BADNODE) { @@ -93,7 +93,7 @@ static int cpr_get_bool_prop(char *name, int *result) { char value[PROP_BOOL_LEN]; - dnode_t node; + pnode_t node; int len, err; if (err = cpr_get_options_node(&node)) @@ -116,7 +116,7 @@ int cpr_update_nvram(cprop_t *props) { cprop_t *tail; - dnode_t node; + pnode_t node; int len, rc; if (rc = cpr_get_options_node(&node)) @@ -258,7 +258,7 @@ cpr_default_setup(int alloc) { cprop_t *orig, *new, *tail; int len, err = 0; - dnode_t node; + pnode_t node; char *fmt; if (alloc == 0) { @@ -348,7 +348,7 @@ cpr_spinning_bar(void) static void cpr_abbreviate_devpath(char *in_path, char *out_path) { - static dnode_t cur_node; + static pnode_t cur_node; char *position = in_path + 1; /* Skip the leading slash. */ char *cmpt; @@ -356,8 +356,8 @@ cpr_abbreviate_devpath(char *in_path, char *out_path) *out_path = '\0'; while ((cmpt = cpr_next_component(&position)) != NULL) { - dnode_t long_match = NULL; - dnode_t short_match = NULL; + pnode_t long_match = NULL; + pnode_t short_match = NULL; int short_hits = 0; char *name; char *prefix = cpr_get_prefix(cmpt); @@ -461,7 +461,7 @@ cpr_get_prefix(char *cmpt) * from the first two (binary) words of the "reg" property. */ static char * -cpr_build_nodename(dnode_t node) +cpr_build_nodename(pnode_t node) { static char name[OBP_MAXPATHLEN]; int reg[512]; diff --git a/usr/src/uts/sparc/os/minor_perm b/usr/src/uts/sparc/os/minor_perm index 587b0cfc4e..e46f3718ff 100644 --- a/usr/src/uts/sparc/os/minor_perm +++ b/usr/src/uts/sparc/os/minor_perm @@ -162,3 +162,5 @@ mdesc:* 0666 root sys dld:* 0666 root sys aggr:* 0666 root sys ntwdt:* 0644 root sys +zfs:* 0600 root sys +zfs:zfs 0666 root sys diff --git a/usr/src/uts/sparc/os/name_to_major b/usr/src/uts/sparc/os/name_to_major index 5ac6715971..277aeff8ef 100644 --- a/usr/src/uts/sparc/os/name_to_major +++ b/usr/src/uts/sparc/os/name_to_major @@ -200,3 +200,4 @@ mi2cv 249 todds1337 250 pic16f747 251 mdesc 252 +zfs 253 |