git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix missing vdev names in zpool status output
[zfs.git]
/
lib
/
libzfs
/
libzfs_pool.c
diff --git
a/lib/libzfs/libzfs_pool.c
b/lib/libzfs/libzfs_pool.c
index
68bfdee
..
f61e6cf
100644
(file)
--- a/
lib/libzfs/libzfs_pool.c
+++ b/
lib/libzfs/libzfs_pool.c
@@
-3134,6
+3134,7
@@
zpool_vdev_name(libzfs_handle_t *hdl, zpool_handle_t *zhp, nvlist_t *nv,
char *path, *devid, *type;
uint64_t value;
char buf[PATH_BUF_LEN];
char *path, *devid, *type;
uint64_t value;
char buf[PATH_BUF_LEN];
+ char tmpbuf[PATH_BUF_LEN];
vdev_stat_t *vs;
uint_t vsc;
vdev_stat_t *vs;
uint_t vsc;
@@
-3206,13
+3207,12
@@
zpool_vdev_name(libzfs_handle_t *hdl, zpool_handle_t *zhp, nvlist_t *nv,
* If it's a raidz device, we need to stick in the parity level.
*/
if (strcmp(path, VDEV_TYPE_RAIDZ) == 0) {
* If it's a raidz device, we need to stick in the parity level.
*/
if (strcmp(path, VDEV_TYPE_RAIDZ) == 0) {
- char tmpbuf[PATH_BUF_LEN];
verify(nvlist_lookup_uint64(nv, ZPOOL_CONFIG_NPARITY,
&value) == 0);
verify(nvlist_lookup_uint64(nv, ZPOOL_CONFIG_NPARITY,
&value) == 0);
- (void) snprintf(
tmpbuf, sizeof (tmp
buf), "%s%llu", path,
+ (void) snprintf(
buf, sizeof (
buf), "%s%llu", path,
(u_longlong_t)value);
(u_longlong_t)value);
- path =
tmp
buf;
+ path = buf;
}
/*
}
/*
@@
-3224,9
+3224,9
@@
zpool_vdev_name(libzfs_handle_t *hdl, zpool_handle_t *zhp, nvlist_t *nv,
verify(nvlist_lookup_uint64(nv, ZPOOL_CONFIG_ID,
&id) == 0);
verify(nvlist_lookup_uint64(nv, ZPOOL_CONFIG_ID,
&id) == 0);
- (void) snprintf(
buf, sizeof (buf), "%s-%llu", path
,
- (u_longlong_t)id);
- path = buf;
+ (void) snprintf(
tmpbuf, sizeof (tmpbuf), "%s-%llu"
,
+
path,
(u_longlong_t)id);
+ path =
tmp
buf;
}
}
}
}