Merge tag 'mm-stable-2022-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / nvdimm / pmem.c

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 107c9cb..7e88cd2 100644 (file)
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -239,7 +239,7 @@ static void pmem_submit_bio(struct bio *bio)
 }
 
 static int pmem_rw_page(struct block_device *bdev, sector_t sector,
-                      struct page *page, unsigned int op)
+                      struct page *page, enum req_op op)
 {
        struct pmem_device *pmem = bdev->bd_disk->private_data;
        blk_status_t rc;
@@ -450,7 +450,7 @@ static void pmem_release_disk(void *__pmem)
        put_dax(pmem->dax_dev);
        del_gendisk(pmem->disk);
 
-       blk_cleanup_disk(pmem->disk);
+       put_disk(pmem->disk);
 }
 
 static int pmem_pagemap_memory_failure(struct dev_pagemap *pgmap,
@@ -613,7 +613,7 @@ out_cleanup_dax:
        kill_dax(pmem->dax_dev);
        put_dax(pmem->dax_dev);
 out:
-       blk_cleanup_disk(pmem->disk);
+       put_disk(pmem->disk);
        return rc;
 }