Linux Device Mapper development
 help / color / mirror / Atom feed
From: Martin Wilck <mwilck@suse.com>
To: Christophe Varoqui <christophe.varoqui@opensvc.com>
Cc: Martin Wilck <mwilck@suse.com>, dm-devel@redhat.com
Subject: [PATCH v3 04/22] libmultipath/checkers: cciss_tur: use message id
Date: Tue, 30 Oct 2018 22:06:35 +0100	[thread overview]
Message-ID: <20181030210653.29677-5-mwilck@suse.com> (raw)
In-Reply-To: <20181030210653.29677-1-mwilck@suse.com>

Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Martin Wilck <mwilck@suse.com>
---
 libmultipath/checkers/cciss_tur.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/libmultipath/checkers/cciss_tur.c b/libmultipath/checkers/cciss_tur.c
index 1cab2015..ea843742 100644
--- a/libmultipath/checkers/cciss_tur.c
+++ b/libmultipath/checkers/cciss_tur.c
@@ -42,9 +42,6 @@
 #define TUR_CMD_LEN 6
 #define HEAVY_CHECK_COUNT       10
 
-#define MSG_CCISS_TUR_UP	"cciss_tur checker reports path is up"
-#define MSG_CCISS_TUR_DOWN	"cciss_tur checker reports path is down"
-
 struct cciss_tur_checker_context {
 	void * dummy;
 };
@@ -69,7 +66,7 @@ int libcheck_check(struct checker * c)
 	IOCTL_Command_struct cic;       // cciss ioctl command
 
 	if ((c->fd) < 0) {
-		MSG(c,"no usable fd");
+		c->msgid = CHECKER_MSGID_NO_FD;
 		ret = -1;
 		goto out;
 	}
@@ -79,7 +76,7 @@ int libcheck_check(struct checker * c)
 		perror("Error: ");
 		fprintf(stderr, "cciss TUR  failed in CCISS_GETLUNINFO: %s\n",
 			strerror(errno));
-		MSG(c,MSG_CCISS_TUR_DOWN);
+		c->msgid = CHECKER_MSGID_DOWN;
 		ret = PATH_DOWN;
 		goto out;
 	} else {
@@ -106,18 +103,18 @@ int libcheck_check(struct checker * c)
 	if (rc < 0) {
 		fprintf(stderr, "cciss TUR  failed: %s\n",
 			strerror(errno));
-		MSG(c,MSG_CCISS_TUR_DOWN);
+		c->msgid = CHECKER_MSGID_DOWN;
 		ret = PATH_DOWN;
 		goto out;
 	}
 
 	if ((cic.error_info.CommandStatus | cic.error_info.ScsiStatus )) {
-		MSG(c,MSG_CCISS_TUR_DOWN);
+		c->msgid = CHECKER_MSGID_DOWN;
 		ret = PATH_DOWN;
 		goto out;
 	}
 
-	MSG(c,MSG_CCISS_TUR_UP);
+	c->msgid = CHECKER_MSGID_UP;
 
 	ret = PATH_UP;
 out:
-- 
2.19.1

  parent reply	other threads:[~2018-10-30 21:06 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-30 21:06 [PATCH v3 00/22] libmultipath: checkers overhaul Martin Wilck
2018-10-30 21:06 ` [PATCH v3 01/22] libmultipath: fix use of uninitialized memory in write() Martin Wilck
2018-10-30 21:06 ` [PATCH v3 02/22] libmultipath: fix memory leaks from scandir() use Martin Wilck
2018-10-30 21:06 ` [PATCH v3 03/22] libmultipath/checkers: replace message by msgid Martin Wilck
2018-10-30 21:06 ` Martin Wilck [this message]
2018-10-30 21:06 ` [PATCH v3 05/22] libmultipath/checkers: directio: use message id Martin Wilck
2018-10-30 21:06 ` [PATCH v3 06/22] libmultipath/checkers: emc_clariion: " Martin Wilck
2018-10-30 21:06 ` [PATCH v3 07/22] libmultipath/checkers: hp_sw: " Martin Wilck
2018-10-30 21:06 ` [PATCH v3 08/22] libmultipath/checkers: rdac: " Martin Wilck
2018-10-30 21:06 ` [PATCH v3 09/22] libmultipath/checkers: readsector0: " Martin Wilck
2018-10-30 21:06 ` [PATCH v3 10/22] libmultipath/checkers: tur: " Martin Wilck
2018-10-30 21:06 ` [PATCH v3 11/22] multipathd: improve checker message logging Martin Wilck
2018-10-30 21:06 ` [PATCH v3 12/22] libmultipath/checkers: support unsupported paths Martin Wilck
2018-10-30 21:06 ` [PATCH v3 13/22] libmultipath: clariion checker: leave unsupported paths alone Martin Wilck
2018-11-01 19:49   ` Benjamin Marzinski
2018-10-30 21:06 ` [PATCH v3 14/22] libmultipath: hp_sw " Martin Wilck
2018-10-30 21:06 ` [PATCH v3 15/22] libmultipath: rdac " Martin Wilck
2018-10-30 21:06 ` [PATCH v3 16/22] libmultipath: tur " Martin Wilck
2018-10-30 21:06 ` [PATCH v3 17/22] libmultipath: pathinfo: don't blank wwid if checker fails Martin Wilck
2018-10-30 21:06 ` [PATCH v3 18/22] multipathd: check_path: improve logging for "unusable path" case Martin Wilck
2018-10-30 21:06 ` [PATCH v3 19/22] libmultipath: coalesce_paths: improve logging of orphaned paths Martin Wilck
2018-10-30 21:06 ` [PATCH v3 20/22] libmultipath: sync_map_state: log failing paths Martin Wilck
2018-10-30 21:06 ` [PATCH v3 21/22] libmultipath/checkers: cleanup class/instance model Martin Wilck
2018-10-30 21:06 ` [PATCH v3 22/22] libmultipath: make checker_message thread safe Martin Wilck
2018-11-01 19:53   ` Benjamin Marzinski
2018-11-02  8:50     ` Martin Wilck
2018-10-30 21:10 ` [PATCH v3 00/22] libmultipath: checkers overhaul Martin Wilck
2018-10-30 21:12 ` Martin Wilck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181030210653.29677-5-mwilck@suse.com \
    --to=mwilck@suse.com \
    --cc=christophe.varoqui@opensvc.com \
    --cc=dm-devel@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox