On Sat, Dec 01, 2007 at 03:22:43PM -0200, Herbert P Fortes Neto wrote: > i tried to build the cloop module and received this error:
I fixed three compilation problems with the new kernel (2.6.24-git but should apply to 2.6.23, too, which is in unstable) but then I heared that it's deprecated anyway. Well, uploaded in spite of this. NMU attached. Kind regards Philipp Kern
diff -Nru cloop-2.05~20060829/compressed_loop.c
cloop-2.05~20060829/compressed_loop.c
--- cloop-2.05~20060829/compressed_loop.c 2006-12-04 00:07:02.000000000
+0100
+++ cloop-2.05~20060829/compressed_loop.c 2008-01-12 12:56:29.000000000
+0100
@@ -350,7 +350,7 @@
up(&clo->clo_lock);
out:
- bio_endio(bio, bio->bi_size,buffered_blocknum==-1 && !preloaded);
+ bio_endio(bio, buffered_blocknum==-1 && !preloaded);
return 0;
}
@@ -625,7 +625,7 @@
if(clo->compressed_buffer) { vfree(clo->compressed_buffer);
clo->compressed_buffer = NULL; }
zlib_inflateEnd(&clo->zstream);
if(clo->zstream.workspace) { vfree(clo->zstream.workspace);
clo->zstream.workspace = NULL; }
- invalidate_bdev(bdev, 0);
+ invalidate_bdev(bdev);
set_capacity(clo->disk, 0);
return 0;
}
@@ -814,8 +814,7 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
devfs_remove(cloop_name);
#endif
- if(unregister_cloop_blkdev() != 0)
- printk(KERN_WARNING "%s: cannot unregister block device\n",
cloop_name);
+ unregister_cloop_blkdev();
for(i=0;i<max_cloop;i++)
{
del_gendisk(cloop_dev[i].disk);
diff -Nru /tmp/UcKAy70nFE/cloop-2.05~20060829/debian/changelog
/tmp/CgTwM43v4m/cloop-2.05~20060829/debian/changelog
--- cloop-2.05~20060829/debian/changelog 2006-12-04 00:09:57.000000000
+0100
+++ cloop-2.05~20060829/debian/changelog 2008-01-12 12:58:06.000000000
+0100
@@ -1,3 +1,14 @@
+cloop (2.05~20060829-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix compilation with newer kernels. (Closes: #453851)
+ - Fix a call to invalidate_bdev and do not specify a second parameter.
+ - bio_endio does not need a size anymore.
+ - unregister_blockdev now calls printk on errors by itself, and returns
+ void now.
+
+ -- Philipp Kern <[EMAIL PROTECTED]> Sat, 12 Jan 2008 12:36:56 +0100
+
cloop (2.05~20060829-1) unstable; urgency=low
* Merged with Klaus' unreleased version 2.05, compiles with >> 2.6.18.1.
signature.asc
Description: Digital signature
