Commit bd53d09c authored by Niklas Cassel's avatar Niklas Cassel Committed by Tomasz Zawadzki
Browse files

nvme/fio_plugin: remove ZBD_IGNORE usage 



The define ZBD_IGNORE has been removed from upstream fio.

fio will now return an error if --zonemode=zbd is used with a
--filename that points to something that is unsupported by either
the zbd code in fio or by the ioengine itself.

ioengines are now supposed to return -EINVAL for unsupported files
(instead of returning 0 with ZBD_IGNORE for unsupported files).

This change does not need any special ifdef FIO_IOOPS_VERSION check.

Signed-off-by: default avatarNiklas Cassel <niklas.cassel@wdc.com>
Change-Id: I7bec0b1f5dc8f166ebf683f6f3937b2ef295a21e
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8326


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Community-CI: Mellanox Build Bot
parent c4fafdb2

examples/nvme/fio_plugin/fio_plugin.c

+2 −4
Original line number Diff line number Diff line
@@ -1153,13 +1153,11 @@ spdk_fio_get_zoned_model(struct thread_data *td, struct fio_file *f, enum zbd_zo 
	struct spdk_fio_qpair *fio_qpair = NULL;

	const struct spdk_nvme_zns_ns_data *zns_data = NULL;



	*model = ZBD_IGNORE;



	if (f->filetype != FIO_TYPE_FILE && \

	    f->filetype != FIO_TYPE_BLOCK && \

	    f->filetype != FIO_TYPE_CHAR) {

		log_info("spdk/nvme: ignoring filetype: %d\n", f->filetype);

		return 0;

		log_info("spdk/nvme: unsupported filetype: %d\n", f->filetype);

		return -EINVAL;

	}



	fio_qpair = get_fio_qpair(fio_thread, f);