client/server: fix ptr <-> uint64_t casting warnings on 32-bit builds

Not actually a bug, but gcc complains.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/client.c b/client.c
index 31b4862775eb159775d2fa784a28a9032cc600f6..83bbfc40f6050af097253b50113331bfb18092f0 100644 (file)
--- a/client.c
+++ b/client.c
@@ -663,7 +663,7 @@ static void remove_reply_cmd(struct fio_client *client, struct fio_net_cmd *cmd)
        flist_for_each(entry, &client->cmd_list) {
                icmd = flist_entry(entry, struct fio_net_int_cmd, list);
 
        flist_for_each(entry, &client->cmd_list) {
                icmd = flist_entry(entry, struct fio_net_int_cmd, list);
 

-               if (cmd->tag == (uint64_t) icmd)
+               if (cmd->tag == (uintptr_t) icmd)

                        break;
 
                icmd = NULL;
                        break;
 
                icmd = NULL;


@@ -682,7 +682,7 @@ static void remove_reply_cmd(struct fio_client *client, struct fio_net_cmd *cmd)
 static void handle_eta(struct fio_client *client, struct fio_net_cmd *cmd)
 {
        struct jobs_eta *je = (struct jobs_eta *) cmd->payload;
 static void handle_eta(struct fio_client *client, struct fio_net_cmd *cmd)
 {
        struct jobs_eta *je = (struct jobs_eta *) cmd->payload;

-       struct client_eta *eta = (struct client_eta *) cmd->tag;
+       struct client_eta *eta = (struct client_eta *) (uintptr_t) cmd->tag;

 
        dprint(FD_NET, "client: got eta tag %p, %d\n", eta, eta->pending);
 
 
        dprint(FD_NET, "client: got eta tag %p, %d\n", eta, eta->pending);
 


@@ -810,7 +810,7 @@ static void request_client_etas(void)
                flist_add_tail(&client->eta_list, &eta_list);
                client->eta_in_flight = eta;
                fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_SEND_ETA,
                flist_add_tail(&client->eta_list, &eta_list);
                client->eta_in_flight = eta;
                fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_SEND_ETA,

-                                       (uint64_t) eta, &client->cmd_list);
+                                       (uintptr_t) eta, &client->cmd_list);

        }
 
        while (skipped--)
        }
 
        while (skipped--)

diff --git a/server.c b/server.c
index db9d8594c8b84c59003cf0d58270bbca197c8fb5..ad07a0e973e9b0ea6c813bad37dfe2b0c21d1012 100644 (file)
--- a/server.c
+++ b/server.c
@@ -299,7 +299,7 @@ int fio_net_send_simple_cmd(int sk, uint16_t opcode, uint64_t tag,
 
        cmd = malloc(sizeof(*cmd));
 
 
        cmd = malloc(sizeof(*cmd));
 

-       fio_init_net_cmd(&cmd->cmd, opcode, NULL, 0, (uint64_t) cmd);
+       fio_init_net_cmd(&cmd->cmd, opcode, NULL, 0, (uintptr_t) cmd);

        fio_net_cmd_crc(&cmd->cmd);
 
        INIT_FLIST_HEAD(&cmd->list);
        fio_net_cmd_crc(&cmd->cmd);
 
        INIT_FLIST_HEAD(&cmd->list);