Commit 63642bef authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

Revert "nvmf: Support physical block size if exposed by bdev" 



This reverts commit b32cfc46.

This commit fails the ABI checks and only got through because the checks
were disabled until 21.04 hit.

Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Change-Id: Id26b8f8ba551193d99b1ccbd31b35378b4095a20
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7731


Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent b32cfc46

examples/nvme/identify/identify.c

+0 −4
Original line number Diff line number Diff line
@@ -1014,10 +1014,6 @@ print_namespace(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ns *ns) 
			printf("  Atomic Write Unit (PFail):           %d\n", nsdata->nawupf + 1);

		}



		if (nsdata->npwg) {

			printf("  Preferred Write Granularity:         %d\n", nsdata->npwg + 1);

		}



		if (nsdata->nacwu) {

			printf("  Atomic Compare & Write Unit:         %d\n", nsdata->nacwu + 1);

		}

include/spdk/bdev.h

+0 −8
Original line number Diff line number Diff line
@@ -590,14 +590,6 @@ bool spdk_bdev_is_zoned(const struct spdk_bdev *bdev); 
 */

uint32_t spdk_bdev_get_data_block_size(const struct spdk_bdev *bdev);



/**

 * Get block device physical block size.

 *

 * \param bdev Block device to query.

 * \return Size of physical block size for this bdev in bytes.

 */

uint32_t spdk_bdev_get_physical_block_size(const struct spdk_bdev *bdev);



/**

 * Get DIF type of the block device.

 *

include/spdk/bdev_module.h

+0 −3
Original line number Diff line number Diff line
@@ -265,9 +265,6 @@ struct spdk_bdev { 
	/** Size in bytes of a logical block for the backend */

	uint32_t blocklen;



	/** Size in bytes of a physical block for the backend */

	uint32_t phys_blocklen;



	/** Number of blocks */

	uint64_t blockcnt;

lib/bdev/bdev.c

+0 −10
Original line number Diff line number Diff line
@@ -3291,12 +3291,6 @@ spdk_bdev_get_data_block_size(const struct spdk_bdev *bdev) 
	}

}



uint32_t

spdk_bdev_get_physical_block_size(const struct spdk_bdev *bdev)

{

	return bdev->phys_blocklen;

}



static uint32_t

_bdev_get_block_size_with_md(const struct spdk_bdev *bdev)

{
@@ -5470,10 +5464,6 @@ bdev_init(struct spdk_bdev *bdev) 
		bdev->acwu = 1;

	}



	if (bdev->phys_blocklen == 0) {

		bdev->phys_blocklen = spdk_bdev_get_data_block_size(bdev);

	}



	TAILQ_INIT(&bdev->internal.open_descs);

	TAILQ_INIT(&bdev->internal.locked_ranges);

	TAILQ_INIT(&bdev->internal.pending_locked_ranges);

lib/bdev/spdk_bdev.map

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
	spdk_bdev_is_md_separate;

	spdk_bdev_is_zoned;

	spdk_bdev_get_data_block_size;

	spdk_bdev_get_physical_block_size;

	spdk_bdev_get_dif_type;

	spdk_bdev_is_dif_head_of_md;

	spdk_bdev_is_dif_check_enabled;