[PATCH 12/18] libmultipath: convert RDAC checker to async checker

[Martin Wilck]

Make the RDAC checker use the async checker framework.

Signed-off-by: Martin Wilck <mwi...@suse.com>
---
 libmultipath/checkers/rdac.c | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/libmultipath/checkers/rdac.c b/libmultipath/checkers/rdac.c
index 87b8872..a477fb5 100644
--- a/libmultipath/checkers/rdac.c
+++ b/libmultipath/checkers/rdac.c
@@ -1,8 +1,6 @@
 /*
  * Copyright (c) 2005 Christophe Varoqui
  */
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -15,6 +13,7 @@
 #include "debug.h"
 
 #include "sg_include.h"
+#include "async_checker.h"
 
 #define INQUIRY_CMDLEN         6
 #define INQUIRY_CMD            0x12
@@ -55,11 +54,7 @@ struct control_mode_page {
        unsigned char dontcare1[6];
 };
 
-struct rdac_checker_context {
-       void * dummy;
-};
-
-int libcheck_init (struct checker * c)
+int libcheck_init(struct checker *c)
 {
        unsigned char cmd[MODE_SEN_SEL_CMDLEN];
        unsigned char sense_b[SENSE_BUFF_LEN];
@@ -133,11 +128,6 @@ out:
        return 0;
 }
 
-void libcheck_free(__attribute__((unused)) struct checker *c)
-{
-       return;
-}
-
 static int
 do_inq(int sg_fd, unsigned int pg_op, void *resp, int mx_resp_len,
        unsigned int timeout)
@@ -288,15 +278,15 @@ checker_msg_string(const struct volume_access_inq *inq)
        }
 }
 
-int libcheck_check(struct checker * c)
+int libcheck_async_func(struct runner_data *rdata)
 {
        struct volume_access_inq inq;
        int ret, inqfail;
 
        inqfail = 0;
        memset(&inq, 0, sizeof(struct volume_access_inq));
-       ret = do_inq(c->fd, 0xC9, &inq, sizeof(struct volume_access_inq),
-                    c->timeout);
+       ret = do_inq(rdata->fd, 0xC9, &inq, sizeof(struct volume_access_inq),
+                    rdata->timeout);
        if (ret != PATH_UP) {
                inqfail = 1;
                goto done;
@@ -340,17 +330,17 @@ int libcheck_check(struct checker * c)
 done:
        switch (ret) {
        case PATH_WILD:
-               c->msgid = CHECKER_MSGID_UNSUPPORTED;
+               rdata->msgid = CHECKER_MSGID_UNSUPPORTED;
                break;
        case PATH_DOWN:
-               c->msgid = (inqfail ? RDAC_MSGID_INQUIRY_FAILED :
-                           checker_msg_string(&inq));
+               rdata->msgid = (inqfail ? RDAC_MSGID_INQUIRY_FAILED
+                                       : checker_msg_string(&inq));
                break;
        case PATH_UP:
-               c->msgid = CHECKER_MSGID_UP;
+               rdata->msgid = CHECKER_MSGID_UP;
                break;
        case PATH_GHOST:
-               c->msgid = CHECKER_MSGID_GHOST;
+               rdata->msgid = CHECKER_MSGID_GHOST;
                break;
        }
 
-- 
2.54.0