summaryrefslogtreecommitdiffstats
path: root/drivers/nvme
diff options
context:
space:
mode:
authorSagi Grimberg <sagi@grimberg.me>2018-12-13 12:34:07 -0800
committerJens Axboe <axboe@kernel.dk>2018-12-13 13:58:23 -0700
commit092ff0520070fad8407b196f3bb6156ce77a6f98 (patch)
tree44d10a51b31ed806f0b4ec021d0df02061c6d923 /drivers/nvme
parent2d9a058e3f83dca48b8056148089711c552e2475 (diff)
downloadlinux-092ff0520070fad8407b196f3bb6156ce77a6f98.tar.bz2
nvme: fix kernel paging oops
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>
Diffstat (limited to 'drivers/nvme')
-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 4d8ee7186268..136512e8ba58 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3596,7 +3596,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);