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

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-09-19 14:23:02 +0000 (Fri, 19 Sep 2014)
New Revision: 5545

Added:
   trunk/zfsutils/debian/patches/bug762199.patch
Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/patches/series
Log:
bug762199.patch: st_size is only meaningful for regular files;
existing code did not detect any zpools for import (Closes: #762199)


Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2014-09-19 14:20:56 UTC (rev 5544)
+++ trunk/zfsutils/debian/changelog	2014-09-19 14:23:02 UTC (rev 5545)
@@ -1,3 +1,11 @@
+zfsutils (10.1~svn271683-3) UNRELEASED; urgency=medium
+
+  [ Steven Chamberlain ]
+  * bug762199.patch: st_size is only meaningful for regular files;
+    existing code did not detect any zpools for import (Closes: #762199)
+
+ -- GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>  Fri, 19 Sep 2014 15:21:25 +0100
+
 zfsutils (10.1~svn271683-1) experimental; urgency=low
 
   [ Robert Millan ]

Added: trunk/zfsutils/debian/patches/bug762199.patch
===================================================================
--- trunk/zfsutils/debian/patches/bug762199.patch	                        (rev 0)
+++ trunk/zfsutils/debian/patches/bug762199.patch	2014-09-19 14:23:02 UTC (rev 5545)
@@ -0,0 +1,34 @@
+From: Steven Chamberlain <steven at pyro.eu.org>
+Subject: st_size is only meaningful for regular files
+Bug-Debian: http://bugs.debian.org/762199
+Forwarded: no
+
+--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
++++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
+@@ -1063,23 +1063,19 @@
+ 		return;
+ 	}
+ 	/* this file is too small to hold a zpool */
+-#ifdef sun
+ 	if (S_ISREG(statbuf.st_mode) &&
+ 	    statbuf.st_size < SPA_MINDEVSIZE) {
+ 		(void) close(fd);
+ 		return;
+-	} else if (!S_ISREG(statbuf.st_mode)) {
++	}
++#ifdef sun
++	if (!S_ISREG(statbuf.st_mode)) {
+ 		/*
+ 		 * Try to read the disk label first so we don't have to
+ 		 * open a bunch of minor nodes that can't have a zpool.
+ 		 */
+ 		check_slices(rn->rn_avl, fd, rn->rn_name);
+ 	}
+-#else	/* !sun */
+-	if (statbuf.st_size < SPA_MINDEVSIZE) {
+-		(void) close(fd);
+-		return;
+-	}
+ #endif	/* sun */
+ 
+ 	if ((zpool_read_label(fd, &config)) != 0) {

Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series	2014-09-19 14:20:56 UTC (rev 5544)
+++ trunk/zfsutils/debian/patches/series	2014-09-19 14:23:02 UTC (rev 5545)
@@ -19,3 +19,4 @@
 makefile.diff
 missing_includes.diff
 match_glibc_idtype.diff
+bug762199.patch