On 5.12.18 г. 14:28 ч., Goldwyn Rodrigues wrote: > From: Goldwyn Rodrigues <rgold...@suse.com> > > Signed-off-by: Goldwyn Rodrigues <rgold...@suse.com> > --- > fs/btrfs/dax.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/fs/btrfs/dax.c b/fs/btrfs/dax.c > index d614bf73bf8e..5a297674adec 100644 > --- a/fs/btrfs/dax.c > +++ b/fs/btrfs/dax.c > @@ -54,7 +54,12 @@ ssize_t btrfs_file_dax_read(struct kiocb *iocb, struct > iov_iter *to) nit: I think it's better if you rename the iterator variable to "iter". > > BUG_ON(em->flags & EXTENT_FLAG_FS_MAPPING); > > - ret = em_dax_rw(inode, em, pos, len, to); > + if (em->block_start == EXTENT_MAP_HOLE) { > + u64 zero_len = min(em->len - (em->start - pos), len); Shouldn't this be em->len - (pos - em->start) since this gives the remaining length of the extent? Isn't pos guaranteed to be >= em->start ? > + ret = iov_iter_zero(zero_len, to); > + } else { > + ret = em_dax_rw(inode, em, pos, len, to); > + } > if (ret < 0) > goto out; > pos += ret; >
- [PATCH 02/10] btrfs: basic dax read Goldwyn Rodrigues
- Re: [PATCH 02/10] btrfs: basic dax read Nikolay Borisov
- Re: [PATCH 02/10] btrfs: basic dax read Johannes Thumshirn
- [PATCH 08/10] btrfs: dax add read mmap path Goldwyn Rodrigues
- [PATCH 05/10] btrfs: Carve out btrfs_get_extent_map_wri... Goldwyn Rodrigues
- [PATCH 01/10] btrfs: create a mount option for dax Goldwyn Rodrigues
- Re: [PATCH 01/10] btrfs: create a mount option for... Nikolay Borisov
- Re: [PATCH 01/10] btrfs: create a mount option... Adam Borowski
- Re: [PATCH 01/10] btrfs: create a mount option for... Johannes Thumshirn
- [PATCH 03/10] btrfs: dax: read zeros from holes Goldwyn Rodrigues
- Re: [PATCH 03/10] btrfs: dax: read zeros from hole... Nikolay Borisov
- [PATCH 06/10] btrfs: dax write support Goldwyn Rodrigues
- Re: [PATCH 06/10] btrfs: dax write support Johannes Thumshirn
- [PATCH 09/10] btrfs: dax support for cow_page/mmap_priv... Goldwyn Rodrigues
- [PATCH 07/10] dax: export functions for use with btrfs Goldwyn Rodrigues
- Re: [PATCH 07/10] dax: export functions for use wi... Johannes Thumshirn
- Re: [PATCH 07/10] dax: export functions for use wi... Christoph Hellwig
- Re: [PATCH 07/10] dax: export functions for us... Goldwyn Rodrigues
- Re: [PATCH 07/10] dax: export functions fo... Christoph Hellwig
- Re: [PATCH 07/10] dax: export functions for use wi... Dan Williams
- Re: [PATCH 07/10] dax: export functions for us... Goldwyn Rodrigues