[DRBD-cvs] svn commit by phil - r2619 - in trunk/drbd: . linux - Made DRBD to compile on 2.6.19

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-12-08 12:11:37 +0100 (Fri, 08 Dec 2006)
New Revision: 2619

Added:
   trunk/drbd/linux/config.h
Modified:
   trunk/drbd/drbd_main.c
Log:
Made DRBD to compile on 2.6.19


Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2006-12-08 10:44:50 UTC (rev 2618)
+++ trunk/drbd/drbd_main.c	2006-12-08 11:11:37 UTC (rev 2619)
@@ -2094,17 +2094,10 @@
 
 	/* D_ASSERT(atomic_read(&drbd_pp_vacant)==0); */
 
-	if (drbd_ee_mempool)
-		mempool_destroy(drbd_ee_mempool);
-	if (drbd_request_mempool)
-		mempool_destroy(drbd_request_mempool);
-	if (drbd_ee_cache && kmem_cache_destroy(drbd_ee_cache))
-		printk(KERN_ERR DEVICE_NAME
-		       ": kmem_cache_destroy(drbd_ee_cache) FAILED\n");
-	if (drbd_request_cache && kmem_cache_destroy(drbd_request_cache))
-		printk(KERN_ERR DEVICE_NAME
-		       ": kmem_cache_destroy(drbd_request_cache) FAILED\n");
-	// FIXME what can we do if we fail to destroy them?
+	if (drbd_ee_mempool) mempool_destroy(drbd_ee_mempool);
+	if (drbd_request_mempool) mempool_destroy(drbd_request_mempool);
+	if (drbd_ee_cache) kmem_cache_destroy(drbd_ee_cache);
+	if (drbd_request_cache) kmem_cache_destroy(drbd_request_cache);
 
 	drbd_ee_mempool      = NULL;
 	drbd_request_mempool = NULL;

Added: trunk/drbd/linux/config.h
===================================================================
--- trunk/drbd/linux/config.h	2006-12-08 10:44:50 UTC (rev 2618)
+++ trunk/drbd/linux/config.h	2006-12-08 11:11:37 UTC (rev 2619)
@@ -0,0 +1 @@
+/* Just an empty file. */