From: Steve Guminski <stephenx.guminski@intel.com>
Date: Mon, 6 Mar 2017 21:05:22 +0000 (-0500)
Subject: LU-9152 mgc: Remove unnecessary checks for config_log_put()
X-Git-Tag: 2.9.57~46
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=ffde9ae4784fdb045eae8438aa0c179db6172232;p=fs%2Flustre-release.git

LU-9152 mgc: Remove unnecessary checks for config_log_put()

Because config_log_put() now checks if its parameter is NULL, it
is unnecessary to perform the check prior to calling it.  This patch
removes the redundant checks.

Signed-off-by: Steve Guminski <stephenx.guminski@intel.com>
Change-Id: Id6b1fccebd5bc53a29bc364b9a3c47956649920a
Reviewed-on: https://review.whamcloud.com/25854
Tested-by: Jenkins
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
---

diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c
index 1146f7f..0266f1e 100644
--- a/lustre/mgc/mgc_request.c
+++ b/lustre/mgc/mgc_request.c
@@ -150,16 +150,11 @@ static void config_log_put(struct config_llog_data *cld)
 
 		CDEBUG(D_MGC, "dropping config log %s\n", cld->cld_logname);
 
-		if (cld->cld_barrier)
-			config_log_put(cld->cld_barrier);
-		if (cld->cld_recover)
-			config_log_put(cld->cld_recover);
-		if (cld->cld_params)
-			config_log_put(cld->cld_params);
-		if (cld->cld_nodemap)
-			config_log_put(cld->cld_nodemap);
-		if (cld->cld_sptlrpc)
-			config_log_put(cld->cld_sptlrpc);
+		config_log_put(cld->cld_barrier);
+		config_log_put(cld->cld_recover);
+		config_log_put(cld->cld_params);
+		config_log_put(cld->cld_nodemap);
+		config_log_put(cld->cld_sptlrpc);
 		if (cld_is_sptlrpc(cld))
 			sptlrpc_conf_log_stop(cld->cld_logname);
 
@@ -453,11 +448,13 @@ DEFINE_MUTEX(llog_process_lock);
 
 static inline void config_mark_cld_stop(struct config_llog_data *cld)
 {
-	mutex_lock(&cld->cld_lock);
-	spin_lock(&config_list_lock);
-	cld->cld_stopping = 1;
-	spin_unlock(&config_list_lock);
-	mutex_unlock(&cld->cld_lock);
+	if (cld) {
+		mutex_lock(&cld->cld_lock);
+		spin_lock(&config_list_lock);
+		cld->cld_stopping = 1;
+		spin_unlock(&config_list_lock);
+		mutex_unlock(&cld->cld_lock);
+	}
 }
 
 /** Stop watching for updates on this log.
@@ -509,19 +506,14 @@ static int config_log_end(char *logname, struct config_llog_instance *cfg)
 	cld->cld_sptlrpc = NULL;
 	mutex_unlock(&cld->cld_lock);
 
-	if (cld_recover) {
-		config_mark_cld_stop(cld_recover);
-		config_log_put(cld_recover);
-	}
+	config_mark_cld_stop(cld_recover);
+	config_log_put(cld_recover);
 
-	if (cld_params) {
-		config_mark_cld_stop(cld_params);
-		config_log_put(cld_params);
-	}
+	config_mark_cld_stop(cld_params);
+	config_log_put(cld_params);
 
 	/* don't set cld_stopping on nm lock as other targets may be active */
-	if (cld_nodemap)
-		config_log_put(cld_nodemap);
+	config_log_put(cld_nodemap);
 
 	if (cld_barrier) {
 		mutex_lock(&cld_barrier->cld_lock);
@@ -530,8 +522,7 @@ static int config_log_end(char *logname, struct config_llog_instance *cfg)
 		config_log_put(cld_barrier);
 	}
 
-	if (cld_sptlrpc)
-		config_log_put(cld_sptlrpc);
+	config_log_put(cld_sptlrpc);
 
 	/* drop the ref from the find */
 	config_log_put(cld);
@@ -681,8 +672,7 @@ static int mgc_requeue_thread(void *data)
 			cld->cld_lostlock = 0;
 			spin_unlock(&config_list_lock);
 
-			if (cld_prev)
-				config_log_put(cld_prev);
+			config_log_put(cld_prev);
 			cld_prev = cld;
 
 			if (likely(!(rq_state & RQ_STOP))) {
@@ -694,8 +684,7 @@ static int mgc_requeue_thread(void *data)
 			}
 		}
 		spin_unlock(&config_list_lock);
-		if (cld_prev)
-			config_log_put(cld_prev);
+		config_log_put(cld_prev);
 
 		/* Wait a bit to see if anyone else needs a requeue */
 		lwi = (struct l_wait_info) { 0 };