diff options
| -rw-r--r-- | usr/src/cmd/devfsadm/devfsadm.c | 4 | ||||
| -rw-r--r-- | usr/src/lib/libpcp/common/pcp_utils.c | 14 |
2 files changed, 5 insertions, 13 deletions
diff --git a/usr/src/cmd/devfsadm/devfsadm.c b/usr/src/cmd/devfsadm/devfsadm.c index 4fcd9e2e3d..662f5de021 100644 --- a/usr/src/cmd/devfsadm/devfsadm.c +++ b/usr/src/cmd/devfsadm/devfsadm.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -8587,7 +8587,7 @@ devname_lookup_handler(void *cookie, char *argp, size_t arg_size, dci.dci_flags |= DCA_FLUSH_PATHINST; pre_and_post_cleanup(RM_PRE); - devi_tree_walk(&dci, DINFOFORCE|DI_CACHE_SNAPSHOT_FLAGS, NULL); + devi_tree_walk(&dci, DI_CACHE_SNAPSHOT_FLAGS, NULL); error = (int32_t)dci.dci_error; if (!error) { pre_and_post_cleanup(RM_POST); diff --git a/usr/src/lib/libpcp/common/pcp_utils.c b/usr/src/lib/libpcp/common/pcp_utils.c index 27fabc96f8..9f0ea1045e 100644 --- a/usr/src/lib/libpcp/common/pcp_utils.c +++ b/usr/src/lib/libpcp/common/pcp_utils.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -31,8 +31,6 @@ * to platforms running Logical Domains (LDoms). */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> @@ -233,10 +231,7 @@ svc_name_to_glvc_dev_path(char *service) return (NULL); /* Ensure that the 'glvc' driver is loaded */ - (void) di_init_driver("glvc", DI_CACHE_SNAPSHOT_FLAGS | DINFOFORCE); - - /* Get device node */ - root_node = di_init("/", DINFOCPYALL); + root_node = di_init_driver("glvc", DINFOCPYALL); if (root_node == DI_NODE_NIL) { return (dev_path); } @@ -290,10 +285,7 @@ svc_name_to_vldc_dev_path(char *service) char *dev_path = NULL; /* Ensure that the 'vldc' driver is loaded */ - (void) di_init_driver("vldc", DI_CACHE_SNAPSHOT_FLAGS | DINFOFORCE); - - /* Get device node */ - root_node = di_init("/", DINFOCPYALL); + root_node = di_init_driver("vldc", DINFOCPYALL); if (root_node == DI_NODE_NIL) { return (dev_path); } |