[Glibc-bsd-commits] r2345 - in trunk/kfreebsd-7/debian: . patches

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2009-01-11 10:11:24 +0000 (Sun, 11 Jan 2009)
New Revision: 2345

Added:
   trunk/kfreebsd-7/debian/patches/000_ext2fs.diff
Modified:
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/patches/series
Log:
* add  000_ext2fs.diff - stop hangs during access to ext2fs



Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2009-01-10 21:49:02 UTC (rev 2344)
+++ trunk/kfreebsd-7/debian/changelog	2009-01-11 10:11:24 UTC (rev 2345)
@@ -1,3 +1,11 @@
+kfreebsd-7 (7.1-2) UNSTABLE; urgency=low
+
+  [ Petr Salinger ]
+  * 000_ext2fs.diff: upstream patch to not incorrectly add the low 5 bits
+    of the offset to the resulting position of the found zero bit.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 11 Jan 2009 13:41:57 +0100
+
 kfreebsd-7 (7.1-1) unstable; urgency=low
 
   [ Petr Salinger ]

Added: trunk/kfreebsd-7/debian/patches/000_ext2fs.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/000_ext2fs.diff	                        (rev 0)
+++ trunk/kfreebsd-7/debian/patches/000_ext2fs.diff	2009-01-11 10:11:24 UTC (rev 2345)
@@ -0,0 +1,13 @@
+upstream head revision 186740
+
+--- head/sys/gnu/fs/ext2fs/ext2_bitops.h
++++ head/sys/gnu/fs/ext2fs/ext2_bitops.h
+@@ -84,7 +84,7 @@
+ 		mask = ~0U << (ofs & 31);
+ 		bit = *p | ~mask;
+ 		if (bit != ~0U)
+-			return (ffs(~bit) + ofs - 1);
++			return (ffs(~bit) + (ofs & ~31U) - 1);
+ 		p++;
+ 		ofs = (ofs + 31U) & ~31U;
+ 	}

Modified: trunk/kfreebsd-7/debian/patches/series
===================================================================
--- trunk/kfreebsd-7/debian/patches/series	2009-01-10 21:49:02 UTC (rev 2344)
+++ trunk/kfreebsd-7/debian/patches/series	2009-01-11 10:11:24 UTC (rev 2345)
@@ -1,3 +1,4 @@
+000_ext2fs.diff
 001_misc.diff
 003_glibc_dev_aicasm.diff
 004_xargs.diff