sys-fs/cloop/files/cloop.fix-incompatible-kernel-2.6.7-and-later.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29

This patch is taken from debian and fixes some incompatible kernel changes
in 2.6.7 and later linux-kernels.

--- cloop-2.01/compressed_loop.c.orig	2004-05-14 15:22:47.000000000 -0400
+++ cloop-2.01/compressed_loop.c	2004-11-22 11:32:45.772837000 -0500
@@ -202,7 +202,11 @@
                           unsigned long offset, unsigned long size)
 {
  char *kaddr;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7)
+ struct clo_read_data *p = (struct clo_read_data*)desc->arg.buf;
+#else
  struct clo_read_data *p = (struct clo_read_data*)desc->buf;
+#endif
  unsigned long count = desc->count;
  if (size > count) size = count;
  kaddr = kmap(page);
@@ -228,7 +232,11 @@
    read_descriptor_t desc;
    desc.written = 0;
    desc.count   = size;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7)
+   desc.arg.buf = (char*)&cd;
+#else
    desc.buf     = (char*)&cd;
+#endif
    desc.error   = 0;
 #ifdef REDHAT_KERNEL /* Greenshoe Linux */
    do_generic_file_read(f, &pos, &desc, clo_read_actor, 0);