From 858219cc4e44aea8373c56a94380f5be53026b38 Mon Sep 17 00:00:00 2001 From: Ned Bass Date: Wed, 22 Sep 2010 18:53:59 -0700 Subject: [PATCH] Fix missing vdev names in zpool status output Top-level vdev names in zpool status output should follow a naming convention. In the case of raidz devices, the type portion of the name was missing. This commit fixes a bug in zpool_vdev_name() where in this snprintf call (void) snprintf(buf, sizeof (buf), "%s-%llu", path, (u_longlong_t)id); buf and path may point to the same location. The result is that buf ends up containing only the "-id" part. This only occurred for raidz devices because the code for appending the parity level to the type string stored its result in buf then set path to point there. To fix this we allocate a new temporary buffer on the stack instead of reusing buf. Signed-off-by: Brian Behlendorf Closes #57 --- lib/libzfs/libzfs_pool.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/libzfs/libzfs_pool.c b/lib/libzfs/libzfs_pool.c index ec27b57568..cd0317256d 100644 --- a/lib/libzfs/libzfs_pool.c +++ b/lib/libzfs/libzfs_pool.c @@ -3047,6 +3047,8 @@ set_path(zpool_handle_t *zhp, nvlist_t *nv, const char *path) (void) ioctl(zhp->zpool_hdl->libzfs_fd, ZFS_IOC_VDEV_SETPATH, &zc); } +#define PATH_BUF_LEN 64 + /* * Given a vdev, return the name to display in iostat. If the vdev has a path, * we use that, stripping off any leading "/dev/dsk/"; if not, we use the type. @@ -3068,7 +3070,7 @@ zpool_vdev_name(libzfs_handle_t *hdl, zpool_handle_t *zhp, nvlist_t *nv, { char *path, *devid, *type; uint64_t value; - char buf[64]; + char buf[PATH_BUF_LEN]; vdev_stat_t *vs; uint_t vsc; @@ -3160,11 +3162,13 @@ 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) { + char tmpbuf[PATH_BUF_LEN]; + verify(nvlist_lookup_uint64(nv, ZPOOL_CONFIG_NPARITY, &value) == 0); - (void) snprintf(buf, sizeof (buf), "%s%llu", path, + (void) snprintf(tmpbuf, sizeof (tmpbuf), "%s%llu", path, (u_longlong_t)value); - path = buf; + path = tmpbuf; } /*