[DRBD-cvs] r1552 - in branches/drbd-0.7/drbd: . linux

[svn at svn.drbd.org]

Author: lars
Date: 2004-09-23 15:09:50 +0200 (Thu, 23 Sep 2004)
New Revision: 1552

Modified:
   branches/drbd-0.7/drbd/drbd_compat_types.h
   branches/drbd-0.7/drbd/drbd_compat_wrappers.h
   branches/drbd-0.7/drbd/linux/drbd_config.h
Log:
remove all references to BH_Launder. did not make so much sense, anyways.

Modified: branches/drbd-0.7/drbd/drbd_compat_types.h
===================================================================
--- branches/drbd-0.7/drbd/drbd_compat_types.h	2004-09-22 13:19:33 UTC (rev 1551)
+++ branches/drbd-0.7/drbd/drbd_compat_types.h	2004-09-23 13:09:50 UTC (rev 1552)
@@ -21,10 +21,6 @@
 	for(pos = (head)->next; pos != (head); pos = pos->next)
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,19) && !defined(REDHAT_2_4_18)
-#define BH_Launder BH_launder
-#endif
-
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,10)
 #define min_t(type,x,y) \
 	({ type __x = (x); type __y = (y); __x < __y ? __x: __y; })

Modified: branches/drbd-0.7/drbd/drbd_compat_wrappers.h
===================================================================
--- branches/drbd-0.7/drbd/drbd_compat_wrappers.h	2004-09-22 13:19:33 UTC (rev 1551)
+++ branches/drbd-0.7/drbd/drbd_compat_wrappers.h	2004-09-23 13:09:50 UTC (rev 1552)
@@ -148,7 +148,6 @@
 	bh->b_rdev     = mdev->backing_bdev;
 	bh->b_private  = mdev;
 	bh->b_state    = (1 << BH_Req)
-			|(1 << BH_Launder)
 	                |(1 << BH_Mapped)
 			|(1 << BH_Lock);
 }
@@ -206,7 +205,6 @@
 	bh->b_end_io  = drbd_dio_end;
 
 	D_ASSERT(buffer_req(bh));
-	D_ASSERT(buffer_launder(bh));
 	D_ASSERT(buffer_locked(bh));
 	D_ASSERT(buffer_mapped(bh));
 	// D_ASSERT(buffer_dirty(bh)); // It is not true ?!?
@@ -241,7 +239,6 @@
 	bh->b_end_io  = drbd_read_bi_end_io;
 
 	D_ASSERT(buffer_req(bh));
-	D_ASSERT(buffer_launder(bh));
 	D_ASSERT(buffer_locked(bh));
 	D_ASSERT(buffer_mapped(bh));
 	D_ASSERT(!buffer_uptodate(bh));

Modified: branches/drbd-0.7/drbd/linux/drbd_config.h
===================================================================
--- branches/drbd-0.7/drbd/linux/drbd_config.h	2004-09-22 13:19:33 UTC (rev 1551)
+++ branches/drbd-0.7/drbd/linux/drbd_config.h	2004-09-23 13:09:50 UTC (rev 1552)
@@ -37,13 +37,7 @@
 
 //#define SIGHAND_HACK           // Needed for RH 2.4.20 and later kernels.
 //#define REDHAT_HLIST_BACKPORT  // Makes DRBD work on RH9 kernels
-/* Redhat 2.4.18 already includes BH_Launder,
- * other  2.4.18 still have       BH_launder ...
- * most likely we could do without it completely,
- * since it is only used in drbd_ee_bh_prepare().
- * anyways...
- */
-//#define REDHAT_2_4_18
+
 /* some redhat 2.4.X-Y.Z.whatever kernel flavours have an mm_inline.h,
  * which needs to be included explicitly. most 2.4.x kernels don't have that
  * header file at all. So uncomment for these, and ignore for all others.