[DRBD-cvs] svn commit by lars - r2883 - in branches/drbd-0.7/drbd: . linux - we forgot about our kernel 2.4 compatibility :(

[drbd-cvs at lists.linbit.com]

Author: lars
Date: 2007-05-08 11:10:48 +0200 (Tue, 08 May 2007)
New Revision: 2883

Modified:
   branches/drbd-0.7/drbd/drbd_req.c
   branches/drbd-0.7/drbd/linux/drbd_config.h
Log:
we forgot about our kernel 2.4 compatibility :(

Modified: branches/drbd-0.7/drbd/drbd_req.c
===================================================================
--- branches/drbd-0.7/drbd/drbd_req.c	2007-05-07 15:21:51 UTC (rev 2882)
+++ branches/drbd-0.7/drbd/drbd_req.c	2007-05-08 09:10:48 UTC (rev 2883)
@@ -269,10 +269,12 @@
 		    (volatile int) mdev->cstate > WFBitMapT);
 
 	local = inc_local(mdev);
+	ONLY_IN_26(
 	if (!local) {
 		bio_put(req->private_bio); /* or we get a bio leak */
 		req->private_bio = NULL;
 	}
+	)
 	NOT_IN_26( if (rw == READA) rw=READ );
 	if (rw == READ || rw == READA) {
 		if (local) {
@@ -298,8 +300,10 @@
 				 * local io stack.
 				 */
 				local = 0;
+				ONLY_IN_26(
 				bio_put(req->private_bio);
 				req->private_bio = NULL;
+				)
 				dec_local(mdev);
 			}
 		}

Modified: branches/drbd-0.7/drbd/linux/drbd_config.h
===================================================================
--- branches/drbd-0.7/drbd/linux/drbd_config.h	2007-05-07 15:21:51 UTC (rev 2882)
+++ branches/drbd-0.7/drbd/linux/drbd_config.h	2007-05-08 09:10:48 UTC (rev 2883)
@@ -69,7 +69,7 @@
 // but more recent kernels define it in arch/um/include/mem.h
 #define HAVE_UML_TO_VIRT
 
-//#define NO_MORE_DEV_FS
+#define NO_MORE_DEV_FS
 
 // 2.6.something has deprecated kmem_cache_t
 // some older still use it.