r1304 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches

[Christoph Hellwig]

Author: hch-guest
Date: 2004-08-25 04:20:59 -0600 (Wed, 25 Aug 2004)
New Revision: 1304

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/minix-block-accounting-fix.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-3
Log:

  * Add minix block accounting fix (Christoph Hellwig).



Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-25 10:18:06 UTC (rev 1303)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-25 10:20:59 UTC (rev 1304)
@@ -34,6 +34,8 @@
 
   * Update CCISS driver (Christoph Hellwig).
 
+  * Add minix block accounting fix (Christoph Hellwig).
+
  -- Andres Salomon <dilinger@voxel.net>  Wed, 18 Aug 2004 02:13:56 -0400
 
 kernel-source-2.6.8 (2.6.8-2) unstable; urgency=high

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-3
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-3	2004-08-25 10:18:06 UTC (rev 1303)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-3	2004-08-25 10:20:59 UTC (rev 1304)
@@ -39,3 +39,4 @@
 net-sched-fix
 drivers-scsi-sym_2-dv-hang
 cciss-update
+minix-block-accounting-fix

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/minix-block-accounting-fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/minix-block-accounting-fix.dpatch	2004-08-25 10:18:06 UTC (rev 1303)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/minix-block-accounting-fix.dpatch	2004-08-25 10:20:59 UTC (rev 1304)
@@ -0,0 +1,39 @@
+#! /bin/sh -e 
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH] minix block usage counting fix
+## DP: Patch author: Andries Brouwer <Andries.Brouwer@cwi.nl>
+## DP: Upstream status: backport
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/08/22 14:07:46-07:00 Andries.Brouwer@cwi.nl 
+#   [PATCH] minix block usage counting fix
+#   
+#   In 2.5.18 some minix-specific stuff was moved to the minix subdirectory
+#   where it belonged.  However, a typo crept in, causing inode disk usage
+#   to be incorrectly reported.  A few people have complained, but so far
+#   not sufficiently loudly.
+#   
+#   Signed-off-by: Andries Brouwer <Andries.Brouwer@cwi.nl>
+#   Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+# 
+# fs/minix/itree_common.c
+#   2004/08/20 14:02:26-07:00 Andries.Brouwer@cwi.nl +1 -1
+#   minix block usage counting fix
+# 
+diff -Nru a/fs/minix/itree_common.c b/fs/minix/itree_common.c
+--- a/fs/minix/itree_common.c	2004-08-25 12:21:07 +02:00
++++ b/fs/minix/itree_common.c	2004-08-25 12:21:07 +02:00
+@@ -358,5 +358,5 @@
+ 		res += blocks;
+ 		direct = 1;
+ 	}
+-	return blocks;
++	return res;
+ }