]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
nvme: fix kernel paging oops
authorSagi Grimberg <sagi@grimberg.me>
Thu, 13 Dec 2018 20:34:07 +0000 (12:34 -0800)
committerJens Axboe <axboe@kernel.dk>
Thu, 13 Dec 2018 20:58:23 +0000 (13:58 -0700)
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>
drivers/nvme/host/core.c

index 4d8ee71862689b07c9d20e5544fade8a45fc99bd..136512e8ba5880dedd8a97241929d48b07a473ae 100644 (file)
@@ -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);