[DRBD-cvs] svn commit by lars - r2998 - branches/drbd-8.0-for-linus/drbd - 402d48f63eb57eaf7e802de1d35b502f93ab38a9 got rid of unn

[drbd-cvs at lists.linbit.com]

Author: lars
Date: 2007-07-24 16:57:11 +0200 (Tue, 24 Jul 2007)
New Revision: 2998

Modified:
   branches/drbd-8.0-for-linus/drbd/drbd_main.c
   branches/drbd-8.0-for-linus/drbd/drbd_receiver.c
Log:
402d48f63eb57eaf7e802de1d35b502f93ab38a9 got rid of unneccessary 'if (p != NULL) kfree(p);'


Modified: branches/drbd-8.0-for-linus/drbd/drbd_main.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_main.c	2007-07-24 14:19:07 UTC (rev 2997)
+++ branches/drbd-8.0-for-linus/drbd/drbd_main.c	2007-07-24 14:57:11 UTC (rev 2998)
@@ -174,10 +174,8 @@
 {
 	D_ASSERT(mdev->oldest_barrier == mdev->newest_barrier);
 	kfree(mdev->oldest_barrier);
-	if (mdev->tl_hash) {
-		kfree(mdev->tl_hash);
-		mdev->tl_hash_s = 0;
-	}
+	kfree(mdev->tl_hash);
+	mdev->tl_hash_s = 0;
 }
 
 /**
@@ -888,10 +886,8 @@
 	/* Lost contact to peer's copy of the data */
 	if ( (os.pdsk >= Inconsistent && os.pdsk != DUnknown && os.pdsk != Outdated) &&
 	     (ns.pdsk < Inconsistent || ns.pdsk == DUnknown || ns.pdsk == Outdated) ) {
-		if (mdev->p_uuid) {
-			kfree(mdev->p_uuid);
-			mdev->p_uuid = NULL;
-		}
+		kfree(mdev->p_uuid);
+		mdev->p_uuid = NULL;
 		if (inc_local(mdev)) {
 			if (ns.role == Primary && mdev->bc->md.uuid[Bitmap] == 0) {
 				/* Only do it if we have not yet done it... */
@@ -2233,26 +2229,22 @@
 			if (mdev->md_io_tmpp)
 				__free_page(mdev->md_io_tmpp);
 
-			if (mdev->act_log) lc_free(mdev->act_log);
+			if (mdev->act_log)
+				lc_free(mdev->act_log);
 
-			if (mdev->ee_hash) {
-				kfree(mdev->ee_hash);
-				mdev->ee_hash_s = 0;
-				mdev->ee_hash = NULL;
-			}
-			if (mdev->tl_hash) {
-				kfree(mdev->tl_hash);
-				mdev->tl_hash_s = 0;
-				mdev->tl_hash = NULL;
-			}
-			if (mdev->app_reads_hash) {
-				kfree(mdev->app_reads_hash);
-				mdev->app_reads_hash = NULL;
-			}
-			if (mdev->p_uuid) {
-				kfree(mdev->p_uuid);
-				mdev->p_uuid = NULL;
-			}
+			kfree(mdev->ee_hash);
+			mdev->ee_hash_s = 0;
+			mdev->ee_hash = NULL;
+
+			kfree(mdev->tl_hash);
+			mdev->tl_hash_s = 0;
+			mdev->tl_hash = NULL;
+
+			kfree(mdev->app_reads_hash);
+			mdev->app_reads_hash = NULL;
+
+			kfree(mdev->p_uuid);
+			mdev->p_uuid = NULL;
 		}
 		drbd_destroy_mempools();
 	}

Modified: branches/drbd-8.0-for-linus/drbd/drbd_receiver.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_receiver.c	2007-07-24 14:19:07 UTC (rev 2997)
+++ branches/drbd-8.0-for-linus/drbd/drbd_receiver.c	2007-07-24 14:57:11 UTC (rev 2998)
@@ -2657,10 +2657,8 @@
 	drbd_queue_work(&mdev->data.work, &prev_work_done);
 	wait_event(mdev->misc_wait, !test_bit(WORK_PENDING, &mdev->flags));
 
-	if (mdev->p_uuid) {
-		kfree(mdev->p_uuid);
-		mdev->p_uuid = NULL;
-	}
+	kfree(mdev->p_uuid);
+	mdev->p_uuid = NULL;
 
 	/* queue cleanup for the worker.
 	 * FIXME this should go into after_state_ch  */
@@ -2693,21 +2691,18 @@
 
 	if (os.conn == Disconnecting) {
 		wait_event( mdev->misc_wait, atomic_read(&mdev->net_cnt) == 0 );
-		if (mdev->ee_hash) {
-			kfree(mdev->ee_hash);
-			mdev->ee_hash = NULL;
-			mdev->ee_hash_s = 0;
-		}
 
-		if (mdev->tl_hash) {
-			kfree(mdev->tl_hash);
-			mdev->tl_hash = NULL;
-			mdev->tl_hash_s = 0;
-		}
-		if (mdev->cram_hmac_tfm) {
-			crypto_free_hash(mdev->cram_hmac_tfm);
-			mdev->cram_hmac_tfm = NULL;
-		}
+		kfree(mdev->ee_hash);
+		mdev->ee_hash = NULL;
+		mdev->ee_hash_s = 0;
+
+		kfree(mdev->tl_hash);
+		mdev->tl_hash = NULL;
+		mdev->tl_hash_s = 0;
+
+		crypto_free_hash(mdev->cram_hmac_tfm);
+		mdev->cram_hmac_tfm = NULL;
+
 		kfree(mdev->net_conf);
 		mdev->net_conf = NULL;
 		drbd_request_state(mdev, NS(conn, StandAlone));