[DRBD-cvs] svn commit by lars - r2185 - branches/drbd-0.7/drbd - get rid of SLAB_NO_REAP flag, it has been removed from

drbd-cvs at lists.linbit.com drbd-cvs at lists.linbit.com
Fri Apr 28 18:16:21 CEST 2006


Author: lars
Date: 2006-04-28 18:15:07 +0200 (Fri, 28 Apr 2006)
New Revision: 2185

Modified:
   branches/drbd-0.7/drbd/drbd_main.c
   branches/drbd-0.7/drbd/drbd_receiver.c
Log:
get rid of SLAB_NO_REAP flag, it has been removed from slab.h, see
http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ac2b898ca6fb06196a26869c23b66afe7944e52e

Modified: branches/drbd-0.7/drbd/drbd_main.c
===================================================================
--- branches/drbd-0.7/drbd/drbd_main.c	2006-04-28 15:58:50 UTC (rev 2184)
+++ branches/drbd-0.7/drbd/drbd_main.c	2006-04-28 16:15:07 UTC (rev 2185)
@@ -1542,13 +1542,13 @@
 	// caches
 	drbd_request_cache = kmem_cache_create(
 		"drbd_req_cache", sizeof(drbd_request_t),
-		0, SLAB_NO_REAP, NULL, NULL);
+		0, 0, NULL, NULL);
 	if (drbd_request_cache == NULL)
 		goto Enomem;
 
 	drbd_ee_cache = kmem_cache_create(
 		"drbd_ee_cache", sizeof(struct Tl_epoch_entry),
-		0, SLAB_NO_REAP, NULL, NULL);
+		0, 0, NULL, NULL);
 	if (drbd_ee_cache == NULL)
 		goto Enomem;
 

Modified: branches/drbd-0.7/drbd/drbd_receiver.c
===================================================================
--- branches/drbd-0.7/drbd/drbd_receiver.c	2006-04-28 15:58:50 UTC (rev 2184)
+++ branches/drbd-0.7/drbd/drbd_receiver.c	2006-04-28 16:15:07 UTC (rev 2185)
@@ -181,7 +181,7 @@
 	page=alloc_page(mask);
 	if(!page) return FALSE;
 
-	if(!_drbd_alloc_ee(mdev,page,GFP_KERNEL)) {
+	if(!_drbd_alloc_ee(mdev,page,mask)) {
 		__free_page(page);
 		return FALSE;
 	}



More information about the drbd-cvs mailing list