lockdep: Change hardirq{s_enabled,_context} to per-cpu variables

[linux.git] / fs / dax.c

diff --git a/fs/dax.c b/fs/dax.c
index 35da144375a0ad91ed600c06c04b5fc9bf13562b..11b16729b86f8041037dbd1186c29636df4f8913 100644 (file)
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -1038,50 +1038,43 @@ static vm_fault_t dax_load_hole(struct xa_state *xas,
        return ret;
 }
 
        return ret;
 }
 

-static bool dax_range_is_aligned(struct block_device *bdev,
-                                unsigned int offset, unsigned int length)
+int dax_iomap_zero(loff_t pos, unsigned offset, unsigned size,
+                  struct iomap *iomap)

 {
 {

-       unsigned short sector_size = bdev_logical_block_size(bdev);
+       sector_t sector = iomap_sector(iomap, pos & PAGE_MASK);
+       pgoff_t pgoff;
+       long rc, id;
+       void *kaddr;
+       bool page_aligned = false;

 
 

-       if (!IS_ALIGNED(offset, sector_size))
-               return false;
-       if (!IS_ALIGNED(length, sector_size))
-               return false;

 
 

-       return true;
-}
+       if (IS_ALIGNED(sector << SECTOR_SHIFT, PAGE_SIZE) &&
+           IS_ALIGNED(size, PAGE_SIZE))
+               page_aligned = true;

 
 

-int __dax_zero_page_range(struct block_device *bdev,
-               struct dax_device *dax_dev, sector_t sector,
-               unsigned int offset, unsigned int size)
-{
-       if (dax_range_is_aligned(bdev, offset, size)) {
-               sector_t start_sector = sector + (offset >> 9);
+       rc = bdev_dax_pgoff(iomap->bdev, sector, PAGE_SIZE, &pgoff);
+       if (rc)
+               return rc;

 
 

-               return blkdev_issue_zeroout(bdev, start_sector,
-                               size >> 9, GFP_NOFS, 0);
-       } else {
-               pgoff_t pgoff;
-               long rc, id;
-               void *kaddr;
+       id = dax_read_lock();

 
 

-               rc = bdev_dax_pgoff(bdev, sector, PAGE_SIZE, &pgoff);
-               if (rc)
-                       return rc;
+       if (page_aligned)
+               rc = dax_zero_page_range(iomap->dax_dev, pgoff,
+                                        size >> PAGE_SHIFT);
+       else
+               rc = dax_direct_access(iomap->dax_dev, pgoff, 1, &kaddr, NULL);
+       if (rc < 0) {
+               dax_read_unlock(id);
+               return rc;
+       }

 
 

-               id = dax_read_lock();
-               rc = dax_direct_access(dax_dev, pgoff, 1, &kaddr, NULL);
-               if (rc < 0) {
-                       dax_read_unlock(id);
-                       return rc;
-               }
+       if (!page_aligned) {

                memset(kaddr + offset, 0, size);
                memset(kaddr + offset, 0, size);

-               dax_flush(dax_dev, kaddr + offset, size);
-               dax_read_unlock(id);
+               dax_flush(iomap->dax_dev, kaddr + offset, size);

        }
        }

+       dax_read_unlock(id);

        return 0;
 }
        return 0;
 }

-EXPORT_SYMBOL_GPL(__dax_zero_page_range);

 
 static loff_t
 dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
 
 static loff_t
 dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data,