summaryrefslogtreecommitdiff
path: root/usr/src/lib/libdiskmgt/common/entry.c
diff options
context:
space:
mode:
authormmusante <none@none>2007-03-01 06:09:49 -0800
committermmusante <none@none>2007-03-01 06:09:49 -0800
commit46657f8d750bdb71753495ce2919170f126b8e34 (patch)
tree37c4c3f3b39f8024dc8d1a42ea0f7a8f9b7b838e /usr/src/lib/libdiskmgt/common/entry.c
parented19839e9b6280e7c496bbf23396ad0adb5a6ca7 (diff)
downloadillumos-joyent-46657f8d750bdb71753495ce2919170f126b8e34.tar.gz
6441384 zpool import action message is not correctly localized
6473418 setting user defined property on full filesystem should report error 6513953 Unable to create global hotspare in ja locale
Diffstat (limited to 'usr/src/lib/libdiskmgt/common/entry.c')
-rw-r--r--usr/src/lib/libdiskmgt/common/entry.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/usr/src/lib/libdiskmgt/common/entry.c b/usr/src/lib/libdiskmgt/common/entry.c
index 61bc9d60d4..a123a586f5 100644
--- a/usr/src/lib/libdiskmgt/common/entry.c
+++ b/usr/src/lib/libdiskmgt/common/entry.c
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -743,7 +743,6 @@ dm_inuse(char *dev_name, char **msg, dm_who_type_t who, int *errp)
int found = 0;
char *dname = NULL;
-
*errp = 0;
*msg = NULL;
@@ -892,6 +891,16 @@ dm_inuse(char *dev_name, char **msg, dm_who_type_t who, int *errp)
}
break;
+ case DM_WHO_ZPOOL_SPARE:
+ if (strcmp(by, DM_USE_SPARE_ZPOOL) != 0) {
+ if (build_usage_string(dname, by,
+ data, msg, &found, errp) != 0) {
+ if (*errp)
+ goto out;
+ }
+ }
+ break;
+
default:
/*
* nothing found in use for this client