[DRBD-cvs] svn commit by phil - r2089 - trunk/drbd - * Late allocation of resync_lru and act_log

[drbd-cvs at lists.linbit.com]

* The code 
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: phil
Date: 2006-03-03 16:38:34 +0100 (Fri, 03 Mar 2006)
New Revision: 2089

Modified:
   trunk/drbd/drbd_bitmap.c
   trunk/drbd/drbd_fs.c
   trunk/drbd/drbd_main.c
   trunk/drbd/drbd_proc.c
   trunk/drbd/drbd_worker.c
Log:
* Late allocation of resync_lru and act_log
* The code that finds adjacent bits during resync needed some fixes


Modified: trunk/drbd/drbd_bitmap.c
===================================================================
--- trunk/drbd/drbd_bitmap.c	2006-03-01 18:02:03 UTC (rev 2088)
+++ trunk/drbd/drbd_bitmap.c	2006-03-03 15:38:34 UTC (rev 2089)
@@ -786,7 +786,11 @@
 	spin_lock_irq(&b->bm_lock);
 	BM_PARANOIA_CHECK();
 
-	b->bm_fo = i;
+	if (i < b->bm_bits) {
+		b->bm_fo = i;
+	} else {
+		b->bm_fo = 0;
+	}
 
 	spin_unlock_irq(&b->bm_lock);
 }
@@ -871,6 +875,9 @@
 /* returns bit state
  * wants bitnr, NOT sector.
  * inherently racy... area needs to be locked by means of {al,rs}_lru
+ *  1 ... bit set
+ *  0 ... bit not set
+ * -1 ... first out of bounds access, stop testing for bits!
  */
 int drbd_bm_test_bit(drbd_dev *mdev, const unsigned long bitnr)
 {
@@ -881,12 +888,15 @@
 
 	spin_lock_irq(&b->bm_lock);
 	BM_PARANOIA_CHECK();
-	ERR_IF (bitnr >= b->bm_bits) {
-		ERR("bitnr=%lu bm_bits=%lu\n",bitnr, b->bm_bits);
-		i = 0;
-	} else {
+	if (bitnr < b->bm_bits) {
 		i = test_bit(bitnr, b->bm);
+	} else if (bitnr == b->bm_bits) {
+		i = -1;
+	} else /* (bitnr > b->bm_bits) */ {
+		ERR("bitnr=%lu > bm_bits=%lu\n",bitnr, b->bm_bits);
+		i = 0;		
 	}
+
 	spin_unlock_irq(&b->bm_lock);
 	return i;
 }

Modified: trunk/drbd/drbd_fs.c
===================================================================
--- trunk/drbd/drbd_fs.c	2006-03-01 18:02:03 UTC (rev 2088)
+++ trunk/drbd/drbd_fs.c	2006-03-03 15:38:34 UTC (rev 2089)
@@ -307,6 +307,7 @@
 	struct disk_config new_conf;  // local copy of ioctl() args.
 	struct drbd_backing_dev* nbc; // new_backing_conf
 	struct inode *inode, *inode2;
+	struct lru_cache* resync_lru = NULL;
 	drbd_disks_t nds;
 
 	minor=(int)(mdev-drbd_conf);
@@ -364,6 +365,12 @@
 		goto fail_ioctl;
 	}
 
+	resync_lru = lc_alloc("resync",7, sizeof(struct bm_extent),mdev);
+	if(!resync_lru) {
+		retcode=KMallocFailed;
+		goto fail_ioctl;
+	}
+
 	nbc->md_bdev = inode2->i_bdev;
 	if (bd_claim(nbc->md_bdev,
 		     (new_conf.meta_index==DRBD_MD_INDEX_INTERNAL ||
@@ -453,6 +460,7 @@
 
 	D_ASSERT(mdev->bc == NULL);
 	mdev->bc = nbc;
+	mdev->resync = resync_lru;
 
 	if (new_conf.split_brain_fix) set_bit(SPLIT_BRAIN_FIX,&mdev->flags);
 	else clear_bit(SPLIT_BRAIN_FIX,&mdev->flags);
@@ -557,6 +565,7 @@
 	if (nbc->lo_file) fput(nbc->lo_file);
 	if (nbc->md_file) fput(nbc->md_file);
 	if (nbc) kfree(nbc);
+	if (resync_lru) lc_free(resync_lru);
 	if (put_user(retcode, &arg->ret_code)) return -EFAULT;
 	return -EINVAL;
 }
@@ -1031,8 +1040,9 @@
 		return -EINTR;
 	}
 
-	drbd_free_bc(mdev->bc);
-	mdev->bc=0;
+	drbd_free_bc(mdev->bc);	mdev->bc = NULL;
+	lc_free(mdev->resync);  mdev->resync = NULL;
+	lc_free(mdev->act_log); mdev->act_log = NULL;
 
 	after_state_ch(mdev, os, ns);
 

Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2006-03-01 18:02:03 UTC (rev 2088)
+++ trunk/drbd/drbd_main.c	2006-03-03 15:38:34 UTC (rev 2089)
@@ -521,8 +521,7 @@
 		 * and no real references on the device. */
 		WARN("Releasing backing storage device.\n");
 		drbd_free_bc(mdev->bc);
-		mdev->bc=0;
-		mdev->bc->md.la_size_sect=0;
+		mdev->bc=NULL;
 	}
 
 	return ok;
@@ -2290,12 +2289,6 @@
 
 		if (drbd_bm_init(mdev)) goto Enomem;
 		// no need to lock access, we are still initializing the module.
-		mdev->resync = lc_alloc("resync",17, sizeof(struct bm_extent),mdev);
-		if (!mdev->resync) goto Enomem;
-		mdev->act_log = lc_alloc("act_log",mdev->sync_conf.al_extents,
-					 sizeof(struct lc_element), mdev);
-		if (!mdev->act_log) goto Enomem;
-
 		init_MUTEX(&mdev->device_mutex);
 		if (!tl_init(mdev)) goto Enomem;
 

Modified: trunk/drbd/drbd_proc.c
===================================================================
--- trunk/drbd/drbd_proc.c	2006-03-01 18:02:03 UTC (rev 2088)
+++ trunk/drbd/drbd_proc.c	2006-03-03 15:38:34 UTC (rev 2089)
@@ -215,8 +215,12 @@
 		     drbd_conf[i].state.conn == SyncTarget ) {
 			drbd_syncer_progress(drbd_conf+i,seq);
 		}
-		lc_printf_stats(seq,drbd_conf[i].resync);
-		lc_printf_stats(seq,drbd_conf[i].act_log);
+		if(drbd_conf[i].resync) {
+			lc_printf_stats(seq,drbd_conf[i].resync);
+		}
+		if(drbd_conf[i].act_log) {
+			lc_printf_stats(seq,drbd_conf[i].act_log);
+		}
 	}
 
 	return 0;

Modified: trunk/drbd/drbd_worker.c
===================================================================
--- trunk/drbd/drbd_worker.c	2006-03-01 18:02:03 UTC (rev 2088)
+++ trunk/drbd/drbd_worker.c	2006-03-03 15:38:34 UTC (rev 2089)
@@ -355,7 +355,7 @@
 
 #if DRBD_MAX_SEGMENT_SIZE > BM_BLOCK_SIZE
 		// try to find some adjacent bits...
-		while ( drbd_bm_test_bit(mdev,bit+1) ) {
+		while ( drbd_bm_test_bit(mdev,bit+1) == 1 ) {
 			// stop if we have the already the maximum req size
 			if(size == DRBD_MAX_SEGMENT_SIZE) break;
 			// do not leafe the current BM_EXTEND