[Glibc-bsd-commits] r5548 - in trunk/zfsutils/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-09-19 22:33:54 +0000 (Fri, 19 Sep 2014)
New Revision: 5548

Added:
   trunk/zfsutils/debian/patches/bug653929.diff
Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/patches/series
Log:
Fix display of RAID-Z devices in "zpool status" (Thanks, Jeff Epler!
Closes: #653929)


Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2014-09-19 19:21:59 UTC (rev 5547)
+++ trunk/zfsutils/debian/changelog	2014-09-19 22:33:54 UTC (rev 5548)
@@ -7,6 +7,8 @@
     libutil.h;  not needed and caused FTBFS on kfreebsd-i386 only
   * Bump minimum GRUB version to 2.02~beta2-11 for lz4_compress support;
     enabled by default for metadata (but not file contents, yet)
+  * Fix display of RAID-Z devices in "zpool status" (Thanks, Jeff Epler!
+    Closes: #653929)
 
  -- GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>  Fri, 19 Sep 2014 15:21:25 +0100
 

Added: trunk/zfsutils/debian/patches/bug653929.diff
===================================================================
--- trunk/zfsutils/debian/patches/bug653929.diff	                        (rev 0)
+++ trunk/zfsutils/debian/patches/bug653929.diff	2014-09-19 22:33:54 UTC (rev 5548)
@@ -0,0 +1,34 @@
+From: Jeff Epler <jepler at unpythonic.net>
+Subject: `zpool status` incorrectly names raidz vdevs
+Forwarded: no
+
+A minimal version of Jeff Epler's original patch, based on a
+similar fix in ZFS-on-Linux.
+
+In the RAID-Z case, path = buf already, so snprintf src and dst
+buffers would be the same, which doesn't work with GNU libc.  Use
+another buffer instead.
+
+--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
++++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
+@@ -3404,7 +3404,7 @@
+ {
+ 	char *path, *devid;
+ 	uint64_t value;
+-	char buf[64];
++	char buf[64], buf2[64];
+ 	vdev_stat_t *vs;
+ 	uint_t vsc;
+ 	int have_stats;
+@@ -3516,9 +3516,9 @@
+ 
+ 			verify(nvlist_lookup_uint64(nv, ZPOOL_CONFIG_ID,
+ 			    &id) == 0);
+-			(void) snprintf(buf, sizeof (buf), "%s-%llu", path,
++			(void) snprintf(buf2, sizeof (buf2), "%s-%llu", path,
+ 			    (u_longlong_t)id);
+-			path = buf;
++			path = buf2;
+ 		}
+ 	}
+ 

Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series	2014-09-19 19:21:59 UTC (rev 5547)
+++ trunk/zfsutils/debian/patches/series	2014-09-19 22:33:54 UTC (rev 5548)
@@ -20,3 +20,4 @@
 missing_includes.diff
 match_glibc_idtype.diff
 bug762199.patch
+bug653929.diff