Commit 0a7ce375 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Christoph Hellwig
Browse files

nvme-auth: rename __nvme_auth_[reset|free] to nvme_auth[reset|free]_dhchap 



nvme_auth_[reset|free] operate on the controller while
__nvme_auth_[reset|free] operate on a chap struct (which maps to a queue
context). Rename it for clarity.

Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent c7c16c5b

drivers/nvme/host/auth.c

+6 −6
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ static int nvme_auth_dhchap_exponential(struct nvme_ctrl *ctrl, 
	return 0;

}



static void __nvme_auth_reset(struct nvme_dhchap_queue_context *chap)

static void nvme_auth_reset_dhchap(struct nvme_dhchap_queue_context *chap)

{

	kfree_sensitive(chap->host_response);

	chap->host_response = NULL;
@@ -676,9 +676,9 @@ static void __nvme_auth_reset(struct nvme_dhchap_queue_context *chap) 
	memset(chap->c2, 0, sizeof(chap->c2));

}



static void __nvme_auth_free(struct nvme_dhchap_queue_context *chap)

static void nvme_auth_free_dhchap(struct nvme_dhchap_queue_context *chap)

{

	__nvme_auth_reset(chap);

	nvme_auth_reset_dhchap(chap);

	if (chap->shash_tfm)

		crypto_free_shash(chap->shash_tfm);

	if (chap->dh_tfm)
@@ -868,7 +868,7 @@ int nvme_auth_negotiate(struct nvme_ctrl *ctrl, int qid) 
			dev_dbg(ctrl->device, "qid %d: re-using context\n", qid);

			mutex_unlock(&ctrl->dhchap_auth_mutex);

			flush_work(&chap->auth_work);

			__nvme_auth_reset(chap);

			nvme_auth_reset_dhchap(chap);

			queue_work(nvme_wq, &chap->auth_work);

			return 0;

		}
@@ -928,7 +928,7 @@ void nvme_auth_reset(struct nvme_ctrl *ctrl) 
	list_for_each_entry(chap, &ctrl->dhchap_auth_list, entry) {

		mutex_unlock(&ctrl->dhchap_auth_mutex);

		flush_work(&chap->auth_work);

		__nvme_auth_reset(chap);

		nvme_auth_reset_dhchap(chap);

	}

	mutex_unlock(&ctrl->dhchap_auth_mutex);

}
@@ -1002,7 +1002,7 @@ void nvme_auth_free(struct nvme_ctrl *ctrl) 
	list_for_each_entry_safe(chap, tmp, &ctrl->dhchap_auth_list, entry) {

		list_del_init(&chap->entry);

		flush_work(&chap->auth_work);

		__nvme_auth_free(chap);

		nvme_auth_free_dhchap(chap);

	}

	mutex_unlock(&ctrl->dhchap_auth_mutex);

	if (ctrl->host_key) {