Commit 024179d8 authored by Nick Connolly's avatar Nick Connolly Committed by Tomasz Zawadzki
Browse files

module: Use PRId64 for portability 



POSIX defines PRId64/PRIu64/PRIx64 for printing 64-bit values in a
portable way. Replace a few references to %ld to remove the assumption
about the size of a long. Similarly, use %z with size_t arguments.

Where the value being printed is an unsigned 64-bit value, use PRIu64
instead of %ld.

Signed-off-by: default avatarNick Connolly <nick.connolly@mayadata.io>
Change-Id: I0ec4c0cb5e7a8f4b94a1ee6272c8df9ee7f06aa6
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5141


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent b8697729

module/bdev/gpt/gpt.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ gpt_read_partitions(struct spdk_gpt *gpt) 


	partition_entry_size = from_le32(&head->size_of_partition_entry);

	if (partition_entry_size != sizeof(struct spdk_gpt_partition_entry)) {

		SPDK_ERRLOG("Partition_entry_size(%x) != expected(%lx)\n",

		SPDK_ERRLOG("Partition_entry_size(%x) != expected(%zx)\n",

			    partition_entry_size, sizeof(struct spdk_gpt_partition_entry));

		return -1;

	}

module/bdev/malloc/bdev_malloc.c

+2 −2
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ bdev_malloc_readv(struct malloc_disk *mdisk, struct spdk_io_channel *ch, 
		return;

	}



	SPDK_DEBUGLOG(bdev_malloc, "read %lu bytes from offset %#lx\n",

	SPDK_DEBUGLOG(bdev_malloc, "read %zu bytes from offset %#" PRIx64 "\n",

		      len, offset);



	task->status = SPDK_BDEV_IO_STATUS_SUCCESS;
@@ -183,7 +183,7 @@ bdev_malloc_writev(struct malloc_disk *mdisk, struct spdk_io_channel *ch, 
		return;

	}



	SPDK_DEBUGLOG(bdev_malloc, "wrote %lu bytes to offset %#lx\n",

	SPDK_DEBUGLOG(bdev_malloc, "wrote %zu bytes to offset %#" PRIx64 "\n",

		      len, offset);



	task->status = SPDK_BDEV_IO_STATUS_SUCCESS;

module/bdev/null/bdev_null.c

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ bdev_null_submit_request(struct spdk_io_channel *_ch, struct spdk_bdev_io *bdev_ 
			rc = spdk_dif_generate(bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt,

					       bdev_io->u.bdev.num_blocks, &dif_ctx);

			if (0 != rc) {

				SPDK_ERRLOG("IO DIF generation failed: lba %lu, num_block %lu\n",

				SPDK_ERRLOG("IO DIF generation failed: lba %" PRIu64 ", num_block %" PRIu64 "\n",

					    bdev_io->u.bdev.offset_blocks,

					    bdev_io->u.bdev.num_blocks);

				spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);
@@ -160,7 +160,7 @@ bdev_null_submit_request(struct spdk_io_channel *_ch, struct spdk_bdev_io *bdev_ 
			rc = spdk_dif_verify(bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt,

					     bdev_io->u.bdev.num_blocks, &dif_ctx, &err_blk);

			if (0 != rc) {

				SPDK_ERRLOG("IO DIF verification failed: lba %lu, num_blocks %lu, "

				SPDK_ERRLOG("IO DIF verification failed: lba %" PRIu64 ", num_blocks %" PRIu64 ", "

					    "err_type %u, expected %u, actual %u, err_offset %u\n",

					    bdev_io->u.bdev.offset_blocks,

					    bdev_io->u.bdev.num_blocks,

module/bdev/nvme/bdev_nvme.c

+6 −6
Original line number Diff line number Diff line
@@ -1346,7 +1346,7 @@ nvme_ctrlr_populate_namespaces(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, 
			num_sectors = spdk_nvme_ns_get_num_sectors(nvme_ns);

			bdev = TAILQ_FIRST(&ns->bdevs);

			if (bdev->disk.blockcnt != num_sectors) {

				SPDK_NOTICELOG("NSID %u is resized: bdev name %s, old size %lu, new size %lu\n",

				SPDK_NOTICELOG("NSID %u is resized: bdev name %s, old size %" PRIu64 ", new size %" PRIu64 "\n",

					       nsid,

					       bdev->disk.name,

					       bdev->disk.blockcnt,
@@ -2416,7 +2416,7 @@ bdev_nvme_no_pi_readv(struct nvme_bdev_ns *nvme_ns, struct nvme_io_channel *nvme 
{

	int rc;



	SPDK_DEBUGLOG(bdev_nvme, "read %lu blocks with offset %#lx without PI check\n",

	SPDK_DEBUGLOG(bdev_nvme, "read %" PRIu64 " blocks with offset %#" PRIx64 " without PI check\n",

		      lba_count, lba);



	bio->iovs = iov;
@@ -2442,7 +2442,7 @@ bdev_nvme_readv(struct nvme_bdev_ns *nvme_ns, struct nvme_io_channel *nvme_ch, 
{

	int rc;



	SPDK_DEBUGLOG(bdev_nvme, "read %lu blocks with offset %#lx\n",

	SPDK_DEBUGLOG(bdev_nvme, "read %" PRIu64 " blocks with offset %#" PRIx64 "\n",

		      lba_count, lba);



	bio->iovs = iov;
@@ -2477,7 +2477,7 @@ bdev_nvme_writev(struct nvme_bdev_ns *nvme_ns, struct nvme_io_channel *nvme_ch, 
{

	int rc;



	SPDK_DEBUGLOG(bdev_nvme, "write %lu blocks with offset %#lx\n",

	SPDK_DEBUGLOG(bdev_nvme, "write %" PRIu64 " blocks with offset %#" PRIx64 "\n",

		      lba_count, lba);



	bio->iovs = iov;
@@ -2512,7 +2512,7 @@ bdev_nvme_comparev(struct nvme_bdev_ns *nvme_ns, struct nvme_io_channel *nvme_ch 
{

	int rc;



	SPDK_DEBUGLOG(bdev_nvme, "compare %lu blocks with offset %#lx\n",

	SPDK_DEBUGLOG(bdev_nvme, "compare %" PRIu64 " blocks with offset %#" PRIx64 "\n",

		      lba_count, lba);



	bio->iovs = iov;
@@ -2540,7 +2540,7 @@ bdev_nvme_comparev_and_writev(struct nvme_bdev_ns *nvme_ns, struct nvme_io_chann 
	struct spdk_bdev_io *bdev_io = spdk_bdev_io_from_ctx(bio);

	int rc;



	SPDK_DEBUGLOG(bdev_nvme, "compare and write %lu blocks with offset %#lx\n",

	SPDK_DEBUGLOG(bdev_nvme, "compare and write %" PRIu64 " blocks with offset %#" PRIx64 "\n",

		      lba_count, lba);



	bio->iovs = cmp_iov;

module/bdev/raid/bdev_raid.c

+1 −1
Original line number Diff line number Diff line
@@ -1199,7 +1199,7 @@ raid_bdev_configure(struct raid_bdev *raid_bdev) 
	}

	raid_bdev->state = RAID_BDEV_STATE_ONLINE;

	SPDK_DEBUGLOG(bdev_raid, "io device register %p\n", raid_bdev);

	SPDK_DEBUGLOG(bdev_raid, "blockcnt %lu, blocklen %u\n",

	SPDK_DEBUGLOG(bdev_raid, "blockcnt %" PRIu64 ", blocklen %u\n",

		      raid_bdev_gen->blockcnt, raid_bdev_gen->blocklen);

	spdk_io_device_register(raid_bdev, raid_bdev_create_cb, raid_bdev_destroy_cb,

				sizeof(struct raid_bdev_io_channel),