On 2020/05/06 2:56, Alexey Dobriyan wrote: > It is nicer this way and there will be more code in this area > with ZBD verification. > > Signed-off-by: Alexey Dobriyan (SK hynix) <adobriyan@xxxxxxxxx> > --- > backend.c | 6 ------ > verify.c | 20 +++++++------------- > 2 files changed, 7 insertions(+), 19 deletions(-) > > diff --git a/backend.c b/backend.c > index feb34e51..452975cf 100644 > --- a/backend.c > +++ b/backend.c > @@ -1006,12 +1006,6 @@ static void do_io(struct thread_data *td, uint64_t *bytes_done) > if (td->o.verify != VERIFY_NONE && io_u->ddir == DDIR_READ && > ((io_u->flags & IO_U_F_VER_LIST) || !td_rw(td))) { > > - if (!td->o.verify_pattern_bytes) { > - io_u->rand_seed = __rand(&td->verify_state); > - if (sizeof(int) != sizeof(long *)) > - io_u->rand_seed *= __rand(&td->verify_state); > - } > - > if (verify_state_should_stop(td, io_u)) { > put_io_u(td, io_u); > break; > diff --git a/verify.c b/verify.c > index cf299ebf..b7fa6693 100644 > --- a/verify.c > +++ b/verify.c > @@ -46,15 +46,6 @@ static void __fill_buffer(struct thread_options *o, uint64_t seed, void *p, > __fill_random_buf_percentage(seed, p, o->compress_percentage, len, len, o->buffer_pattern, o->buffer_pattern_bytes); > } > > -static uint64_t fill_buffer(struct thread_data *td, void *p, > - unsigned int len) > -{ > - struct frand_state *fs = &td->verify_state; > - struct thread_options *o = &td->o; > - > - return fill_random_buf_percentage(fs, p, o->compress_percentage, len, len, o->buffer_pattern, o->buffer_pattern_bytes); > -} > - > void fill_verify_pattern(struct thread_data *td, void *p, unsigned int len, > struct io_u *io_u, uint64_t seed, int use_seed) > { > @@ -63,10 +54,13 @@ void fill_verify_pattern(struct thread_data *td, void *p, unsigned int len, > if (!o->verify_pattern_bytes) { > dprint(FD_VERIFY, "fill random bytes len=%u\n", len); > > - if (use_seed) > - __fill_buffer(o, seed, p, len); > - else > - io_u->rand_seed = fill_buffer(td, p, len); > + if (!use_seed) { > + seed = __rand(&td->verify_state); > + if (sizeof(int) != sizeof(long *)) > + seed *= (unsigned long)__rand(&td->verify_state); > + } > + io_u->rand_seed = seed; > + __fill_buffer(o, seed, p, len); > return; > } > > Looks OK to me. Reviewed-by: Damien Le Moal <damien.lemoal@xxxxxxx> -- Damien Le Moal Western Digital Research