Commit d77d3179 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/aio: Use bdev_open_ext() for rescan instead of bdev_get_by_name() 



Use spdk_bdev_open_ext() + spdk_bdev_desc_get_bdev() +
spdk_bdev_close() instead of spdk_bdev_get_by_name().

Additionally, use bdev pointer instead of &fdisk->disk because it is
more readable.

Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: I924595268e6785592a6e777e90a8c245a0346719
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12070


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
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 avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 25156211

module/bdev/aio/bdev_aio.c

+25 −9
Original line number Diff line number Diff line
@@ -820,36 +820,52 @@ error_return: 
	return rc;

}



static void

dummy_bdev_event_cb(enum spdk_bdev_event_type type, struct spdk_bdev *bdev, void *ctx)

{

}



int

bdev_aio_rescan(struct spdk_bdev *bdev)

bdev_aio_rescan(const char *name)

{

	struct spdk_bdev_desc *desc;

	struct spdk_bdev *bdev;

	struct file_disk *fdisk;

	uint64_t disk_size, blockcnt;

	int rc;



	if (!bdev || bdev->module != &aio_if) {

		return -ENODEV;

	rc = spdk_bdev_open_ext(name, false, dummy_bdev_event_cb, NULL, &desc);

	if (rc != 0) {

		return rc;

	}



	bdev = spdk_bdev_desc_get_bdev(desc);

	if (bdev->module != &aio_if) {

		rc = -ENODEV;

		goto exit;

	}



	fdisk = SPDK_CONTAINEROF(bdev, struct file_disk, disk);

	disk_size = spdk_fd_get_size(fdisk->fd);

	blockcnt = disk_size / fdisk->disk.blocklen;

	blockcnt = disk_size / bdev->blocklen;



	if (fdisk->disk.blockcnt != blockcnt) {

	if (bdev->blockcnt != blockcnt) {

		SPDK_NOTICELOG("AIO device is resized: bdev name %s, old block count %" PRIu64 ", new block count %"

			       PRIu64 "\n",

			       fdisk->filename,

			       fdisk->disk.blockcnt,

			       bdev->blockcnt,

			       blockcnt);

		rc = spdk_bdev_notify_blockcnt_change(&fdisk->disk, blockcnt);

		rc = spdk_bdev_notify_blockcnt_change(bdev, blockcnt);

		if (rc != 0) {

			SPDK_ERRLOG("Could not change num blocks for aio bdev: name %s, errno: %d.\n",

				    fdisk->filename, rc);

			return rc;

			goto exit;

		}

	}



	return 0;

exit:

	spdk_bdev_close(desc);

	return rc;

}



struct delete_aio_bdev_ctx {

module/bdev/aio/bdev_aio.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ typedef void (*delete_aio_bdev_complete)(void *cb_arg, int bdeverrno); 


int create_aio_bdev(const char *name, const char *filename, uint32_t block_size);



int bdev_aio_rescan(struct spdk_bdev *bdev);

int bdev_aio_rescan(const char *name);

void bdev_aio_delete(const char *name, delete_aio_bdev_complete cb_fn, void *cb_arg);



#endif /* SPDK_BDEV_AIO_H */

module/bdev/aio/bdev_aio_rpc.c

+1 −8
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ rpc_bdev_aio_rescan(struct spdk_jsonrpc_request *request, 
		    const struct spdk_json_val *params)

{

	struct rpc_rescan_aio req = {NULL};

	struct spdk_bdev *bdev;

	int bdeverrno;



	if (spdk_json_decode_object(params, rpc_rescan_aio_decoders,
@@ -135,13 +134,7 @@ rpc_bdev_aio_rescan(struct spdk_jsonrpc_request *request, 
		goto cleanup;

	}



	bdev = spdk_bdev_get_by_name(req.name);

	if (bdev == NULL) {

		spdk_jsonrpc_send_error_response(request, -ENODEV, spdk_strerror(ENODEV));

		goto cleanup;

	}



	bdeverrno = bdev_aio_rescan(bdev);

	bdeverrno = bdev_aio_rescan(req.name);

	spdk_jsonrpc_send_bool_response(request, bdeverrno);



cleanup: