s390/mm,ptdump: convert to generic page table dumper

[linux-2.6-microblaze.git] / fs / dax.c

diff --git a/fs/dax.c b/fs/dax.c
index 11b1672..95341af 100644 (file)
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -488,7 +488,7 @@ retry:
                if (dax_is_conflict(entry))
                        goto fallback;
                if (!xa_is_value(entry)) {
-                       xas_set_err(xas, EIO);
+                       xas_set_err(xas, -EIO);
                        goto out_unlock;
                }
 
@@ -680,21 +680,20 @@ int dax_invalidate_mapping_entry_sync(struct address_space *mapping,
        return __dax_invalidate_entry(mapping, index, false);
 }
 
-static int copy_user_dax(struct block_device *bdev, struct dax_device *dax_dev,
-               sector_t sector, size_t size, struct page *to,
-               unsigned long vaddr)
+static int copy_cow_page_dax(struct block_device *bdev, struct dax_device *dax_dev,
+                            sector_t sector, struct page *to, unsigned long vaddr)
 {
        void *vto, *kaddr;
        pgoff_t pgoff;
        long rc;
        int id;
 
-       rc = bdev_dax_pgoff(bdev, sector, size, &pgoff);
+       rc = bdev_dax_pgoff(bdev, sector, PAGE_SIZE, &pgoff);
        if (rc)
                return rc;
 
        id = dax_read_lock();
-       rc = dax_direct_access(dax_dev, pgoff, PHYS_PFN(size), &kaddr, NULL);
+       rc = dax_direct_access(dax_dev, pgoff, PHYS_PFN(PAGE_SIZE), &kaddr, NULL);
        if (rc < 0) {
                dax_read_unlock(id);
                return rc;
@@ -1305,8 +1304,8 @@ static vm_fault_t dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp,
                        clear_user_highpage(vmf->cow_page, vaddr);
                        break;
                case IOMAP_MAPPED:
-                       error = copy_user_dax(iomap.bdev, iomap.dax_dev,
-                                       sector, PAGE_SIZE, vmf->cow_page, vaddr);
+                       error = copy_cow_page_dax(iomap.bdev, iomap.dax_dev,
+                                                 sector, vmf->cow_page, vaddr);
                        break;
                default:
                        WARN_ON_ONCE(1);