summaryrefslogtreecommitdiff
path: root/drivers/nvme/host/core.c
diff options
context:
space:
mode:
authorSagi Grimberg <sagi@grimberg.me>2018-12-13 12:34:07 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-05 09:20:08 +0100
commit3331e61b23b1c7d1b62e1b882650992fc6f364b5 (patch)
tree5987c49562a2094638618bc21bd57b586ae39d67 /drivers/nvme/host/core.c
parent2f99d478ddbd8293e6fe499b5906c8c7cfa79141 (diff)
nvme: fix kernel paging oops
[ Upstream commit 092ff0520070fad8407b196f3bb6156ce77a6f98 ] free the controller discard_page correctly. Fixes: cb5b7262b011 ("nvme: provide fallback for discard alloc failure") Signed-off-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/nvme/host/core.c')
-rw-r--r--drivers/nvme/host/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 250ccf3108e9..c4ff4f079448 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3569,7 +3569,7 @@ static void nvme_free_ctrl(struct device *dev)
ida_simple_remove(&nvme_instance_ida, ctrl->instance);
kfree(ctrl->effects);
nvme_mpath_uninit(ctrl);
- kfree(ctrl->discard_page);
+ __free_page(ctrl->discard_page);
if (subsys) {
mutex_lock(&subsys->lock);