Package: cdfs-src
Version: 2.4.20.a+2.6.18-1

Attached is a patch to fix cdfs so it builds with kernels 2.6.19+.

Regards.
diff -ru cdfs/2.6/audio.c cdfs-2.6.20/audio.c
--- cdfs/2.6/audio.c	2006-10-24 12:44:49.000000000 -0700
+++ cdfs-2.6.20/2.6/audio.c	2006-12-11 12:30:47.000000000 -0800
@@ -167,7 +167,8 @@
 /***************************************************************************/
 
 struct file_operations cdfs_cdda_file_operations = {
-    .read = generic_file_read,
+    .read = do_sync_read,
+    .aio_read = generic_file_aio_read,
     .mmap = generic_file_mmap,
 };
 
diff -ru cdfs/2.6/cddata.c cdfs-2.6.20/cddata.c
--- cdfs/2.6/cddata.c	2005-05-01 13:58:24.000000000 -0700
+++ cdfs-2.6.20/2.6/cddata.c	2006-12-11 12:30:47.000000000 -0800
@@ -76,7 +76,8 @@
 
 
 struct file_operations cdfs_cddata_file_operations = {
-  .read             = generic_file_read,
+  .read = do_sync_read,
+  .aio_read = generic_file_aio_read,
 #ifdef OLD_KERNEL
   .mmap             = generic_file_mmap
 #else
diff -ru cdfs/2.6/cdfs.h cdfs-2.6.20/cdfs.h
--- cdfs/2.6/cdfs.h	2006-10-24 12:44:49.000000000 -0700
+++ cdfs-2.6.20/2.6/cdfs.h	2006-12-11 12:34:11.000000000 -0800
@@ -13,7 +13,7 @@
 #endif
 
 #ifndef CONFIG_CDFS_VERSION
-#define CONFIG_CDFS_VERSION "2.6.18"
+#define CONFIG_CDFS_VERSION "2.6.19"
 #endif
 
 
diff -ru cdfs/2.6/cdXA.c cdfs-2.6.20/cdXA.c
--- cdfs/2.6/cdXA.c	2006-10-24 12:44:49.000000000 -0700
+++ cdfs-2.6.20/2.6/cdXA.c	2006-12-11 12:30:47.000000000 -0800
@@ -26,7 +26,8 @@
 #include "cdfs.h"
 
 struct file_operations cdfs_cdXA_file_operations = {
-    .read = generic_file_read,
+    .read = do_sync_read,
+    .aio_read = generic_file_aio_read,
     .mmap = generic_file_mmap,
 };
 
diff -ru cdfs/2.6/hfs.c cdfs-2.6.20/hfs.c
--- cdfs/2.6/hfs.c	2005-05-01 13:58:24.000000000 -0700
+++ cdfs-2.6.20/2.6/hfs.c	2006-12-11 12:30:47.000000000 -0800
@@ -194,7 +194,8 @@
 /***************************************************************************/
 
 struct file_operations cdfs_cdhfs_file_operations = {
-  .read             = generic_file_read,
+  .read = do_sync_read,
+  .aio_read = generic_file_aio_read,
   .mmap             = generic_file_mmap
 };
 

Reply via email to