options: kill 'use_os_rand'

It's been deprecated for a very long time, it's time to just kill
it off.

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

diff --git a/options.c b/options.c
index 66fb5806c7a41ae7dd24dad5a6372c1222cd06c1..98187def98fbe842e90ae6d4a85a9fb3f358fd10 100644 (file)
--- a/options.c
+++ b/options.c
@@ -2202,14 +2202,6 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
                .category = FIO_OPT_C_IO,
                .group  = FIO_OPT_G_RANDOM,
        },
                .category = FIO_OPT_C_IO,
                .group  = FIO_OPT_G_RANDOM,
        },

-       {
-               .name   = "use_os_rand",
-               .lname  = "Use OS random",
-               .type   = FIO_OPT_DEPRECATED,
-               .off1   = offsetof(struct thread_options, dep_use_os_rand),
-               .category = FIO_OPT_C_IO,
-               .group  = FIO_OPT_G_RANDOM,
-       },

        {
                .name   = "norandommap",
                .lname  = "No randommap",
        {
                .name   = "norandommap",
                .lname  = "No randommap",

diff --git a/thread_options.h b/thread_options.h
index 4f791cf366dd38360cb31a53daa32a4ca2cae4e1..14c6969f3acb4bd741e1d33a5b70b1aac8d68b4a 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -140,7 +140,6 @@ struct thread_options {
        unsigned int rand_repeatable;
        unsigned int allrand_repeatable;
        unsigned long long rand_seed;
        unsigned int rand_repeatable;
        unsigned int allrand_repeatable;
        unsigned long long rand_seed;

-       unsigned int dep_use_os_rand;

        unsigned int log_avg_msec;
        unsigned int log_hist_msec;
        unsigned int log_hist_coarseness;
        unsigned int log_avg_msec;
        unsigned int log_hist_msec;
        unsigned int log_hist_coarseness;


@@ -173,7 +172,6 @@ struct thread_options {
 
        unsigned int hugepage_size;
        unsigned long long rw_min_bs;
 
        unsigned int hugepage_size;
        unsigned long long rw_min_bs;

-       unsigned int pad2;

        unsigned int thinktime;
        unsigned int thinktime_spin;
        unsigned int thinktime_blocks;
        unsigned int thinktime;
        unsigned int thinktime_spin;
        unsigned int thinktime_blocks;


@@ -430,8 +428,8 @@ struct thread_options_pack {
        uint32_t override_sync;
        uint32_t rand_repeatable;
        uint32_t allrand_repeatable;
        uint32_t override_sync;
        uint32_t rand_repeatable;
        uint32_t allrand_repeatable;

+       uint32_t pad;

        uint64_t rand_seed;
        uint64_t rand_seed;

-       uint32_t dep_use_os_rand;

        uint32_t log_avg_msec;
        uint32_t log_hist_msec;
        uint32_t log_hist_coarseness;
        uint32_t log_avg_msec;
        uint32_t log_hist_msec;
        uint32_t log_hist_coarseness;


@@ -572,7 +570,7 @@ struct thread_options_pack {
        uint32_t rate_iops_min[DDIR_RWDIR_CNT];
        uint32_t rate_process;
        uint32_t rate_ign_think;
        uint32_t rate_iops_min[DDIR_RWDIR_CNT];
        uint32_t rate_process;
        uint32_t rate_ign_think;

-       uint32_t pad;
+       uint32_t pad3;

 
        uint8_t ioscheduler[FIO_TOP_STR_MAX];
 
 
        uint8_t ioscheduler[FIO_TOP_STR_MAX];