Recent changes (master)

[Jens Axboe <axboe@kernel.dk>]

The following changes since commit 51bbb1a120c96ae7b93d058c7ce418962b202515:

  docs: clean up steadystate options (2023-03-20 13:57:47 -0400)

are available in the Git repository at:

  git://git.kernel.dk/fio.git master

for you to fetch changes up to 2fa0ab21c5726d8242a820ff688de019cc4d2fe2:

  engines/nvme: cast __u64 to unsigned long long for printing (2023-03-21 08:40:14 -0600)

----------------------------------------------------------------
Jens Axboe (2):
      engines/io_uring: use correct type for fio_nvme_get_info()
      engines/nvme: cast __u64 to unsigned long long for printing

 engines/io_uring.c | 4 ++--
 engines/nvme.c     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

---

Diff of recent changes:

diff --git a/engines/io_uring.c b/engines/io_uring.c
index 5393758a..54fdf7f3 100644
--- a/engines/io_uring.c
+++ b/engines/io_uring.c
@@ -1148,7 +1148,7 @@ static int fio_ioring_cmd_open_file(struct thread_data *td, struct fio_file *f)
 	if (o->cmd_type == FIO_URING_CMD_NVME) {
 		struct nvme_data *data = NULL;
 		unsigned int nsid, lba_size = 0;
-		unsigned long long nlba = 0;
+		__u64 nlba = 0;
 		int ret;
 
 		/* Store the namespace-id and lba size. */
@@ -1214,7 +1214,7 @@ static int fio_ioring_cmd_get_file_size(struct thread_data *td,
 	if (o->cmd_type == FIO_URING_CMD_NVME) {
 		struct nvme_data *data = NULL;
 		unsigned int nsid, lba_size = 0;
-		unsigned long long nlba = 0;
+		__u64 nlba = 0;
 		int ret;
 
 		ret = fio_nvme_get_info(f, &nsid, &lba_size, &nlba);
diff --git a/engines/nvme.c b/engines/nvme.c
index da18eba9..3f6b64a8 100644
--- a/engines/nvme.c
+++ b/engines/nvme.c
@@ -241,7 +241,7 @@ int fio_nvme_report_zones(struct thread_data *td, struct fio_file *f,
 				break;
 			default:
 				log_err("%s: invalid type for zone at offset %llu.\n",
-					f->file_name, desc->zslba);
+					f->file_name, (unsigned long long) desc->zslba);
 				ret = -EIO;
 				goto out;
 			}