X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fdev-dax.c;h=422ea634ff1d2530b6dae4ba40747417281ee27c;hp=807d8505b21121999bb5f6b6626e7ab0aced1877;hb=HEAD;hpb=d3b07186b1d4c7c1d9adc1306407458ce41ad048 diff --git a/engines/dev-dax.c b/engines/dev-dax.c index 807d8505..1d0f66cb 100644 --- a/engines/dev-dax.c +++ b/engines/dev-dax.c @@ -182,8 +182,8 @@ done: return 0; } -static enum fio_q_status -fio_devdax_queue(struct thread_data *td, struct io_u *io_u) +static enum fio_q_status fio_devdax_queue(struct thread_data *td, + struct io_u *io_u) { fio_ro_check(td, io_u); io_u->error = 0; @@ -259,7 +259,7 @@ fio_devdax_get_file_size(struct thread_data *td, struct fio_file *f) { char spath[PATH_MAX]; char npath[PATH_MAX]; - char *rpath; + char *rpath, *basename; FILE *sfile; uint64_t size; struct stat st; @@ -289,7 +289,8 @@ fio_devdax_get_file_size(struct thread_data *td, struct fio_file *f) } /* check if DAX device */ - if (strcmp("/sys/class/dax", rpath)) { + basename = strrchr(rpath, '/'); + if (!basename || strcmp("dax", basename+1)) { log_err("%s: %s not a DAX device!\n", td->o.name, f->file_name); } @@ -327,7 +328,7 @@ fio_devdax_get_file_size(struct thread_data *td, struct fio_file *f) return 0; } -static struct ioengine_ops ioengine = { +FIO_STATIC struct ioengine_ops ioengine = { .name = "dev-dax", .version = FIO_IOOPS_VERSION, .init = fio_devdax_init,