[DRBD-cvs] svn commit by lars - r2986 - branches/drbd-8.0-for-linus/drbd - d41e1fb50b5ed83516a8b500dc09b17701fbea47 remove BD_RELE

[drbd-cvs at lists.linbit.com]

Author: lars
Date: 2007-07-24 13:39:45 +0200 (Tue, 24 Jul 2007)
New Revision: 2986

Modified:
   branches/drbd-8.0-for-linus/drbd/drbd_int.h
   branches/drbd-8.0-for-linus/drbd/drbd_main.c
   branches/drbd-8.0-for-linus/drbd/drbd_nl.c
Log:
d41e1fb50b5ed83516a8b500dc09b17701fbea47 remove BD_RELEASE/BD_CLAIM wrapper macros


Modified: branches/drbd-8.0-for-linus/drbd/drbd_int.h
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_int.h	2007-07-24 11:38:05 UTC (rev 2985)
+++ branches/drbd-8.0-for-linus/drbd/drbd_int.h	2007-07-24 11:39:45 UTC (rev 2986)
@@ -1320,25 +1320,6 @@
 
 extern void resync_timer_fn(unsigned long data);
 
-#if 0
-#define BD_CLAIM(bdev,holder) ({					\
-	int r = bd_claim(bdev,holder);					\
-	printk(KERN_INFO "drbd: %u = bd_claim(%p,%p); [%p;%u]\n",	\
-		r, bdev, holder, bdev->bd_holder, bdev->bd_holders);	\
-	r; })
-
-#define BD_RELEASE(bdev) do {						\
-	printk(KERN_INFO "drbd: pre: bd_release(%p); [%p;%u]\n",	\
-		bdev, bdev->bd_holder, bdev->bd_holders);		\
-	bd_release(bdev);						\
-	printk(KERN_INFO "drbd: post: bd_release(%p); [%p;%u]\n",	\
-		bdev, bdev->bd_holder, bdev->bd_holders);		\
-	} while (0)
-#else
-#define BD_CLAIM(bdev,holder)	bd_claim(bdev,holder)
-#define BD_RELEASE(bdev)	bd_release(bdev)
-#endif
-
 // drbd_receiver.c
 extern int drbd_release_ee(drbd_dev* mdev, struct list_head* list);
 extern struct Tl_epoch_entry* drbd_alloc_ee(drbd_dev *mdev,

Modified: branches/drbd-8.0-for-linus/drbd/drbd_main.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_main.c	2007-07-24 11:38:05 UTC (rev 2985)
+++ branches/drbd-8.0-for-linus/drbd/drbd_main.c	2007-07-24 11:39:45 UTC (rev 2986)
@@ -2458,8 +2458,8 @@
 {
 	if (bc == NULL) return;
 
-	BD_RELEASE(bc->backing_bdev);
-	BD_RELEASE(bc->md_bdev);
+	bd_release(bc->backing_bdev);
+	bd_release(bc->md_bdev);
 
 	fput(bc->lo_file);
 	fput(bc->md_file);

Modified: branches/drbd-8.0-for-linus/drbd/drbd_nl.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_nl.c	2007-07-24 11:38:05 UTC (rev 2985)
+++ branches/drbd-8.0-for-linus/drbd/drbd_nl.c	2007-07-24 11:39:45 UTC (rev 2986)
@@ -771,7 +771,7 @@
 	}
 
 	nbc->backing_bdev = inode->i_bdev;
-	if (BD_CLAIM(nbc->backing_bdev, mdev)) {
+	if (bd_claim(nbc->backing_bdev, mdev)) {
 		printk(KERN_ERR "drbd: bd_claim(%p,%p); failed [%p;%p;%u]\n",
 		       nbc->backing_bdev, mdev, 
 		       nbc->backing_bdev->bd_holder,
@@ -788,7 +788,7 @@
 	}
 
 	nbc->md_bdev = inode2->i_bdev;
-	if (BD_CLAIM(nbc->md_bdev,
+	if (bd_claim(nbc->md_bdev,
 		     (nbc->dc.meta_dev_idx==DRBD_MD_INDEX_INTERNAL ||
 		      nbc->dc.meta_dev_idx==DRBD_MD_INDEX_FLEX_INT) ?
 		     (void *)mdev : (void*) drbd_m_holder )) {
@@ -1015,9 +1015,9 @@
 	drbd_force_state(mdev, NS(disk, Diskless));
 	drbd_md_sync(mdev);
  release_bdev2_fail:
-	if (nbc) BD_RELEASE(nbc->md_bdev);
+	if (nbc) bd_release(nbc->md_bdev);
  release_bdev_fail:
-	if (nbc) BD_RELEASE(nbc->backing_bdev);
+	if (nbc) bd_release(nbc->backing_bdev);
  fail:
 	if (nbc) {
 		if (nbc->lo_file) fput(nbc->lo_file);