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

bdev/rbd: Use bdev_open_ext() for resize instead of bdev_get_by_name() 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 02e3c62c

module/bdev/rbd/bdev_rbd.c

+24 −7
Original line number Diff line number Diff line
@@ -1287,23 +1287,39 @@ bdev_rbd_delete(const char *name, spdk_delete_rbd_complete cb_fn, void *cb_arg) 
	}

}



static void

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

{

}



int

bdev_rbd_resize(struct spdk_bdev *bdev, const uint64_t new_size_in_mb)

bdev_rbd_resize(const char *name, const uint64_t new_size_in_mb)

{

	struct spdk_bdev_desc *desc;

	struct spdk_bdev *bdev;

	struct spdk_io_channel *ch;

	struct bdev_rbd_io_channel *rbd_io_ch;

	int rc;

	int rc = 0;

	uint64_t new_size_in_byte;

	uint64_t current_size_in_mb;



	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 != &rbd_if) {

		return -EINVAL;

		rc = -EINVAL;

		goto exit;

	}



	current_size_in_mb = bdev->blocklen * bdev->blockcnt / (1024 * 1024);

	if (current_size_in_mb > new_size_in_mb) {

		SPDK_ERRLOG("The new bdev size must be lager than current bdev size.\n");

		return -EINVAL;

		SPDK_ERRLOG("The new bdev size must be larger than current bdev size.\n");

		rc = -EINVAL;

		goto exit;

	}



	ch = bdev_rbd_get_io_channel(bdev);
@@ -1314,15 +1330,16 @@ bdev_rbd_resize(struct spdk_bdev *bdev, const uint64_t new_size_in_mb) 
	spdk_put_io_channel(ch);

	if (rc != 0) {

		SPDK_ERRLOG("failed to resize the ceph bdev.\n");

		return rc;

		goto exit;

	}



	rc = spdk_bdev_notify_blockcnt_change(bdev, new_size_in_byte / bdev->blocklen);

	if (rc != 0) {

		SPDK_ERRLOG("failed to notify block cnt change.\n");

		return rc;

	}



exit:

	spdk_bdev_close(desc);

	return rc;

}

module/bdev/rbd/bdev_rbd.h

+2 −2
Original line number Diff line number Diff line
@@ -69,10 +69,10 @@ void bdev_rbd_delete(const char *name, spdk_delete_rbd_complete cb_fn, 
/**

 * Resize rbd bdev.

 *

 * \param bdev Pointer to rbd bdev.

 * \param bdev Name of rbd bdev.

 * \param new_size_in_mb The new size in MiB for this bdev.

 */

int bdev_rbd_resize(struct spdk_bdev *bdev, const uint64_t new_size_in_mb);

int bdev_rbd_resize(const char *name, const uint64_t new_size_in_mb);



/**

 * Create a Rados cluster.

module/bdev/rbd/bdev_rbd_rpc.c

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

{

	struct rpc_bdev_rbd_resize req = {};

	struct spdk_bdev *bdev;

	int rc;



	if (spdk_json_decode_object(params, rpc_bdev_rbd_resize_decoders,
@@ -241,13 +240,7 @@ rpc_bdev_rbd_resize(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;

	}



	rc = bdev_rbd_resize(bdev, req.new_size);

	rc = bdev_rbd_resize(req.name, req.new_size);

	if (rc) {

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

		goto cleanup;