lkml.org 
[lkml]   [2016]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 11/17] dax: add dax_iomap_sector() helper function
    Date
    To be able to correctly calculate the sector from a file position and a
    struct iomap there is a complex little bit of logic that currently happens
    in both dax_iomap_actor() and dax_iomap_fault(). This will need to be
    repeated yet again in the DAX PMD fault handler when it is added, so break
    it out into a helper function.

    Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Jan Kara <jack@suse.cz>
    ---
    fs/dax.c | 10 +++++++---
    1 file changed, 7 insertions(+), 3 deletions(-)

    diff --git a/fs/dax.c b/fs/dax.c
    index fdbd7a1..7737954 100644
    --- a/fs/dax.c
    +++ b/fs/dax.c
    @@ -1030,6 +1030,11 @@ int dax_truncate_page(struct inode *inode, loff_t from, get_block_t get_block)
    EXPORT_SYMBOL_GPL(dax_truncate_page);

    #ifdef CONFIG_FS_IOMAP
    +static sector_t dax_iomap_sector(struct iomap *iomap, loff_t pos)
    +{
    + return iomap->blkno + (((pos & PAGE_MASK) - iomap->offset) >> 9);
    +}
    +
    static loff_t
    dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
    struct iomap *iomap)
    @@ -1055,8 +1060,7 @@ dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
    struct blk_dax_ctl dax = { 0 };
    ssize_t map_len;

    - dax.sector = iomap->blkno +
    - (((pos & PAGE_MASK) - iomap->offset) >> 9);
    + dax.sector = dax_iomap_sector(iomap, pos);
    dax.size = (length + offset + PAGE_SIZE - 1) & PAGE_MASK;
    map_len = dax_map_atomic(iomap->bdev, &dax);
    if (map_len < 0) {
    @@ -1193,7 +1197,7 @@ int dax_iomap_fault(struct vm_area_struct *vma, struct vm_fault *vmf,
    goto unlock_entry;
    }

    - sector = iomap.blkno + (((pos & PAGE_MASK) - iomap.offset) >> 9);
    + sector = dax_iomap_sector(&iomap, pos);

    if (vmf->cow_page) {
    switch (iomap.type) {
    --
    2.9.0
    \
     
     \ /
      Last update: 2016-10-13 00:54    [W:2.566 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site