SOURCES: truecrypt-init_work-2.6.20-fix.patch (NEW), truecrypt-blk...

[mguevara]

Author: mguevara                     Date: Tue Feb 27 13:07:49 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 2.6.20 fixes for truecrypt

---- Files affected:
SOURCES:
   truecrypt-init_work-2.6.20-fix.patch (NONE -> 1.1)  (NEW), truecrypt-blk_congestion_wait-2.6.20-fix.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/truecrypt-init_work-2.6.20-fix.patch
diff -u /dev/null SOURCES/truecrypt-init_work-2.6.20-fix.patch:1.1
--- /dev/null	Tue Feb 27 14:07:49 2007
+++ SOURCES/truecrypt-init_work-2.6.20-fix.patch	Tue Feb 27 14:07:44 2007
@@ -0,0 +1,15 @@
+diff -NurpP --minimal truecrypt-4.2a.clean/Linux/Kernel/Dm-target.c truecrypt-4.2a/Linux/Kernel/Dm-target.c
+--- truecrypt-4.2a.clean/Linux/Kernel/Dm-target.c	2007-02-27 13:21:08.000000000 +0100
++++ truecrypt-4.2a/Linux/Kernel/Dm-target.c	2007-02-27 13:29:03.000000000 +0100
+@@ -435,7 +435,11 @@ static int truecrypt_endio (struct bio *
+ 		bio_put (bio);
+ 
+ 		// Queue decryption to leave completion interrupt ASAP
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
++		INIT_WORK (&bc->work, work_process);
++#else
+ 		INIT_WORK (&bc->work, work_process, bc);
++#endif /* LINUX_VERSION_CODE >= 2.6.20 */
+ 		trace (3, "queue_work (%p)\n", work_queue);
+ 		queue_work (work_queue, &bc->work);
+ 		return error;

================================================================
Index: SOURCES/truecrypt-blk_congestion_wait-2.6.20-fix.patch
diff -u /dev/null SOURCES/truecrypt-blk_congestion_wait-2.6.20-fix.patch:1.1
--- /dev/null	Tue Feb 27 14:07:49 2007
+++ SOURCES/truecrypt-blk_congestion_wait-2.6.20-fix.patch	Tue Feb 27 14:07:44 2007
@@ -0,0 +1,32 @@
+diff -NurpP --minimal truecrypt-4.2a.orig/Linux/Kernel/Dm-target.c truecrypt-4.2a/Linux/Kernel/Dm-target.c
+--- truecrypt-4.2a.orig/Linux/Kernel/Dm-target.c	2007-02-27 14:19:40.000000000 +0100
++++ truecrypt-4.2a/Linux/Kernel/Dm-target.c	2007-02-27 14:24:15.000000000 +0100
+@@ -127,9 +127,13 @@ static void *malloc_wait (mempool_t *poo
+ 
+ 		if (p)
+ 			return p;
+-
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
++		trace (3, "congestion_wait\n");
++		congestion_wait (direction, HZ / 50);
++#else
+ 		trace (3, "blk_congestion_wait\n");
+ 		blk_congestion_wait (direction, HZ / 50);
++#endif
+ 	}
+ }
+ 
+@@ -504,8 +508,13 @@ static int truecrypt_map (struct dm_targ
+ 	trace (3, "bio_alloc (%hd)\n", bio_segments (bio));
+ 	while (!(bion = bio_alloc (GFP_NOIO | __GFP_NOMEMALLOC, bio_segments (bio))))
+ 	{
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
++		trace (3, "congestion_wait\n");
++		congestion_wait (bio_data_dir (bio), HZ / 50);
++#else
+ 		trace (3, "blk_congestion_wait\n");
+ 		blk_congestion_wait (bio_data_dir (bio), HZ / 50);
++#endif
+ 	}
+ 
+ 	bion->bi_bdev = tc->dev->bdev;
================================================================