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

bdev/nvme: Use boolean for the result of the reset operation throughout 



The all setters of the reset_cb_fn use boolean as the result eventually.
Using boolean as the result earlier makes the code simpler and the
following patches easier.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I9ec4f670ed7a000a824ab7e261bab07a3dc21f43
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9814


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent d456cd93

module/bdev/nvme/bdev_nvme.c

+11 −12
Original line number Diff line number Diff line
@@ -942,7 +942,7 @@ bdev_nvme_abort_pending_resets(struct spdk_io_channel_iter *i) 
}



static void

bdev_nvme_reset_complete(struct nvme_ctrlr *nvme_ctrlr, int rc)

bdev_nvme_reset_complete(struct nvme_ctrlr *nvme_ctrlr, bool success)

{

	struct nvme_path_id *path_id;

	bdev_nvme_reset_cb reset_cb_fn = nvme_ctrlr->reset_cb_fn;
@@ -951,7 +951,7 @@ bdev_nvme_reset_complete(struct nvme_ctrlr *nvme_ctrlr, int rc) 
	nvme_ctrlr->reset_cb_fn = NULL;

	nvme_ctrlr->reset_cb_arg = NULL;



	if (rc) {

	if (!success) {

		SPDK_ERRLOG("Resetting controller failed.\n");

	} else {

		SPDK_NOTICELOG("Resetting controller successful.\n");
@@ -965,7 +965,7 @@ bdev_nvme_reset_complete(struct nvme_ctrlr *nvme_ctrlr, int rc) 
	assert(path_id != NULL);

	assert(path_id == nvme_ctrlr->active_path_id);



	path_id->is_failed = rc != 0 ? true : false;

	path_id->is_failed = !success;



	if (nvme_ctrlr->ref == 0 && nvme_ctrlr->destruct) {

		/* Destruct ctrlr after clearing pending resets. */
@@ -975,12 +975,12 @@ bdev_nvme_reset_complete(struct nvme_ctrlr *nvme_ctrlr, int rc) 
	pthread_mutex_unlock(&nvme_ctrlr->mutex);



	if (reset_cb_fn) {

		reset_cb_fn(reset_cb_arg, rc);

		reset_cb_fn(reset_cb_arg, success);

	}



	/* Make sure we clear any pending resets before returning. */

	spdk_for_each_channel(nvme_ctrlr,

			      rc == 0 ? bdev_nvme_complete_pending_resets :

			      success ? bdev_nvme_complete_pending_resets :

			      bdev_nvme_abort_pending_resets,

			      NULL,

			      bdev_nvme_check_pending_destruct);
@@ -991,7 +991,7 @@ bdev_nvme_reset_create_qpairs_done(struct spdk_io_channel_iter *i, int status) 
{

	struct nvme_ctrlr *nvme_ctrlr = spdk_io_channel_iter_get_io_device(i);



	bdev_nvme_reset_complete(nvme_ctrlr, status);

	bdev_nvme_reset_complete(nvme_ctrlr, status == 0);

}



static void
@@ -1025,7 +1025,7 @@ bdev_nvme_ctrlr_reset_poll(void *arg) 
				      NULL,

				      bdev_nvme_reset_create_qpairs_done);

	} else {

		bdev_nvme_reset_complete(nvme_ctrlr, rc);

		bdev_nvme_reset_complete(nvme_ctrlr, false);

	}

	return SPDK_POLLER_BUSY;

}
@@ -1037,7 +1037,6 @@ bdev_nvme_reset_ctrlr(struct spdk_io_channel_iter *i, int status) 
	int rc;



	if (status) {

		rc = status;

		goto err;

	}
@@ -1053,7 +1052,7 @@ bdev_nvme_reset_ctrlr(struct spdk_io_channel_iter *i, int status) 
	return;



err:

	bdev_nvme_reset_complete(nvme_ctrlr, rc);

	bdev_nvme_reset_complete(nvme_ctrlr, false);

}



static void
@@ -1108,12 +1107,12 @@ bdev_nvme_reset_rpc(struct nvme_ctrlr *nvme_ctrlr, bdev_nvme_reset_cb cb_fn, voi 
}



static void

bdev_nvme_reset_io_complete(void *cb_arg, int rc)

bdev_nvme_reset_io_complete(void *cb_arg, bool success)

{

	struct nvme_bdev_io *bio = cb_arg;

	enum spdk_bdev_io_status io_status;



	if (rc == 0) {

	if (success) {

		io_status = SPDK_BDEV_IO_STATUS_SUCCESS;

	} else {

		io_status = SPDK_BDEV_IO_STATUS_FAILED;
@@ -1169,7 +1168,7 @@ bdev_nvme_reset_io(struct nvme_bdev_channel *nbdev_ch, struct nvme_bdev_io *bio) 


	rc = _bdev_nvme_reset_io(io_path, bio);

	if (rc != 0) {

		bdev_nvme_reset_io_complete(bio, rc);

		bdev_nvme_reset_io_complete(bio, false);

	}

}

module/bdev/nvme/bdev_nvme.h

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ struct nvme_path_id { 
	bool					is_failed;

};



typedef void (*bdev_nvme_reset_cb)(void *cb_arg, int rc);

typedef void (*bdev_nvme_reset_cb)(void *cb_arg, bool success);



struct nvme_ctrlr {

	/**

module/bdev/nvme/bdev_nvme_rpc.c

+2 −2
Original line number Diff line number Diff line
@@ -1211,11 +1211,11 @@ static const struct spdk_json_object_decoder rpc_bdev_nvme_reset_controller_req_ 
};



static void

_rpc_bdev_nvme_reset_controller_cb(void *cb_arg, int rc)

_rpc_bdev_nvme_reset_controller_cb(void *cb_arg, bool success)

{

	struct spdk_jsonrpc_request *request = cb_arg;



	spdk_jsonrpc_send_bool_response(request, rc == 0);

	spdk_jsonrpc_send_bool_response(request, success);

}



static void