clang: fix warnings with clang build

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/fio.h b/fio.h
index 719b2f3b8342f03648ec1cbbabdfd1d57cb51462..cda4668601e88d6945c9f43e33cf85bbbaafc234 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -343,10 +343,10 @@ enum {
 
 #define __td_verror(td, err, msg, func)                                        \
        do {                                                            \
-               int __e = (err);                                                \
+               int ____e = (err);                                              \
                if ((td)->error)                                        \
                        break;                                          \
-               (td)->error = __e;                                      \
+               (td)->error = ____e;                                    \
                if (!(td)->first_error)                                 \
                        snprintf(td->verror, sizeof(td->verror), "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg));           \
        } while (0)

diff --git a/profiles/tiobench.c b/profiles/tiobench.c
index 99c88c4507006176707804fc133aa8d45080169d..7a7030afac0697c871179cb53e0188e138876737 100644 (file)
--- a/profiles/tiobench.c
+++ b/profiles/tiobench.c
@@ -113,7 +113,6 @@ static int tb_prep_cmdline(void)
 static struct profile_ops tiobench_profile = {
        .name           = "tiobench",
        .desc           = "tiotest/tiobench benchmark",
-       .options        = options,
        .prep_cmd       = tb_prep_cmdline,
        .cmdline        = tb_opts,
        .options        = options,