From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martin Wilck Subject: [PATCH v3 05/22] libmultipath/checkers: directio: use message id Date: Tue, 30 Oct 2018 22:06:36 +0100 Message-ID: <20181030210653.29677-6-mwilck@suse.com> References: <20181030210653.29677-1-mwilck@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20181030210653.29677-1-mwilck@suse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com To: Christophe Varoqui Cc: Martin Wilck , dm-devel@redhat.com List-Id: dm-devel.ids Reviewed-by: Benjamin Marzinski Signed-off-by: Martin Wilck --- libmultipath/checkers/directio.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/libmultipath/checkers/directio.c b/libmultipath/checkers/directio.c index a80848d4..c4a0712e 100644 --- a/libmultipath/checkers/directio.c +++ b/libmultipath/checkers/directio.c @@ -18,10 +18,19 @@ #include "checkers.h" #include "../libmultipath/debug.h" -#define MSG_DIRECTIO_UNKNOWN "directio checker is not available" -#define MSG_DIRECTIO_UP "directio checker reports path is up" -#define MSG_DIRECTIO_DOWN "directio checker reports path is down" -#define MSG_DIRECTIO_PENDING "directio checker is waiting on aio" +enum { + MSG_DIRECTIO_UNKNOWN = CHECKER_FIRST_MSGID, + MSG_DIRECTIO_PENDING, + MSG_DIRECTIO_BLOCKSIZE, +}; + +#define _IDX(x) (MSG_DIRECTIO_##x - CHECKER_FIRST_MSGID) +const char *libcheck_msgtable[] = { + [_IDX(UNKNOWN)] = " is not available", + [_IDX(PENDING)] = " is waiting on aio", + [_IDX(BLOCKSIZE)] = " cannot get blocksize, set default", + NULL, +}; #define LOG(prio, fmt, args...) condlog(prio, "directio: " fmt, ##args) @@ -54,7 +63,7 @@ int libcheck_init (struct checker * c) } if (ioctl(c->fd, BLKBSZGET, &ct->blksize) < 0) { - MSG(c, "cannot get blocksize, set default"); + c->msgid = MSG_DIRECTIO_BLOCKSIZE; ct->blksize = 512; } if (ct->blksize > 4096) { @@ -198,16 +207,16 @@ int libcheck_check (struct checker * c) switch (ret) { case PATH_UNCHECKED: - MSG(c, MSG_DIRECTIO_UNKNOWN); + c->msgid = MSG_DIRECTIO_UNKNOWN; break; case PATH_DOWN: - MSG(c, MSG_DIRECTIO_DOWN); + c->msgid = CHECKER_MSGID_DOWN; break; case PATH_UP: - MSG(c, MSG_DIRECTIO_UP); + c->msgid = CHECKER_MSGID_UP; break; case PATH_PENDING: - MSG(c, MSG_DIRECTIO_PENDING); + c->msgid = MSG_DIRECTIO_PENDING; break; default: break; -- 2.19.1