[PATCH] multipathd/main.c: delete redundant judgment before LOG_MSG()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: "li.minghui" <li.minghui7@xxxxxxxxxx>

Problem:the LOG_MSG() doesn't note the path info "path offline" when the
path is in offline with the pp->offline = 1.

Reasons:There is no need to judge the strlen(b) again before calling
LOG_MSG(a, b) because there exists the judgmnet of strlen(b) in
defination of LOG_MSG(a,b).
---
 multipathd/main.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/multipathd/main.c b/multipathd/main.c
index b6eb696..b147ca5 100644
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -1454,8 +1454,7 @@ void repair_path(struct path * pp)
 		return;
 
 	checker_repair(&pp->checker);
-	if (strlen(checker_message(&pp->checker)))
-		LOG_MSG(1, checker_message(&pp->checker));
+	LOG_MSG(1, checker_message(&pp->checker));
 }
 
 /*
@@ -1590,8 +1589,7 @@ check_path (struct vectors * vecs, struct path * pp, int ticks)
 		int oldstate = pp->state;
 		pp->state = newstate;
 
-		if (strlen(checker_message(&pp->checker)))
-			LOG_MSG(1, checker_message(&pp->checker));
+		LOG_MSG(1, checker_message(&pp->checker));
 
 		/*
 		 * upon state change, reset the checkint
@@ -1703,8 +1701,7 @@ check_path (struct vectors * vecs, struct path * pp, int ticks)
 			pp->tick = pp->checkint;
 		}
 	}
-	else if (newstate == PATH_DOWN &&
-		 strlen(checker_message(&pp->checker))) {
+	else if (newstate == PATH_DOWN) {
 		int log_checker_err;
 
 		conf = get_multipath_config();
-- 
2.8.1.windows.1

--
dm-devel mailing list
dm-devel@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/dm-devel



[Index of Archives]     [DM Crypt]     [Fedora Desktop]     [ATA RAID]     [Fedora Marketing]     [Fedora Packaging]     [Fedora SELinux]     [Yosemite Discussion]     [KDE Users]     [Fedora Docs]

  Powered by Linux