X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=memory.c;h=91241175978ec1ce32310c9c58fef6c38f79da71;hb=39c7a2ca0c7b3ffc99a8e1f2917ce9d00f318c82;hp=c04d7dfa6cf4205c7e9afc6f63d41c7bfdb7234d;hpb=ecfd2bb08cc87bc9a1b3d612258f1fdfb4d09698;p=fio.git diff --git a/memory.c b/memory.c index c04d7dfa..91241175 100644 --- a/memory.c +++ b/memory.c @@ -89,7 +89,7 @@ static int alloc_mem_shm(struct thread_data *td, unsigned int total_mem) " support huge pages.\n"); } else if (errno == ENOMEM) { log_err("fio: no huge pages available, do you" - " need to alocate some? See HOWTO.\n"); + " need to allocate some? See HOWTO.\n"); } } @@ -215,13 +215,13 @@ int allocate_io_mem(struct thread_data *td) size_t total_mem; int ret = 0; - if (td->io_ops->flags & FIO_NOIO) + if (td_ioengine_flagged(td, FIO_NOIO)) return 0; total_mem = td->orig_buffer_size; if (td->o.odirect || td->o.mem_align || td->o.oatomic || - (td->io_ops->flags & FIO_MEMALIGN)) { + td_ioengine_flagged(td, FIO_MEMALIGN)) { total_mem += page_mask; if (td->o.mem_align && td->o.mem_align > page_size) total_mem += td->o.mem_align - page_size;