[Glibc-bsd-commits] r5392 - in branches/wheezy/kfreebsd-9/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-26 13:17:24 +0000 (Sun, 26 Jan 2014)
New Revision: 5392

Added:
   branches/wheezy/kfreebsd-9/debian/patches/fix_lseek_zfs.diff
Modified:
   branches/wheezy/kfreebsd-9/debian/changelog
   branches/wheezy/kfreebsd-9/debian/patches/series
Log:
Fix lseek ENXIO error condition with ZFS. (Closes: #736198)

Modified: branches/wheezy/kfreebsd-9/debian/changelog
===================================================================
--- branches/wheezy/kfreebsd-9/debian/changelog	2014-01-26 13:10:36 UTC (rev 5391)
+++ branches/wheezy/kfreebsd-9/debian/changelog	2014-01-26 13:17:24 UTC (rev 5392)
@@ -4,8 +4,9 @@
     sysctl to re-enable (but read about the security implications
     first). (Closes: #735448)
   * Apply upstream EN-14_02.mmap patch.
+  * Fix lseek ENXIO error condition with ZFS. (Closes: #736198)
 
- -- Robert Millan <rmh at debian.org>  Tue, 21 Jan 2014 12:26:33 +0100
+ -- Robert Millan <rmh at debian.org>  Wed, 22 Jan 2014 23:18:51 +0100
 
 kfreebsd-9 (9.0-10+deb70.5) stable; urgency=low
 

Added: branches/wheezy/kfreebsd-9/debian/patches/fix_lseek_zfs.diff
===================================================================
--- branches/wheezy/kfreebsd-9/debian/patches/fix_lseek_zfs.diff	                        (rev 0)
+++ branches/wheezy/kfreebsd-9/debian/patches/fix_lseek_zfs.diff	2014-01-26 13:17:24 UTC (rev 5392)
@@ -0,0 +1,34 @@
+
+http://www.freebsd.org/cgi/query-pr.cgi?pr=164445
+
+http://svn.freebsd.org/changeset/base/233918
+
+--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
++++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
+@@ -293,9 +293,12 @@
+ 
+ 	case _FIO_SEEK_DATA:
+ 	case _FIO_SEEK_HOLE:
++#ifdef sun
+ 		if (ddi_copyin((void *)data, &off, sizeof (off), flag))
+ 			return (EFAULT);
+-
++#else
++		off = *(offset_t *)data;
++#endif
+ 		zp = VTOZ(vp);
+ 		zfsvfs = zp->z_zfsvfs;
+ 		ZFS_ENTER(zfsvfs);
+@@ -306,8 +309,12 @@
+ 		ZFS_EXIT(zfsvfs);
+ 		if (error)
+ 			return (error);
++#ifdef sun
+ 		if (ddi_copyout(&off, (void *)data, sizeof (off), flag))
+ 			return (EFAULT);
++#else
++		*(offset_t *)data = off;
++#endif
+ 		return (0);
+ 	}
+ 	return (ENOTTY);

Modified: branches/wheezy/kfreebsd-9/debian/patches/series
===================================================================
--- branches/wheezy/kfreebsd-9/debian/patches/series	2014-01-26 13:10:36 UTC (rev 5391)
+++ branches/wheezy/kfreebsd-9/debian/patches/series	2014-01-26 13:17:24 UTC (rev 5392)
@@ -16,9 +16,10 @@
 SA-13_12.ifioctl.diff
 SA-13_13.nullfs.diff
 disable_via_rng.diff
+EN-14_02.mmap.patch
+fix_lseek_zfs.diff
 
 # Other patches that might or might not be mergeable
-EN-14_02.mmap.patch
 001_misc.diff
 002_maxpathlen.diff
 003_glibc_dev_aicasm.diff