Commit 210c233f authored by Artur Paszkiewicz's avatar Artur Paszkiewicz Committed by Jim Harris
Browse files

raid: pass just the bdev name to raid_bdev_attach_base_bdev() 



Signed-off-by: default avatarArtur Paszkiewicz <artur.paszkiewicz@intel.com>
Change-Id: I6198f47fbe979675a8c5e01fc2681263a49319d8
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22357


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarMateusz Kozlowski <mateusz.kozlowski@solidigm.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent 79026f29

module/bdev/raid/bdev_raid.c

+5 −5
Original line number Diff line number Diff line
@@ -3253,13 +3253,13 @@ _raid_bdev_add_base_device(struct raid_bdev *raid_bdev, const char *name, 
}



int

raid_bdev_attach_base_bdev(struct raid_bdev *raid_bdev, struct spdk_bdev *base_bdev,

raid_bdev_attach_base_bdev(struct raid_bdev *raid_bdev, const char *name,

			   raid_base_bdev_cb cb_fn, void *cb_ctx)

{

	struct raid_base_bdev_info *base_info = NULL, *iter;

	int rc;



	SPDK_DEBUGLOG(bdev_raid, "attach_base_device: %s\n", base_bdev->name);

	SPDK_DEBUGLOG(bdev_raid, "attach_base_device: %s\n", name);



	assert(spdk_get_thread() == spdk_thread_get_app_thread());
@@ -3284,7 +3284,7 @@ raid_bdev_attach_base_bdev(struct raid_bdev *raid_bdev, struct spdk_bdev *base_b 


	if (base_info == NULL) {

		SPDK_ERRLOG("no empty slot found in raid bdev '%s' for new base bdev '%s'\n",

			    raid_bdev->bdev.name, base_bdev->name);

			    raid_bdev->bdev.name, name);

		return -EINVAL;

	}
@@ -3293,10 +3293,10 @@ raid_bdev_attach_base_bdev(struct raid_bdev *raid_bdev, struct spdk_bdev *base_b 


	spdk_spin_lock(&raid_bdev->base_bdev_lock);



	rc = _raid_bdev_add_base_device(raid_bdev, base_bdev->name, base_info,

	rc = _raid_bdev_add_base_device(raid_bdev, name, base_info,

					cb_fn, cb_ctx);

	if (rc != 0) {

		SPDK_ERRLOG("base bdev '%s' attach failed: %s\n", base_bdev->name, spdk_strerror(-rc));

		SPDK_ERRLOG("base bdev '%s' attach failed: %s\n", name, spdk_strerror(-rc));

		raid_bdev_free_base_bdev_resource(base_info);

	}

module/bdev/raid/bdev_raid.h

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ const char *raid_bdev_state_to_str(enum raid_bdev_state state); 
const char *raid_bdev_process_to_str(enum raid_process_type value);

void raid_bdev_write_info_json(struct raid_bdev *raid_bdev, struct spdk_json_write_ctx *w);

int raid_bdev_remove_base_bdev(struct spdk_bdev *base_bdev, raid_base_bdev_cb cb_fn, void *cb_ctx);

int raid_bdev_attach_base_bdev(struct raid_bdev *raid_bdev, struct spdk_bdev *base_bdev,

int raid_bdev_attach_base_bdev(struct raid_bdev *raid_bdev, const char *name,

			       raid_base_bdev_cb cb_fn, void *cb_ctx);



/*

module/bdev/raid/bdev_raid_rpc.c

+1 −10
Original line number Diff line number Diff line
@@ -509,7 +509,6 @@ rpc_bdev_raid_add_base_bdev(struct spdk_jsonrpc_request *request, 
{

	struct rpc_bdev_raid_add_base_bdev req = {};

	struct raid_bdev *raid_bdev;

	struct spdk_bdev_desc *desc;

	int rc;



	if (spdk_json_decode_object(params, rpc_bdev_raid_add_base_bdev_decoders,
@@ -527,16 +526,8 @@ rpc_bdev_raid_add_base_bdev(struct spdk_jsonrpc_request *request, 
		goto cleanup;

	}



	rc = spdk_bdev_open_ext(req.base_bdev, false, rpc_bdev_raid_event_cb, NULL, &desc);

	if (rc != 0) {

		spdk_jsonrpc_send_error_response_fmt(request, rc, "Failed to open bdev %s: %s",

						     req.base_bdev, spdk_strerror(-rc));

		goto cleanup;

	}



	rc = raid_bdev_attach_base_bdev(raid_bdev, spdk_bdev_desc_get_bdev(desc),

	rc = raid_bdev_attach_base_bdev(raid_bdev, req.base_bdev,

					rpc_bdev_raid_add_base_bdev_done, request);

	spdk_bdev_close(desc);

	if (rc != 0) {

		spdk_jsonrpc_send_error_response_fmt(request, rc,

						     "Failed to attach base bdev %s to RAID bdev %s: %s",