android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme-auth: rename authentication work elements

Browse Source 
[ Upstream commit 0c999e69c40a87285f910c400b550fad866e99d0 ]

Use nvme_ctrl_auth_work and nvme_queue_auth_work for better
readability.

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Stable-dep-of: a836ca33c5b0 ("nvme-core: fix memory leak in dhchap_secret_store")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Sagi Grimberg 2022-11-13 13:24:06 +02:00 committed by Greg Kroah-Hartman
parent 3f6c988897
commit 9de0a1dfe3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/nvme/host/auth.c
View File

@ -691,7 +691,7 @@ static void nvme_auth_free_dhchap(struct nvme_dhchap_queue_context *chap)
kfree(chap); kfree(chap);
} }
static void __nvme_auth_work(struct work_struct *work) static void nvme_queue_auth_work(struct work_struct *work)
{ {
struct nvme_dhchap_queue_context *chap = struct nvme_dhchap_queue_context *chap =
container_of(work, struct nvme_dhchap_queue_context, auth_work); container_of(work, struct nvme_dhchap_queue_context, auth_work);
@ -893,7 +893,7 @@ int nvme_auth_negotiate(struct nvme_ctrl *ctrl, int qid)
return -ENOMEM; return -ENOMEM;
} }
INIT_WORK(&chap->auth_work, __nvme_auth_work); INIT_WORK(&chap->auth_work, nvme_queue_auth_work);
list_add(&chap->entry, &ctrl->dhchap_auth_list); list_add(&chap->entry, &ctrl->dhchap_auth_list);
mutex_unlock(&ctrl->dhchap_auth_mutex); mutex_unlock(&ctrl->dhchap_auth_mutex);
queue_work(nvme_wq, &chap->auth_work); queue_work(nvme_wq, &chap->auth_work);
@ -934,7 +934,7 @@ void nvme_auth_reset(struct nvme_ctrl *ctrl)
} }
EXPORT_SYMBOL_GPL(nvme_auth_reset); EXPORT_SYMBOL_GPL(nvme_auth_reset);
static void nvme_dhchap_auth_work(struct work_struct *work) static void nvme_ctrl_auth_work(struct work_struct *work)
{ {
struct nvme_ctrl *ctrl = struct nvme_ctrl *ctrl =
container_of(work, struct nvme_ctrl, dhchap_auth_work); container_of(work, struct nvme_ctrl, dhchap_auth_work);
@ -973,7 +973,7 @@ static void nvme_dhchap_auth_work(struct work_struct *work)
void nvme_auth_init_ctrl(struct nvme_ctrl *ctrl) void nvme_auth_init_ctrl(struct nvme_ctrl *ctrl)
{ {
INIT_LIST_HEAD(&ctrl->dhchap_auth_list); INIT_LIST_HEAD(&ctrl->dhchap_auth_list);
INIT_WORK(&ctrl->dhchap_auth_work, nvme_dhchap_auth_work); INIT_WORK(&ctrl->dhchap_auth_work, nvme_ctrl_auth_work);
mutex_init(&ctrl->dhchap_auth_mutex); mutex_init(&ctrl->dhchap_auth_mutex);
if (!ctrl->opts) if (!ctrl->opts)
return; return;