r1480 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

hch-guest@haydn.debian.org hch-guest@haydn.debian.org
Sun, 29 Aug 2004 15:16:57 -0600


Author: hch-guest
Date: 2004-08-29 15:15:19 -0600 (Sun, 29 Aug 2004)
New Revision: 1480

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/hfs-loop-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/series/2.6.8-6
Log:

  * Fix loop on hfs/hfsplus (closes: #261195) (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-29 21:12:19 UTC (rev 1479)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-29 21:15:19 UTC (rev 1480)
@@ -18,6 +18,8 @@
 
   * Fix devfs name for microcode driver (closes: #221813) (Christoph Hellwig).
 
+  * Fix loop on hfs/hfsplus (closes: #261195) (Christoph Hellwig).
+
  -- 
 
 kernel-source-2.6.8 (2.6.8-5) unstable; urgency=high

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/hfs-loop-fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/hfs-loop-fix.dpatch	2004-08-29 21:12:19 UTC (rev 1479)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/hfs-loop-fix.dpatch	2004-08-29 21:15:19 UTC (rev 1480)
@@ -0,0 +1,30 @@
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Add .sendfile method to hfs/hfsplus (needed by loop driver)
+## DP: Patch author: Christoph Hellwig
+## DP: Upstream status: submitted
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+--- 1.16/fs/hfs/inode.c	2004-05-25 11:53:05 +02:00
++++ edited/fs/hfs/inode.c	2004-08-29 22:30:51 +02:00
+@@ -609,6 +609,7 @@
+ 	.read		= generic_file_read,
+ 	.write		= generic_file_write,
+ 	.mmap		= generic_file_mmap,
++	.sendfile	= generic_file_sendfile,
+ 	.fsync		= file_fsync,
+ 	.open		= hfs_file_open,
+ 	.release	= hfs_file_release,
+--- 1.5/fs/hfsplus/inode.c	2004-07-12 10:00:54 +02:00
++++ edited/fs/hfsplus/inode.c	2004-08-29 22:31:05 +02:00
+@@ -308,6 +308,7 @@
+ 	.read		= generic_file_read,
+ 	.write		= generic_file_write,
+ 	.mmap		= generic_file_mmap,
++	.sendfile	= generic_file_sendfile,
+ 	.fsync		= file_fsync,
+ 	.open		= hfsplus_file_open,
+ 	.release	= hfsplus_file_release,

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6	2004-08-29 21:12:19 UTC (rev 1479)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6	2004-08-29 21:15:19 UTC (rev 1480)
@@ -7,3 +7,4 @@
 + fix-url-bsd-acct.dpatch
 + pcxx-is-broken.dpatch
 + microcode-devfs-name.dpatch
++ hfs-loop-fix.dpatch